Skip to content

8270447: [IR Framework] Add missing compilation level restriction when using FlipC1C2 stress option #4866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Jul 22, 2021

A stress test with the IR framework option FlipC1C2 for the newly converted Valhalla tests (JDK-8263024) resulted in invalid compilation requests (an exception is thrown) for unavailable compiler levels. A compilation level restriction after the flip from C1 -> C2 and vice versa was missing and also an exclusion when asserting on specific compilation levels with DFlipC1C2. I also included some small style fixes.

Thanks,
Christian


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8270447: [IR Framework] Add missing compilation level restriction when using FlipC1C2 stress option

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4866/head:pull/4866
$ git checkout pull/4866

Update a local copy of the PR:
$ git checkout pull/4866
$ git pull https://git.openjdk.java.net/jdk pull/4866/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4866

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4866.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 22, 2021

👋 Welcome back chagedorn! 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
Copy link

openjdk bot commented Jul 22, 2021

@chhagedorn 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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jul 22, 2021
@chhagedorn chhagedorn changed the title [IR Framework] Add missing compilation level restriction when using FlipC1C2 stress option 8270447: [IR Framework] Add missing compilation level restriction when using FlipC1C2 stress option Jul 22, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 22, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 22, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good.

@openjdk
Copy link

openjdk bot commented Jul 22, 2021

@chhagedorn 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:

8270447: [IR Framework] Add missing compilation level restriction when using FlipC1C2 stress option

Reviewed-by: kvn, thartmann

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 155 new commits pushed to the master branch:

  • e4295cc: 8270519: Move several vector helper methods to shared header file
  • e627cae: 8270317: Large Allocation in CipherSuite
  • 0dcfc42: Merge
  • 8adf008: 8269984: [macos] JTabbedPane title looks like disabled
  • e90ed6c: 8271173: serviceability/jvmti/GetObjectSizeClass.java doesn't check exit code
  • b4c6229: 8271189: runtime/handshake/HandshakeTimeoutTest.java can be run in driver mode
  • 7468bbc: 8266988: compiler/jvmci/compilerToVM/IsMatureTest.java fails with Unexpected isMature state for multiple times invoked method: expected false to equal true
  • 286106d: 8271219: [REDO] JDK-8271063 Print injected fields for InstanceKlass
  • a1c0a6a: 8199594: Add doc describing how (?x) ignores spaces in character classes
  • 4ed548b: 8268261: C2: assert(n != __null) failed: Bad immediate dominator info.
  • ... and 145 more: https://git.openjdk.java.net/jdk/compare/375fc2a2b29c454b36d3ae068a080b28f6ec04e9...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 22, 2021
@chhagedorn
Copy link
Member Author

Thanks Vladimir for your review!

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me too.

@chhagedorn
Copy link
Member Author

Thanks Tobias for your review!

@chhagedorn
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 26, 2021

Going to push as commit 36aefa3.
Since your change was applied there have been 155 commits pushed to the master branch:

  • e4295cc: 8270519: Move several vector helper methods to shared header file
  • e627cae: 8270317: Large Allocation in CipherSuite
  • 0dcfc42: Merge
  • 8adf008: 8269984: [macos] JTabbedPane title looks like disabled
  • e90ed6c: 8271173: serviceability/jvmti/GetObjectSizeClass.java doesn't check exit code
  • b4c6229: 8271189: runtime/handshake/HandshakeTimeoutTest.java can be run in driver mode
  • 7468bbc: 8266988: compiler/jvmci/compilerToVM/IsMatureTest.java fails with Unexpected isMature state for multiple times invoked method: expected false to equal true
  • 286106d: 8271219: [REDO] JDK-8271063 Print injected fields for InstanceKlass
  • a1c0a6a: 8199594: Add doc describing how (?x) ignores spaces in character classes
  • 4ed548b: 8268261: C2: assert(n != __null) failed: Bad immediate dominator info.
  • ... and 145 more: https://git.openjdk.java.net/jdk/compare/375fc2a2b29c454b36d3ae068a080b28f6ec04e9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 26, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 26, 2021
@openjdk
Copy link

openjdk bot commented Jul 26, 2021

@chhagedorn Pushed as commit 36aefa3.

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

@chhagedorn chhagedorn deleted the JDK-8270447 branch July 29, 2021 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants