changeset 59292:2d77b8cd4230

Merge
author psadhukhan
date Wed, 11 Dec 2019 12:03:39 +0530
parents 6e16ceda3b96 71674e727f6c
children dcf88e5c8c07 caaebecad412
files
diffstat 49 files changed, 55 insertions(+), 99 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/TEST.groups	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/TEST.groups	Wed Dec 11 12:03:39 2019 +0530
@@ -156,6 +156,9 @@
   compiler/aot \
   compiler/jvmci
 
+tier1_compiler_graal = \
+  compiler/graalunit/HotspotTest.java
+
 ctw_1 = \
   applications/ctw/modules/ \
   -:ctw_2 \
--- a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/ApiTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmSparcTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.sparc.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/CoreTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  * @requires !vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/DebugTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/EATest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/EATest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  * @requires vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotSparcTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotSparcTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  * @requires vm.simpleArch == "sparcv9"
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.sparc.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/LirTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/LirTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/LoopTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  * @requires vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/UtilTest.java	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java	Wed Dec 11 12:03:39 2019 +0530
@@ -24,7 +24,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  *
  * @modules jdk.internal.vm.compiler
  *
@@ -34,7 +33,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
--- a/test/hotspot/jtreg/compiler/graalunit/generateTests.sh	Wed Dec 11 11:13:41 2019 +0530
+++ b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh	Wed Dec 11 12:03:39 2019 +0530
@@ -27,7 +27,8 @@
   fName="${fName}Test.java"
   echo "Generate $fName for $pName ..."
 
-  action="main"
+  action="main/othervm"
+  flags="-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI"
   if [[ $timeoutInfo == timeout* ]] ; then
      action="$action/$timeoutInfo"  
   else
@@ -62,7 +63,6 @@
 /*
  * @test
  * @summary
- * @requires vm.opt.final.EnableJVMCI == true
  * $requireInfo
  * @modules jdk.internal.vm.compiler
  *
@@ -72,7 +72,7 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run $action compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt
+ * @run $action $flags compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt
  */
  
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */