8294236: [IR Framework] CPU preconditions are overriden by regular preconditions

[robcasloz]

This changeset ensures that all preconditions of a IR test (applyIf, applyIfCPUFeature, etc.) are evaluated as a logical conjunction to determine whether the test's IR check should be applied.

Testing

• tier1-3 (windows-x64, linux-x64, linux-aarch64, and macosx-x64).
• IR framework tests in test/hotspot/jtreg/testlibrary_tests/ir_framework (linux-x64).

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8294236: [IR Framework] CPU preconditions are overriden by regular preconditions

Reviewers

• Christian Hagedorn (@chhagedorn - Reviewer)
• Pengfei Li (@pfustc - Committer) ⚠️ Review applies to 0f9881df
• Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10402/head:pull/10402
$ git checkout pull/10402

Update a local copy of the PR:
$ git checkout pull/10402
$ git pull https://git.openjdk.org/jdk pull/10402/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10402

View PR using the GUI difftool:
$ git pr show -t 10402

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10402.diff

[bridgekeeper]

👋 Welcome back rcastanedalo! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@robcasloz The following label will be automatically applied to this pull request:

• hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 02: Full - Incremental (3e5f9d53)
• 01: Full - Incremental (0f9881df)
• 00: Full (eea19928)

[pfustc]

Thanks for your work. This is also what I'd like to do before.

IMO, it's better to evaluate @applyIf and @applyIfCPUFeature preconditions inside a single @IR check as a conjunction rather than a disjunction, because currently we don't have a chance to implement such conjunction. But after this change we can still implement a disjunction by writing multiple @IR checks for a single test method.

BTW, could you update the README file test/hotspot/jtreg/compiler/lib/ir_framework/README.md a bit so more test writers can be aware of this?

Generally LGTM. (Not a reviewer)

[chhagedorn]

Looks good, thanks for reporting and fixing that!

[openjdk]

@robcasloz This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8294236: [IR Framework] CPU preconditions are overriden by regular preconditions

Reviewed-by: chagedorn, pli, kvn

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 83 new commits pushed to the master branch:

• 9dce865: 8294115: JNI local refs exceeds capacity warning in NetworkInterface::getAll
• b030c7d: 8225235: Unused field defaultIndex in NetworkInterface
• a07975b: 8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output
• 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
• aeef3ec: 8294198: Implement isFinite intrinsic for RISC-V
• 5f6ad92: 8294547: HotSpotAgent.setupVM() should include "cause" exception when throwing DebuggerException
• 545ded1: 8294548: Problem list SA core file tests on macosx-x64 due to JDK-8294316
• 29c70f1: 8294595: Add javax/swing/plaf/aqua/CustomComboBoxFocusTest.java to problem list
• 5d48da4: 8294370: Fix allocation bug in java_lang_Thread::async_get_stack_trace()
• ce85cac: 8065554: MatchResult should provide values of named-capturing groups
• ... and 73 more: https://git.openjdk.org/jdk/compare/5285035ed9bb43a40108e4d046e0de317730f193...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[robcasloz]

Thanks for your work. This is also what I'd like to do before.

IMO, it's better to evaluate @applyIf and @applyIfCPUFeature preconditions inside a single @ir check as a conjunction rather > than a disjunction, because currently we don't have a chance to implement such conjunction. But after this change we can still > implement a disjunction by writing multiple @ir checks for a single test method.

Thanks for looking at this! I agree. Longer-term, I think the best option would be to unify all preconditions into a simple DSL as proposed in JDK-8294279.

[robcasloz]

BTW, could you update the README file test/hotspot/jtreg/compiler/lib/ir_framework/README.md a bit so more test writers can be aware of this?

Good point, done!

[vnkozlov]

I think we should use } else if () { constructs here since you not exit immediately after finding applyIf*.

[robcasloz]

I think we should use } else if () { constructs here since you not exit immediately after finding applyIf*.

Thanks, Vladimir. I applied your suggestion and also took the opportunity to factor out some duplicate code.

[vnkozlov]

Nice.

[robcasloz]

Thanks for reviewing, Christian and Vladimir!

[robcasloz]

/integrate

[openjdk]

Going to push as commit 5fe837a.
Since your change was applied there have been 108 commits pushed to the master branch:

• 8e9cfeb: 8294431: jshell reports error on initialisation of static final field of anonymous class
• 6e8f038: 8294567: IGV: IllegalStateException in search
• bc668b9: 8293099: JFR: Typo in TestRemoteDump.java
• 03f25a9: 8293562: blocked threads with KeepAliveCache.get
• a69ee85: 8292336: JFR: Warn users if -XX:StartFlightRecording:disk=false is specified with maxage or maxsize
• b8b9b97: 8294676: [JVMCI] InstalledCode.deoptimize(false) should not touch address field
• fd59430: 8294610: java/net/vthread/HttpALot.java is slow on Linux
• c7ab1ca: 8294609: C2: Improve inlining of methods with unloaded signature classes
• 375f02f: 8294608: Remove redundant unchecked suppression in FileDescriptor
• d207da8: 8294533: Documentation mistake in Process::getErrorStream and getInputStream
• ... and 98 more: https://git.openjdk.org/jdk/compare/5285035ed9bb43a40108e4d046e0de317730f193...master

Your commit was automatically rebased without conflicts.

[openjdk]

@robcasloz Pushed as commit 5fe837a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.