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.

Sign up for GitHub

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

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

Closed
wants to merge 1 commit into from
+1 −3
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitor.java
View file
Original file line number Diff line number Diff line change
@@ -252,10 +252,9 @@ private static boolean getCheckLines() {

VMOption enableJVMCI = bean.getVMOption("EnableJVMCI");
VMOption useJVMCICompiler = bean.getVMOption("UseJVMCICompiler");
String compiler = System.getProperty("jvmci.Compiler");

checkLines = !(enableJVMCI.getValue().equals("true")
&& useJVMCICompiler.getValue().equals("true") && compiler.equals("graal"));
&& useJVMCICompiler.getValue().equals("true"));
Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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
  */

Copy link
Member

Choose a reason for hiding this comment

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

Ok.

} catch (Exception e) {
// NOP.
}
1 change: 0 additions & 1 deletion test/lib/jdk/test/whitebox/code/Compiler.java
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,6 @@ public static boolean isJVMCIEnabled() {
* Graal is enabled if following conditions are true:
* - we are not in Interpreter mode
* - UseJVMCICompiler flag is true
* - jvmci.Compiler variable is equal to 'graal'
* - TieredCompilation is not used or TieredStopAtLevel is greater than 3
* No need to check client mode because it set UseJVMCICompiler to false.
*