Run all tests in StringIntrinsicAVX3ThresholdTest

Author: tkrodriguez

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubprocessTest.java

@@ -74,10 +74,6 @@ public SubprocessUtil.Subprocess launchSubprocess(Predicate<String> vmArgsFilter
         return launchSubprocess(null, vmArgsFilter, true, getClass(), currentUnitTestName(), runnable, args);
     }
 
-    public SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, Runnable runnable, String... args) throws InterruptedException, IOException {
-        return launchSubprocess(null, null, true, testClass, currentUnitTestName(), runnable, args);
-    }
-
     public static SubprocessUtil.Subprocess launchSubprocess(Class<? extends GraalCompilerTest> testClass, String testSelector, Runnable runnable, String... args)
                     throws InterruptedException, IOException {
         return launchSubprocess(null, null, true, testClass, testSelector, runnable, args);
@@ -93,6 +89,8 @@ private static List<String> filter(List<String> args, Predicate<String> vmArgsFi
         return result;
     }
 
+    public static final String ALL_TESTS = "ALL_TESTS";
+
     public boolean isRecursiveLaunch() {
         return isRecursiveLaunch(getClass());
     }
@@ -123,7 +121,7 @@ public static SubprocessUtil.Subprocess launchSubprocess(Predicate<List<String>>
             List<String> mainClassAndArgs = new LinkedList<>();
             mainClassAndArgs.add("com.oracle.mxtool.junit.MxJUnitWrapper");
             assert testSelector != null : "must pass the name of the current unit test";
-            String testName = testClass.getName() + "#" + testSelector;
+            String testName = testSelector.equals(ALL_TESTS) ? testClass.getName() : testClass.getName() + "#" + testSelector;
             mainClassAndArgs.add(testName);
             boolean junitVerbose = getProcessCommandLine().contains("-JUnitVerbose");
             if (junitVerbose) {

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIntrinsicAVX3ThresholdTest.java

@@ -52,8 +52,7 @@ public void before() {
          */
     }
 
-    @SuppressWarnings("unused")
-    public void testWithAVX3Threshold(String testSelector, Class<? extends GraalCompilerTest> testClass) {
+    public void testWithAVX3Threshold(Class<? extends GraalCompilerTest> testClass) {
         Runnable nopRunnable = () -> {
             /*
              * The runnable is only relevant when running a test in the same class as the parent
@@ -62,7 +61,7 @@ public void testWithAVX3Threshold(String testSelector, Class<? extends GraalComp
         };
         SubprocessUtil.Subprocess subprocess = null;
         try {
-            subprocess = launchSubprocess(testClass, nopRunnable, "-XX:UseAVX=3", "-XX:+UnlockDiagnosticVMOptions", "-XX:AVX3Threshold=0");
+            subprocess = launchSubprocess(testClass, ALL_TESTS, nopRunnable, "-XX:UseAVX=3", "-XX:+UnlockDiagnosticVMOptions", "-XX:AVX3Threshold=0");
         } catch (IOException | InterruptedException e) {
             Assert.fail("subprocess exception: " + e);
         }
@@ -71,17 +70,17 @@ public void testWithAVX3Threshold(String testSelector, Class<? extends GraalComp
 
     @Test
     public void compressInflate() {
-        testWithAVX3Threshold("compressInflate", StringCompressInflateTest.class);
+        testWithAVX3Threshold(StringCompressInflateTest.class);
     }
 
     @Test
     public void compareTo() {
-        testWithAVX3Threshold("compareTo", StringCompareToTest.class);
-        testWithAVX3Threshold("compareTo", StringCompareToAVX512Test.class);
+        testWithAVX3Threshold(StringCompareToTest.class);
+        testWithAVX3Threshold(StringCompareToAVX512Test.class);
     }
 
     @Test
     public void countPositives() {
-        testWithAVX3Threshold("countPositives", CountPositivesTest.class);
+        testWithAVX3Threshold(CountPositivesTest.class);
     }
 }