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

8276546: [IR Framework] Whitelist and ignore CompileThreshold #6312

Closed
wants to merge 1 commit into from

Conversation

chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Nov 9, 2021

This patch whitelists CompileThreshold and ignores it if passed as JTreg VM/Java option flag to a test. The reason to do this is that our CI executes -XX:-TieredCompilation in combination with CompileThreshold and therefore IR matching will not be performed (because CompileThreshold is not whitelisted). This patch changes this.

Setting CompileThreshold with TestFramework::addFlags/runWithFlags() will normally apply the flag.

Thanks,
Christian


Progress

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

Issue

  • JDK-8276546: [IR Framework] Whitelist and ignore CompileThreshold

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6312

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 9, 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 Nov 9, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 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 label Nov 9, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 9, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Oaky.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 9, 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:

8276546: [IR Framework] Whitelist and ignore CompileThreshold

Reviewed-by: kvn, neliasso

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

  • 0699220: 8268882: C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
  • d7012fb: 8276880: Remove java/lang/RuntimeTests/exec/ExecWithDir as unnecessary
  • f9024d0: 8230130: javadoc search result dialog shows cut off headers for long results
  • 055de6f: 8223358: Incorrect HTML structure in annotation pages
  • a60e912: 8198626: java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html fails on mac
  • dde959d: 8276808: java/nio/channels/Channels/TransferTo.java timed out
  • daf77eb: 8276337: Use override specifier in HeapDumper
  • 93692ea: 8274395: Use enhanced-for instead of plain 'for' in jdk.internal.jvmstat
  • e35abe3: 8256208: Javadoc's generated overview does not show classes of unnamed package
  • f65db88: 8276841: Add support for Visual Studio 2022
  • ... and 69 more: https://git.openjdk.java.net/jdk/compare/3613ce7c7d5bc8b7d603e1cf6a123588339aed3f...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 Nov 9, 2021
Copy link

@neliasso neliasso left a comment

Looks good.

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Nov 10, 2021

Thanks Vladimir and Nils for your reviews!

@chhagedorn
Copy link
Member Author

@chhagedorn chhagedorn commented Nov 11, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

Going to push as commit 7a140af.
Since your change was applied there have been 105 commits pushed to the master branch:

  • 91bb0d6: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • 08e0fd6: 8276835: G1: make G1EvacFailureObjectsSet::record inline
  • ad3be04: 8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766
  • e27a67a: 8276930: Update ProblemList
  • 73e6d7d: 8276801: gc/stress/CriticalNativeStress.java fails intermittently with Shenandoah
  • bce35ac: 8276775: ZonedDateTime/OffsetDateTime.toString return invalid ISO-8601 for years <= 1893
  • 0c409ca: 8276186: Require getAvailableLocales() methods to include Locale.ROOT
  • df02daa: 8269986: Remove +3 from Symbol::identity_hash()
  • 2374abd: 8276678: Malformed Javadoc inline tags in JDK source in com/sun/beans/decoder/DocumentHandler.java
  • 67c2714: 8276889: Improve compatibility discussion in instanceKlass.cpp
  • ... and 95 more: https://git.openjdk.java.net/jdk/compare/3613ce7c7d5bc8b7d603e1cf6a123588339aed3f...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 11, 2021

@chhagedorn Pushed as commit 7a140af.

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

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