[GR-31875] Move HelloWorld benchmark to own suite.

PullRequest: graal/9068

Author: loicottet

java-benchmarks/java/org.graalvm.bench.misc/src/bench/misc/HelloWorld.java renamed to java-benchmarks/java/org.graalvm.bench.console/src/bench/console/HelloWorld.java

@@ -22,15 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package bench.misc;
+package bench.console;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
-@State(Scope.Benchmark)
 public class HelloWorld {
-    @Benchmark
-    public static void helloWorld() {
+    public static void main(String[] args) {
+        System.out.println("Hello, World!");
     }
 }

java-benchmarks/java/org.graalvm.bench.misc/src/bench/misc/Scalafmt.java renamed to java-benchmarks/java/org.graalvm.bench.console/src/bench/console/Scalafmt.java

@@ -22,11 +22,8 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package bench.misc;
+package bench.console;
 
-import org.openjdk.jmh.annotations.*;
-
-@State(Scope.Benchmark)
 public class Scalafmt {
 
     private static final String file =
@@ -130,8 +127,7 @@ public class Scalafmt {
                     "  }\n" +
                     "}\n";
 
-    @Benchmark
-    public static String bench() {
-        return org.scalafmt.Scalafmt.format(file, org.scalafmt.Scalafmt.format$default$2(), org.scalafmt.Scalafmt.format$default$3()).get();
+    public static void main(String[] args) {
+        org.scalafmt.Scalafmt.format(file, org.scalafmt.Scalafmt.format$default$2(), org.scalafmt.Scalafmt.format$default$3()).get();
     }
 }

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -2033,3 +2033,73 @@ def run(self, benchmarks, bmSuiteArgs):
 
 
 mx_benchmark.add_bm_suite(AWFYBenchmarkSuite())
+
+
+_consoleConfig = {
+    "helloworld": {
+        "mainClass": "bench.console.HelloWorld",
+        "args": []
+    },
+    "scalafmt": {
+        "mainClass": "bench.console.Scalafmt",
+        "args": []
+    }
+}
+
+class ConsoleBenchmarkSuite(mx_benchmark.JavaBenchmarkSuite):
+    """Hello World benchmark suite implementation.
+    """
+    def name(self):
+        return "console"
+
+    def group(self):
+        return "Graal"
+
+    def subgroup(self):
+        return "graal-compiler"
+
+    def benchSuiteName(self, bmSuiteArgs=None):
+        return self.name()
+
+    def helloWorldPath(self):
+            helloWorld = mx.distribution("GRAAL_BENCH_CONSOLE")
+            if helloWorld:
+                return helloWorld.path
+            return None
+
+    def classpathAndMainClass(self, benchmark):
+        main_class = _consoleConfig.get(benchmark)["mainClass"]
+        return ["-cp", self.helloWorldPath(), main_class]
+
+    def appArgs(self, benchmark):
+        return _consoleConfig.get(benchmark)["args"]
+
+    def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
+        if benchmarks is None:
+            mx.abort("Suite can only run a single benchmark per VM instance.")
+        elif len(benchmarks) != 1:
+            mx.abort("Must specify exactly one benchmark to run.")
+        elif benchmarks[0] not in self.benchmarkList(bmSuiteArgs):
+            mx.abort("The specified benchmark doesn't exist. Possible values are: " + ", ".join(self.benchmarkList(bmSuiteArgs)))
+        vmArgs = self.runArgs(bmSuiteArgs)
+        runArgs = self.runArgs(bmSuiteArgs)
+        appArgs = self.appArgs(benchmarks[0])
+        return (vmArgs + self.classpathAndMainClass(benchmarks[0]) + runArgs + appArgs)
+
+    def benchmarkList(self, bmSuiteArgs):
+        return sorted(_consoleConfig.keys())
+
+    def successPatterns(self):
+        return []
+
+    def failurePatterns(self):
+        return [
+            re.compile(
+                r"^\[\[\[Graal compilation failure\]\]\]", # pylint: disable=line-too-long
+                re.MULTILINE)
+        ]
+
+    def rules(self, output, benchmarks, bmSuiteArgs):
+        return []
+
+mx_benchmark.add_bm_suite(ConsoleBenchmarkSuite())

java-benchmarks/mx.java-benchmarks/suite.py

@@ -327,7 +327,6 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JMH_1_21",
-        "SCALAFMT"
       ],
       "javaCompliance" : "8+",
       "checkPackagePrefix" : "false",
@@ -349,6 +348,17 @@
       "workingSets" : "Graal,Bench",
       "testProject" : True,
     },
+    "org.graalvm.bench.console" : {
+      "subDir" : "java",
+      "sourceDirs" : ["src"],
+      "dependencies" : [
+        "SCALAFMT"
+      ],
+      "javaCompliance" : "8+",
+      "checkPackagePrefix" : "false",
+      "workingSets" : "Graal,Bench",
+      "testProject" : True,
+    },
   },
 
   "imports" : {
@@ -372,6 +382,12 @@
       "dependencies" : ["org.graalvm.bench.shootouts"],
       "testDistribution" : True,
       "maven": False,
+    },
+    "GRAAL_BENCH_CONSOLE" : {
+      "subDir" : "java",
+      "dependencies" : ["org.graalvm.bench.console"],
+      "testDistribution" : True,
+      "maven": False,
     }
   }
 }

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -635,3 +635,23 @@ def substitution_path():
 
 
 mx_benchmark.add_bm_suite(ScalaDaCapoNativeImageBenchmarkSuite())
+
+
+class ConsoleNativeImageBenchmarkSuite(mx_java_benchmarks.ConsoleBenchmarkSuite, mx_sdk_benchmark.NativeImageBenchmarkMixin): #pylint: disable=too-many-ancestors
+    """
+    Console applications suite for Native Image
+    """
+
+    def name(self):
+        return 'console-native-image'
+
+    def benchSuiteName(self, bmSuiteArgs=None):
+        return 'console'
+
+    def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
+        args = super(ConsoleNativeImageBenchmarkSuite, self).createCommandLineArgs(benchmarks, bmSuiteArgs)
+        self.benchmark_name = benchmarks[0]
+        return args
+
+
+mx_benchmark.add_bm_suite(ConsoleNativeImageBenchmarkSuite())

vm/mx.vm/mx_vm_benchmark.py

@@ -525,7 +525,11 @@ def run_stage_agent(self, config, stages):
         with stages.set_command([java_command] + hotspot_args) as s:
             s.execute_command()
             if self.hotspot_pgo and s.exit_code == 0:
-                mx.copyfile(profile_path, config.latest_profile_path)
+                # Hotspot instrumentation does not produce profiling information for the helloworld benchmark
+                if os.path.exists(profile_path):
+                    mx.copyfile(profile_path, config.latest_profile_path)
+                else:
+                    mx.warn("No profile information emitted during agent run.")
 
     def run_stage_instrument_image(self, config, stages, out, i, instrumentation_image_name, image_path, image_path_latest, instrumented_iterations):
         executable_name_args = ['-H:Name=' + instrumentation_image_name]
@@ -561,7 +565,7 @@ def run_stage_image(self, config, stages):
         pgo_args = ['--pgo=' + config.latest_profile_path, '-H:+VerifyPGOProfiles', '-H:VerificationDumpFile=' + pgo_verification_output_path]
         pgo_args += ['-H:' + ('+' if self.pgo_context_sensitive else '-') + 'EnablePGOContextSensitivity']
         pgo_args += ['-H:+AOTInliner'] if self.pgo_aot_inline else ['-H:-AOTInliner']
-        final_image_command = config.base_image_build_args + executable_name_args + (pgo_args if self.pgo_instrumented_iterations > 0 or self.hotspot_pgo else [])
+        final_image_command = config.base_image_build_args + executable_name_args + (pgo_args if self.pgo_instrumented_iterations > 0 or (self.hotspot_pgo and os.path.exists(config.latest_profile_path)) else [])
         with stages.set_command(final_image_command) as s:
             s.execute_command()