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

8314838: 3 compiler tests ignore vm flags #15609

Conversation

lepestock
Copy link
Contributor

@lepestock lepestock commented Sep 7, 2023

For the compiler tests in question this PR:

  • replaces all calls to ProcessTools.createJavaProcessBuilder with another method, the createTestJvm, which prepends given arguments with what was passed to the enclosing test. The change therefore...
  • makes sure the external arguments aren't ignored and are used for creating the inner JVM;
  • adds @requires guards in some places - where the test explicitly controls the Tiered Compilation, for example.

Testing: a local and a CI run, no failures registered.


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-8314838: 3 compiler tests ignore vm flags (Sub-task - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15609

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 7, 2023

👋 Welcome back enikitin! 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 Sep 7, 2023
@openjdk
Copy link

openjdk bot commented Sep 7, 2023

@lepestock 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 Sep 7, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2023

Webrevs

Copy link
Member

@eastig eastig left a comment

Choose a reason for hiding this comment

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

lgtm

* @library /test/lib
* @requires vm.opt.TieredStopAtLevel == null & vm.opt.TieredCompilation == null
* @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="i386" | os.arch=="x86" | os.arch=="aarch64" | os.arch=="riscv64"
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider using vm.simpleArch in @requires:

@requires vm.simpleArch == "x86" | vm.simpleArch == "x64" | vm.simpleArch == "aarch64" | vm.simpleArch == "riscv64"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed. Thanks Vladimir!

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 Sep 7, 2023

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

8314838: 3 compiler tests ignore vm flags

Reviewed-by: eastigeevich, kvn, lmesnik

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

  • ebc718f: 8315818: vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java fails on libgraal
  • 4a6bd81: 8315854: G1: Remove obsolete comment in G1ReclaimEmptyRegionsTask
  • c664f1c: 8307352: AARCH64: Improve itable_stub
  • 8ddf9ea: 8315686: G1: Disallow evacuation of marking regions in a Prepare Mixed gc
  • 7ef059a: 8315605: G1: Add number of nmethods in code roots scanning statistics
  • 825e0ed: 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
  • dac1727: 8308869: C2: use profile data in subtype checks when profile has more than one class
  • 3c258ac: 8315702: jcmd Thread.dump_to_file slow with millions of virtual threads
  • 3a00ec8: 8312075: FileChooser.win32.newFolder is not updated when changing Locale
  • 806ef08: 8315594: Open source few headless Swing misc tests
  • ... and 159 more: https://git.openjdk.org/jdk/compare/f139f30695d9c9a79e1426949a130f24e0b240fc...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 (@eastig, @vnkozlov, @lmesnik) 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 Sep 7, 2023
@lepestock
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 8, 2023
@openjdk
Copy link

openjdk bot commented Sep 8, 2023

@lepestock
Your change (at version 83e5996) is now ready to be sponsored by a Committer.

@eastig
Copy link
Member

eastig commented Sep 8, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 8, 2023

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

  • b3dfc39: 8315930: Revert "8315220: Event NativeLibraryLoad breaks invariant by taking a stacktrace when thread is in state _thread_in_native"
  • ebc718f: 8315818: vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java fails on libgraal
  • 4a6bd81: 8315854: G1: Remove obsolete comment in G1ReclaimEmptyRegionsTask
  • c664f1c: 8307352: AARCH64: Improve itable_stub
  • 8ddf9ea: 8315686: G1: Disallow evacuation of marking regions in a Prepare Mixed gc
  • 7ef059a: 8315605: G1: Add number of nmethods in code roots scanning statistics
  • 825e0ed: 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
  • dac1727: 8308869: C2: use profile data in subtype checks when profile has more than one class
  • 3c258ac: 8315702: jcmd Thread.dump_to_file slow with millions of virtual threads
  • 3a00ec8: 8312075: FileChooser.win32.newFolder is not updated when changing Locale
  • ... and 160 more: https://git.openjdk.org/jdk/compare/f139f30695d9c9a79e1426949a130f24e0b240fc...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 8, 2023
@openjdk openjdk bot closed this Sep 8, 2023
@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 Sep 8, 2023
@openjdk
Copy link

openjdk bot commented Sep 8, 2023

@eastig @lepestock Pushed as commit ab6a87e.

💡 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
4 participants