Skip to content
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

8275104: IR framework does not handle client VM builds correctly #6037

Closed
wants to merge 2 commits into from

Conversation

@chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Oct 20, 2021

While the IR framework is primarily used for C2 IR verification, it should also work with client VM builds. There are currently some problems which are fixed with this patch:

  • The IR framework currently only bails out of IR matching if C2 is excluded by command line flags. However, when running an IR JTreg test with a client VM build, IR matching fails when not specifically adding @requires vm.compiler2.enabled to exclude the test.
  • @Test and @ForceCompile do not work correctly and throw an exception due to an incompatible compilation level selection without C2.
  • Some internal framework tests fail (the fix also improves TestDIgnoreCompilerControls in general).

Testing:

  • Standard tier testing
  • Testing internal framework tests with standard build (tiered), client VM (without C2) and server VM build (without C1)

Thanks,
Christian


Progress

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

Issue

  • JDK-8275104: IR framework does not handle client VM builds correctly

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6037

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 20, 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 openjdk bot added the rfr label Oct 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 20, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Seems fine.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 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:

8275104: IR framework does not handle client VM builds correctly

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

  • 1efe946: 8275712: Hashtable literal_size functions are broken
  • fab3d6c: 8275761: Backout: JDK-8274794 Print all owned locks in hs_err file
  • c978ca8: 8275344: -Xcheck:jni produces some warnings in the LCMS.c
  • 6a466fe: 8202056: Expand serial warning to check for bad overloads of serial-related methods and ineffectual fields
  • 4e9dd4b: 8275384: Change nested classes in jdk.jconsole to static nested classes
  • 0961de4: 8275347: ciReplay: staticfield lines not properly terminated
  • 7dd8237: 8275084: CDS warning when building with LOG=debug
  • 49f9d80: 8243585: AlgorithmChecker::check throws confusing exception when it rejects the signer key
  • bef8cf1: 8275714: G1: remove unused variable in G1Policy::transfer_survivors_to_cset
  • af14650: 8275569: Add linux-aarch64 to test-make profiles
  • ... and 114 more: https://git.openjdk.java.net/jdk/compare/333c4692d898d582fe162cc9621acd3e1c242d67...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 label Oct 20, 2021
@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Oct 21, 2021

Thanks Vladimir for your review!

Given that 8273712 is going to deprecate MinInliningThreshold, I've changed the flag in IRExample to another int based flag: TypeProfileLevel.

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me.

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Oct 22, 2021

Thanks Tobias for your review!

@vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented Oct 22, 2021

Thanks Vladimir for your review!

Given that 8273712 is going to deprecate MinInliningThreshold, I've changed the flag in IRExample to another int based flag: TypeProfileLevel.

Okey.

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Oct 25, 2021

Thanks for reviewing it again Vladimir!

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Oct 25, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 2021

Going to push as commit 1da5e6b.
Since your change was applied there have been 134 commits pushed to the master branch:

  • 5dab76b: 8275381: G1: refactor 2 constructors of G1CardSetConfiguration
  • 5bbe4ca: 8275293: A change done with JDK-8268764 mismatches the java.rmi.server.ObjID.hashCode spec
  • c94dc2a: 8272854: split runtime/CommandLine/PrintTouchedMethods.java test
  • fec470f: 8272163: Add -version option to keytool and jarsigner
  • 6523c55: 8198336: java/awt/FontMetrics/FontCrash.java fails in headless mode
  • 88bbf3c: 8273111: Default timezone should return zone ID if /etc/localtime is valid but not canonicalization on linux
  • 4dec8fc: 8275645: [JVMCI] avoid unaligned volatile reads on AArch64
  • 4e647aa: 8275416: G1: remove unnecessary make_referent_alive in precleaning phase
  • dd622e5: 8275783: G1: fix incorrect region type documentation in HeapRegionType
  • b2128a9: 8263155: Allow additional contents for DMG
  • ... and 124 more: https://git.openjdk.java.net/jdk/compare/333c4692d898d582fe162cc9621acd3e1c242d67...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 25, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 2021

@chhagedorn Pushed as commit 1da5e6b.

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

@chhagedorn chhagedorn deleted the JDK-8275104 branch Nov 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants