8277503: compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java f…

…ailed with "OnSpinWaitInst with the expected value 'isb' not found." Reviewed-by: phh Backport-of: 7b2d823e842e6a66dbe46b048da44ca9e5485c75
openjdk · Jan 20, 2022 · 43ddf82214c1b0721fb5afc35aec6f2f6b800644 · 43ddf82 · openjdk-notifier · Jan 20, 2022
1 parent fe1d8e9
commit 43ddf82214c1b0721fb5afc35aec6f2f6b800644
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java b/test/hotspot/jtreg/compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java
@@ -87,7 +87,8 @@ public static void main(String[] args) throws Exception {
         final String cpuModel = cpuFeatures.get(0);
 
         if (isCPUModelNeoverseN1(cpuModel)) {
-            checkFinalFlagsEqualTo(ProcessTools.createJavaProcessBuilder("-XX:+PrintFlagsFinal", "-version"), "isb", "1");
+            checkFinalFlagsEqualTo(ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintFlagsFinal", "-version"),
+                "isb", "1");
             checkFinalFlagsEqualTo(ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions", "-XX:OnSpinWaitInstCount=2", "-XX:+PrintFlagsFinal", "-version"),
                 "isb", "2");
         } else {