8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled #14381

mur47x111 · 2023-06-08T17:14:39Z

HeapMonitor checks if System.getProperty("jvmci.Compiler") is graal and will not enforce checking line number derived from uncommon trap debug info. However, Graal does not set this property explicitly.

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-8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled (Bug - P4)

Reviewers

Doug Simon (@dougxc - Committer)
Serguei Spitsyn (@sspitsyn - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14381

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-08T17:15:29Z

👋 Welcome back yzheng! 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.

dougxc · 2023-06-08T17:19:46Z

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java


      checkLines = !(enableJVMCI.getValue().equals("true")
-          && useJVMCICompiler.getValue().equals("true") && compiler.equals("graal"));
+          && useJVMCICompiler.getValue().equals("true"));


Is it possible to use jdk.test.whitebox.code.Compiler.isGraalEnabled() here instead?

To use whitebox I will have to update the config of every test here, which I think is too verbose:

diff --git a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatIntervalTest.java b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatIntervalTest.java index e08454a4857..f086f744965 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatIntervalTest.java +++ b/test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatIntervalTest.java @@ -27,11 +27,15 @@ package MyPackage; /** * @test * @summary Verifies the JVMTI Heap Monitor sampling interval average. - * @build Frame HeapMonitor + * @library /test/lib + * @build Frame HeapMonitor jdk.test.whitebox.WhiteBox * @compile HeapMonitorStatIntervalTest.java * @requires vm.jvmti * @requires vm.compMode != "Xcomp" - * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorStatIntervalTest + * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox + * @run main/othervm/native -agentlib:HeapMonitorTest -Xbootclasspath/a:. + * -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI + * MyPackage.HeapMonitorStatIntervalTest */

openjdk · 2023-06-08T17:33:34Z

@mur47x111 The following label will be automatically applied to this pull request:

serviceability

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 · 2023-06-08T17:40:02Z

Webrevs

00: Full (c5ccdb27)

sspitsyn

Looks good.
Is JVMCI used by the Graal compiler only?
Thanks,
Serguei

openjdk · 2023-06-09T05:28:04Z

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

8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled

Reviewed-by: dnsimon, sspitsyn

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

5d71612: 8309852: G1: Remove unnecessary assert_empty in G1ParScanThreadStateSet destructor
23a54f3: 8309538: G1: Move total collection increment from Cleanup to Remark
57fc9a3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
2dca5ae: 8299052: ViewportOverlapping test fails intermittently on Win10 & Win11
3028295: 8309065: Move the logic to determine archive heap location from CDS to G1 GC
80a8144: 8309867: redundant class field RSAPadding.md
3c15ad8: 8307144: namedParams in XECParameters and EdDSAParameters can be private final
3ce1240: 8309870: Using -proc:full should be considered requesting explicit annotation processing
1612b6d: 8309752: com/sun/jdi/SetLocalWhileThreadInNative.java fails with virtual test thread factory due to OpaqueFrameException
45414fc: 8307858: [REDO] JDK-8307194 Add make target for optionally building a complete set of all JDK and hotspot libjvm static libraries
... and 41 more: https://git.openjdk.org/jdk/compare/bb966827ac445d805bac5005d0fbda0c61111252...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 (@dougxc, @sspitsyn) 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).

dougxc · 2023-06-09T12:14:46Z

Is JVMCI used by the Graal compiler only?

So far this is true and will probably remain true for the foreseeable future. However, the Right Thing to do long term is to add a jdk.test.whitebox.code.Compiler.uncommonTrapsHavePreciseBCIs() method.

mur47x111 · 2023-06-13T08:32:23Z

Thanks for the review!

mur47x111 · 2023-06-13T08:32:35Z

/integrate

openjdk · 2023-06-13T08:34:21Z

@mur47x111
Your change (at version c5ccdb2) is now ready to be sponsored by a Committer.

dougxc · 2023-06-13T09:01:03Z

/sponsor

openjdk · 2023-06-13T09:02:39Z

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

1a9edb8: 8309838: Classfile API Util.toBinaryName and other cleanup
f7de726: 8295555: Primitive wrapper caches could be @Stable
5d71612: 8309852: G1: Remove unnecessary assert_empty in G1ParScanThreadStateSet destructor
23a54f3: 8309538: G1: Move total collection increment from Cleanup to Remark
57fc9a3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
2dca5ae: 8299052: ViewportOverlapping test fails intermittently on Win10 & Win11
3028295: 8309065: Move the logic to determine archive heap location from CDS to G1 GC
80a8144: 8309867: redundant class field RSAPadding.md
3c15ad8: 8307144: namedParams in XECParameters and EdDSAParameters can be private final
3ce1240: 8309870: Using -proc:full should be considered requesting explicit annotation processing
... and 43 more: https://git.openjdk.org/jdk/compare/bb966827ac445d805bac5005d0fbda0c61111252...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-13T09:02:50Z

@dougxc @mur47x111 Pushed as commit 4f23fc1.

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

dougxc · 2023-06-20T06:46:56Z

Is JVMCI used by the Graal compiler only?

So far this is true and will probably remain true for the foreseeable future. However, the Right Thing to do long term is to add a jdk.test.whitebox.code.Compiler.uncommonTrapsHavePreciseBCIs() method.

I created https://bugs.openjdk.org/browse/JDK-8310346 for this enhancement.

Avoid using jvmci.Compiler property to determine if Graal is enabled.

c5ccdb2

dougxc reviewed Jun 8, 2023

View reviewed changes

openjdk bot added the rfr Pull request is ready for review label Jun 8, 2023

mur47x111 changed the title ~~8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled.~~ 8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled Jun 8, 2023

openjdk bot added the serviceability serviceability-dev@openjdk.org label Jun 8, 2023

dougxc approved these changes Jun 8, 2023

View reviewed changes

sspitsyn approved these changes Jun 9, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 13, 2023

openjdk bot added the integrated Pull request has been integrated label Jun 13, 2023

openjdk bot closed this Jun 13, 2023

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 Jun 13, 2023

8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled #14381

8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled #14381

Uh oh!

Conversation

mur47x111 commented Jun 8, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jun 8, 2023

Uh oh!

dougxc Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

mur47x111 Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

dougxc Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jun 8, 2023

Uh oh!

mlbridge bot commented Jun 8, 2023

Webrevs

Uh oh!

sspitsyn left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jun 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dougxc commented Jun 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mur47x111 commented Jun 13, 2023

Uh oh!

mur47x111 commented Jun 13, 2023

Uh oh!

openjdk bot commented Jun 13, 2023

Uh oh!

dougxc commented Jun 13, 2023

Uh oh!

openjdk bot commented Jun 13, 2023

Uh oh!

openjdk bot commented Jun 13, 2023

Uh oh!

dougxc commented Jun 20, 2023

Uh oh!

Uh oh!

mur47x111 commented Jun 8, 2023 •

edited by openjdk bot

Loading

openjdk bot commented Jun 9, 2023 •

edited

Loading

dougxc commented Jun 9, 2023 •

edited

Loading