8207855: Make applications/jcstress invoke tests in batches

Backport-of: 4805473

Author: shipilev

test/hotspot/jtreg/TEST.groups

@@ -424,6 +424,21 @@ hotspot_rest_runtime = \
   -:hotspot_nmt \
   -:hotspot_tier2_runtime_platform_agnostic
 
+jcstress_part1 = \
+  applications/jcstress/seqcst.java
+
+jcstress_part2 = \
+  applications/jcstress/accessAtomic.java \
+  applications/jcstress/acqrel.java \
+  applications/jcstress/atomics.java \
+  applications/jcstress/coherence.java \
+  applications/jcstress/locks.java
+
+jcstress_part3 = \
+  applications/jcstress \
+  -:jcstress_part1 \
+  -:jcstress_part2
+
 # Stress tests against information provided by VM via JMX
 vmTestbase_nsk_monitoring = \
   vmTestbase/nsk/monitoring

test/hotspot/jtreg/applications/jcstress/TestGenerator.java

@@ -29,6 +29,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.file.Files;
@@ -51,11 +52,6 @@
  * Use jcstress test suite to generate jtreg tests in 'test.src' or current
  * directory. Used version is defined in JcstressRunner class.
  *
- * Each generated jtreg test file will contain several tests. Subdirectories are
- * used to allow running all tests from a file using command line. 'copy',
- * 'acqrel', 'fences', 'atomicity', 'seqcst.sync', 'seqcst.volatiles' and
- * 'other' tests will be generated.
- *
  * This generator depends on testlibrary, therefore it should be compiled and
  * added to classpath. One can replace @notest by @test in jtreg test
  * description above to run this class with jtreg.
@@ -97,58 +93,18 @@ public class TestGenerator {
                 " */\n\n", years);
     }
 
-    private static enum JcstressGroup {
-        MEMEFFECTS("memeffects"),
-        COPY("copy"),
-        ACQREL("acqrel"),
-        FENCES("fences"),
-        ATOMICITY("atomicity"),
-        SEQCST_SYNC("seqcst.sync"),
-        SEQCST_VOLATILES("seqcst.volatiles"),
-        OTHER("other", JcstressGroup.otherFilter());
-
-        private final String groupName;
-        private final Predicate<String> filter;
-
-        private JcstressGroup(String groupName, Predicate<String> filter) {
-            this.groupName = groupName;
-            this.filter = filter;
-        }
-
-        private JcstressGroup(String groupName) {
-            this(groupName, JcstressGroup.nameFilter(groupName));
-        }
-
-        private static Predicate<String> nameFilter(String group) {
-            return s -> s.startsWith("org.openjdk.jcstress.tests." + group + ".");
-        }
-
-        private static Predicate<String> otherFilter() {
-            return (s) -> {
-                for (JcstressGroup g : EnumSet.complementOf(EnumSet.of(OTHER))) {
-                    if (g.filter.test(s)) {
-                        return false;
-                    }
-                }
-                return true;
-            };
-        }
-    }
-
     public static String DESC_FORMAT = "\n"
             + "/**\n"
             + " * @test %1$s\n"
             + " * @library /test/lib /\n"
-            + " * @run driver/timeout=2400 " + JcstressRunner.class.getName()
+            + " * @run driver/timeout=21600 " + JcstressRunner.class.getName()
                     // verbose output
                     + " -v"
-                    // test mode preset
-                    + " -m default"
                     // test name
-                    + " -t %1$s\n"
+                    + " -t org.openjdk.jcstress.tests.%1$s\\.\n"
             + " */\n";
 
-    public static void main(String[] args)  {
+    public static void main(String[] args) throws IOException {
         Path path = JcstressRunner.pathToArtifact();
         Path output;
         try {
@@ -162,56 +118,32 @@ public static void main(String[] args)  {
         } catch (Exception e) {
             throw new Error("Can not get list of tests", e);
         }
-        for (JcstressGroup group : JcstressGroup.values()) {
-            try {
-                try (BufferedReader reader = Files.newBufferedReader(output)) {
-                    // skip first 4 lines: name, -{80}, revision and empty line
-                    for (int i = 0; i < 4; ++i) {
-                        reader.readLine();
-                    }
-                    new TestGenerator(group).generate(reader);
-                }
-            } catch (IOException e) {
-                throw new Error("Generating tests for " + group.name()
-                                + " has failed", e);
-            }
-        }
-        output.toFile().delete();
-    }
 
-    private final JcstressGroup group;
+        BufferedReader reader = Files.newBufferedReader(output);
+
+        reader.lines()
+                .skip(4) // skip first 4 lines: name, -{80}, revision and empty line
+                .map(s -> s.split("\\.")[4]) // group by the package name following "org.openjdk.jcstress.tests."
+                .distinct()
+                .filter(s -> !s.startsWith("sample")) // skip sample test
+                .forEach(TestGenerator::generate);
 
-    private TestGenerator(JcstressGroup group) {
-        this.group = group;
+        output.toFile().delete();
     }
 
-    private void generate(BufferedReader reader) throws IOException {
-        // array is needed to change value inside a lambda
-        long[] count = {0L};
-        String root = Utils.TEST_SRC;
-        Path testFile = Paths.get(root)
-                             .resolve(group.groupName)
-                             .resolve("Test.java");
-        File testDir = testFile.getParent().toFile();
-        if (!testDir.mkdirs() && !testDir.exists()) {
-            throw new Error("Can not create directories for "
-                            + testFile.toString());
-        }
+    private static void generate(String group) {
+        Path testFile = Paths.get(Utils.TEST_SRC).resolve(group + ".java");
 
+        System.out.println("Generating " + testFile);
         try (PrintStream ps = new PrintStream(testFile.toFile())) {
             ps.print(COPYRIGHT);
             ps.printf("/* DO NOT MODIFY THIS FILE. GENERATED BY %s */\n",
-                      getClass().getName());
+                    TestGenerator.class.getName());
 
-            reader.lines()
-                  .filter(group.filter)
-                  .forEach(s -> {
-                      count[0]++;
-                      ps.printf(DESC_FORMAT, s);
-                  });
+            ps.printf(DESC_FORMAT, group);
             ps.print('\n');
+        } catch (FileNotFoundException e) {
+            System.out.println("Failed to generate tests for " + group);
         }
-        System.out.printf("%d tests generated in %s%n",
-                count[0], group.groupName);
     }
 }

test/hotspot/jtreg/applications/jcstress/accessAtomic.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY applications.jcstress.TestGenerator */
+
+/**
+ * @test accessAtomic
+ * @library /test/lib /
+ * @run driver/timeout=21600 applications.jcstress.JcstressRunner -v -t org.openjdk.jcstress.tests.accessAtomic\.
+ */
+

test/hotspot/jtreg/applications/jcstress/acqrel.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* DO NOT MODIFY THIS FILE. GENERATED BY applications.jcstress.TestGenerator */
+
+/**
+ * @test acqrel
+ * @library /test/lib /
+ * @run driver/timeout=21600 applications.jcstress.JcstressRunner -v -t org.openjdk.jcstress.tests.acqrel\.
+ */
+