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

8325610: CTW: Add StressIncrementalInlining to stress options #17897

Closed
wants to merge 1 commit into from

Conversation

caojoshua
Copy link
Contributor

@caojoshua caojoshua commented Feb 16, 2024

CtwRunner opts-in into various C2 randomizers

I think we forgot to add -XX:+StressIncrementalInlining there, which was added by JDK-8319879.

tested by ./ctwrunner.sh modules:java.base

I can see -XX:+StressIncrementalInlining in modules_java_base_0.cmd

-Xbatch
-XX:-ShowMessageBoxOnError
-XX:+UnlockDiagnosticVMOptions
-XX:+DisplayVMOutputToStderr
-DCompileTheWorldStartAt=0
-DCompileTheWorldStopAt=7671
-XX:+WhiteBoxAPI
-Xbootclasspath/a:.
--add-exports
java.base/jdk.internal.jimage=ALL-UNNAMED
--add-exports
java.base/jdk.internal.misc=ALL-UNNAMED
--add-exports
java.base/jdk.internal.reflect=ALL-UNNAMED
--add-exports
java.base/jdk.internal.access=ALL-UNNAMED
-XX:+LogCompilation
-XX:LogFile=hotspot_modules_java_base_0_%p.log
-XX:ErrorFile=hs_err_modules_java_base_0_%p.log
-XX:ReplayDataFile=replay_modules_java_base_0_%p.log
-XX:CompileCommand=exclude,java/lang/invoke/MethodHandle.*
-XX:+IgnoreUnrecognizedVMOptions
-XX:+StressLCM
-XX:+StressGCM
-XX:+StressIGVN
-XX:+StressCCP
-XX:+StressMacroExpansion
-XX:+StressIncrementalInlining
-XX:StressSeed=1785134692

sun.hotspot.tools.ctw.CompileTheWorld
modules:java.base

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-8325610: CTW: Add StressIncrementalInlining to stress options (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17897

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 16, 2024

👋 Welcome back caojoshua! 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 Pull request is ready for review label Feb 16, 2024
@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@caojoshua 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 Feb 16, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 16, 2024

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Good.

@@ -299,6 +299,7 @@ private String[] cmd(long classStart, long classStop) {
"-XX:+StressIGVN",
"-XX:+StressCCP",
"-XX:+StressMacroExpansion",
"-XX:+StressIncrementalInlining",
Copy link
Member

Choose a reason for hiding this comment

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

I think we want to maintain the historical order here. Check me on this: StressIncrementalInlining went in before StressMacroExpansion, but after StressCCP, and so should be one line up?

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

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

8325610: CTW: Add StressIncrementalInlining to stress options

Reviewed-by: shade, xliu

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

  • 69a11c7: 8326222: Fix copyright year in src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
  • 9fbcc00: 8326127: JFR: Add SafepointCleanupTask to hardToTestEvents of TestLookForUntestedEvents
  • 7d32a1a: 8326111: JFR: Cleanup for JFR_ONLY
  • a3d7f9f: 8326126: Update the java manpage with the changes from JDK-8322478
  • 20a25f6: 8326067: Remove os::remap_memory and simplify os::map_memory
  • 5c5a282: 8325950: Make sure all files in the JDK pass jcheck
  • 8668198: 8325972: Add -x to bash for building with LOG=debug
  • a19314b: 8326101: [PPC64] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • f6d7e30: 8294977: Convert test/jdk/java tests from ASM library to Classfile API
  • 82609b1: 8326112: Javadoc snippet for Linker.Option.captureCallState is wrong
  • ... and 16 more: https://git.openjdk.org/jdk/compare/267780bf0adf4bfd831fbc04347e297fa8f3bb01...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@shipilev, @navyxliu) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 19, 2024
@caojoshua
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 19, 2024
@openjdk
Copy link

openjdk bot commented Feb 19, 2024

@caojoshua
Your change (at version 6ebda9d) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

I'll wait for another reviewer before sponsoring.

Copy link
Member

@navyxliu navyxliu left a comment

Choose a reason for hiding this comment

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

LGTM. I am not a reviewer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 20, 2024

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

  • 0d28531: 8318812: LauncherHelper.checkAndLoadMain closes jar file that's about to be re-opened
  • 69a11c7: 8326222: Fix copyright year in src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
  • 9fbcc00: 8326127: JFR: Add SafepointCleanupTask to hardToTestEvents of TestLookForUntestedEvents
  • 7d32a1a: 8326111: JFR: Cleanup for JFR_ONLY
  • a3d7f9f: 8326126: Update the java manpage with the changes from JDK-8322478
  • 20a25f6: 8326067: Remove os::remap_memory and simplify os::map_memory
  • 5c5a282: 8325950: Make sure all files in the JDK pass jcheck
  • 8668198: 8325972: Add -x to bash for building with LOG=debug
  • a19314b: 8326101: [PPC64] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • f6d7e30: 8294977: Convert test/jdk/java tests from ASM library to Classfile API
  • ... and 17 more: https://git.openjdk.org/jdk/compare/267780bf0adf4bfd831fbc04347e297fa8f3bb01...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 20, 2024
@openjdk openjdk bot closed this Feb 20, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 20, 2024
@openjdk
Copy link

openjdk bot commented Feb 20, 2024

@shipilev @caojoshua Pushed as commit 5bf859c.

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

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