Migrate espresso to unchained polybench

Author: DSouzaM

vm/benchmarks/interpreter/java/DeltaBlue/DeltaBlue.java renamed to espresso/benchmarks/interpreter/DeltaBlue/DeltaBlue.java

@@ -36,7 +36,7 @@
 import mx_subst
 import mx_util
 import mx_gate
-import mx_espresso_benchmarks  # pylint: disable=unused-import
+import mx_espresso_benchmarks
 import mx_sdk_vm
 import mx_sdk_vm_impl
 from mx_gate import Task, add_gate_runner
@@ -99,7 +99,7 @@ def _espresso_standalone_command(args, with_sulong=False, allow_jacoco=True, jdk
     )
 
 def javavm_deps():
-    result = [espresso_resources_suite() + ':ESPRESSO_RUNTIME_RESOURCES']
+    result = [espresso_runtime_resources_distribution()]
     if mx.suite('truffle-enterprise', fatalIfMissing=False):
         result.append('truffle-enterprise:TRUFFLE_ENTERPRISE')
     if mx.suite('regex', fatalIfMissing=False):
@@ -210,6 +210,8 @@ def _run_verify_imports(s):
     # Find invalid files
     invalid_files = []
     for project in s.projects:
+        if getattr(project, "skipVerifyImports", False):
+            continue
         output_root = project.get_output_root()
         for src_dir in project.source_dirs():
             if src_dir.startswith(output_root):
@@ -579,6 +581,8 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
         community_dist_name=f'GRAALVM_ESPRESSO_COMMUNITY_JAVA{java_home_dep.major_version}{dist_suffix}',
         enterprise_dist_name=f'GRAALVM_ESPRESSO_JAVA{java_home_dep.major_version}{dist_suffix}'))
 
+    mx_espresso_benchmarks.mx_register_dynamic_suite_constituents(register_project, register_distribution)
+
 
 def espresso_resources_suite(java_home_dep=None):
     # Espresso resources are in the CE/EE suite depending on espresso java home type
@@ -590,6 +594,10 @@ def espresso_resources_suite(java_home_dep=None):
         return 'espresso'
 
 
+def espresso_runtime_resources_distribution(java_home_dep=None):
+    return espresso_resources_suite(java_home_dep=java_home_dep) + ':ESPRESSO_RUNTIME_RESOURCES'
+
+
 def register_espresso_runtime_resources(register_project, register_distribution, suite):
     if espresso_resources_suite() != suite.name:
         return

vm/benchmarks/interpreter/java/Fibonacci/Fibonacci.java renamed to espresso/benchmarks/interpreter/Fibonacci/Fibonacci.java

@@ -20,19 +20,108 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
+import os
 import re
 from abc import ABCMeta, abstractmethod
 
 import mx
 import mx_benchmark
 import mx_espresso
+import mx_jardistribution
+import mx_polybench
 
 from mx_benchmark import GuestVm, JavaVm, OutputCapturingJavaVm
 from mx_sdk_benchmark import _daCapoScalaConfig
 
 _suite = mx.suite('espresso')
 
 
+def mx_register_dynamic_suite_constituents(register_project, register_distribution):
+    benchmark_dist = _suite.dependency("ESPRESSO_POLYBENCH_BENCHMARKS")
+    polybench_benchmarks = os.path.join(_suite.dir, 'benchmarks', 'interpreter')
+    for f in os.listdir(polybench_benchmarks):
+        if os.path.isdir(os.path.join(polybench_benchmarks, f)) and not f.startswith("."):
+            main_class = os.path.basename(f)
+            simple_name = main_class.split(".")[-1]
+
+            project_name = 'benchmarks.interpreter.espresso.' + simple_name.lower()
+            register_project(mx.JavaProject(
+                suite=_suite,
+                subDir=None,
+                srcDirs=[os.path.join(_suite.dir, 'benchmarks', 'interpreter', main_class)],
+                deps=[],
+                name=project_name,
+                d=os.path.join(_suite.dir, 'benchmarks', 'interpreter', main_class),
+                javaCompliance='11+',
+                workingSets=None,
+                testProject=True,
+                eclipseformat=False,
+                skipVerifyImports=True,
+                # javac and JDT both produce warnings on these sources. suppress javac warnings and avoid JDT.
+                forceJavac=True,
+                checkstyleProj=project_name,
+                **{
+                    "javac.lint.overrides": "none",
+                }
+            ))
+
+            dist_name = 'ESPRESSO_POLYBENCH_BENCHMARK_' + simple_name.upper()
+            jar_dist = mx_jardistribution.JARDistribution(
+                suite=_suite,
+                subDir=None,
+                srcDirs=[''],
+                sourcesPath=None,
+                deps=[project_name],
+                mainClass=main_class,
+                name=dist_name,
+                path='',
+                platformDependent=False,
+                distDependencies=[],
+                javaCompliance='11+',
+                excludedLibs=[],
+                workingSets=None,
+                theLicense=None,
+                testDistribution=True,
+                maven=False,
+            )
+            register_distribution(jar_dist)
+
+            benchmark_dist.layout[f'./interpreter/{simple_name}.jar'] = [
+                f'dependency:{dist_name}/*.jar']
+            benchmark_dist.buildDependencies.append(dist_name)
+
+    espresso_runtime_resources_distribution = mx_espresso.espresso_runtime_resources_distribution()
+    mx_polybench.register_polybench_language(mx_suite=_suite, language="espresso",
+                                             distributions=["ESPRESSO", "ESPRESSO_LIBS_RESOURCES",
+                                                            espresso_runtime_resources_distribution, "truffle:TRUFFLE_NFI_LIBFFI"])
+
+    def espresso_polybench_runner(polybench_run: mx_polybench.PolybenchRunFunction, tags) -> None:
+        if "gate" in tags:
+            polybench_run(["--jvm", "interpreter/*.jar", "--experimental-options", "--engine.Compilation=false", "-w", "1", "-i", "1"])
+            polybench_run(["--native", "interpreter/*.jar", "--experimental-options", "--engine.Compilation=false", "-w", "1", "-i", "1"])
+        if "benchmark" in tags:
+            polybench_run(["--jvm", "interpreter/*.jar", "--experimental-options", "--engine.Compilation=false"])
+            polybench_run(["--native", "interpreter/*.jar", "--experimental-options", "--engine.Compilation=false"])
+            polybench_run(["--jvm", "interpreter/*.jar"])
+            polybench_run(["--native", "interpreter/*.jar"])
+            polybench_run(["--jvm", "interpreter/*.jar", "--metric=metaspace-memory"])
+            polybench_run(["--jvm", "interpreter/*.jar", "--metric=application-memory"])
+            polybench_run(["--jvm", "interpreter/*.jar", "--metric=allocated-bytes", "-w", "40", "-i", "10", "--experimental-options", "--engine.Compilation=false"])
+            polybench_run(["--native", "interpreter/*.jar", "--metric=allocated-bytes", "-w", "40", "-i", "10", "--experimental-options", "--engine.Compilation=false"])
+            polybench_run(["--jvm", "interpreter/*.jar", "--metric=allocated-bytes", "-w", "40", "-i", "10"])
+            polybench_run(["--native", "interpreter/*.jar", "--metric=allocated-bytes", "-w", "40", "-i", "10"])
+        if "instructions" in tags:
+            assert mx_polybench.is_enterprise()
+            fork_count_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), "polybench-fork-counts.json")
+            polybench_run(["--native", "interpreter/*.jar", "--metric=instructions", "--experimental-options", "--engine.Compilation=false",
+                           "--mx-benchmark-args", "--fork-count-file", fork_count_file])
+
+    mx_polybench.register_polybench_benchmark_suite(mx_suite=_suite, name="espresso", languages=["espresso"],
+                                                    benchmark_distribution=benchmark_dist.name,
+                                                    benchmark_file_filter=".*jar", runner=espresso_polybench_runner,
+                                                    tags={"gate", "benchmark", "instructions"})
+
+
 class EspressoStandaloneVm(OutputCapturingJavaVm, metaclass=ABCMeta):
     def __init__(self, config_name, options):
         super().__init__()

vm/benchmarks/interpreter/java/Richards/Richards.java renamed to espresso/benchmarks/interpreter/Richards/Richards.java

@@ -0,0 +1,6 @@
+{
+  "polybench:interpreter/DeltaBlue.jar": 5,
+  "polybench:interpreter/Fibonacci.jar": 5,
+  "polybench:interpreter/Richards.jar": 5,
+  "polybench:interpreter/Sieve.jar": 5
+}

vm/benchmarks/interpreter/java/Sieve/Sieve.java renamed to espresso/benchmarks/interpreter/Sieve/Sieve.java

@@ -919,5 +919,12 @@
             "dynamicDistDependencies": "jvm_standalone_deps",
             "maven": False,
         },
+
+        "ESPRESSO_POLYBENCH_BENCHMARKS": {
+            "description": "Distribution for Espresso polybench benchmarks",
+            "layout": {
+                # Layout is dynamically populated in mx_register_dynamic_suite_constituents
+            },
+        },
     }
 }