[GR-28769] Adapt to mx changes in benchSuiteVersion.

PullRequest: graal/9116
CAFxX · Jun 11, 2021 · dbe78ab · dbe78ab
2 parents 41cb943 + 83eb488
commit dbe78ab
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 20 deletions.
diff --git a/compiler/mx.compiler/mx_graal_benchmark.py b/compiler/mx.compiler/mx_graal_benchmark.py
@@ -184,7 +184,7 @@ def vmArgs(self, bmSuiteArgs):
     def getBenchmarkName(self):
         raise NotImplementedError()
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         raise NotImplementedError()
 
     def shorten_vm_flags(self, args):
@@ -395,7 +395,7 @@ def run(self, benchmarks, bmSuiteArgs):
 class DaCapoTimingBenchmarkSuite(DaCapoTimingBenchmarkMixin, DaCapoBenchmarkSuite): # pylint: disable=too-many-ancestors
     """DaCapo 9.12 (Bach) benchmark suite implementation."""
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         return "dacapo"
 
 
@@ -405,7 +405,7 @@ def benchSuiteName(self):
 class ScalaDaCapoTimingBenchmarkSuite(DaCapoTimingBenchmarkMixin, ScalaDaCapoBenchmarkSuite): # pylint: disable=too-many-ancestors
     """Scala DaCapo benchmark suite implementation."""
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         return "scala-dacapo"
 
 

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.292.5",
+  "mxversion" : "5.301.0",
   "name" : "compiler",
   "sourceinprojectwhitelist" : [],
 

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -547,9 +547,6 @@ def group(self):
     def subgroup(self):
         return "graal-compiler"
 
-    def benchSuiteName(self):
-        return self.name()
-
     def daCapoClasspathEnvVarName(self):
         raise NotImplementedError()
 

diff --git a/java-benchmarks/mx.java-benchmarks/suite.py b/java-benchmarks/mx.java-benchmarks/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.287.0",
+  "mxversion" : "5.301.0",
   "name": "java-benchmarks",
 
   "javac.lint.overrides": "none",

diff --git a/sdk/mx.sdk/mx_sdk_benchmark.py b/sdk/mx.sdk/mx_sdk_benchmark.py
@@ -202,9 +202,6 @@ def __init__(self):
         self.parser.add_argument("--workload-configuration", type=str, default=None, help="Path to workload configuration.")
         self.parser.add_argument("--skip-latency-measurements", action='store_true', default=False, help="Determines if the latency measurements should be skipped.")
 
-    def benchSuiteName(self):
-        return self.name()
-
     def benchMicroserviceName(self):
         """
         Returns the microservice name. The convention here is that the benchmark name contains two elements separated

diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion" : "5.297.0",
+  "mxversion" : "5.301.0",
   "name" : "sdk",
   "version" : "21.2.0",
   "release" : False,

diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
@@ -149,7 +149,7 @@ class RenaissanceNativeImageBenchmarkSuite(mx_java_benchmarks.RenaissanceBenchma
     def name(self):
         return 'renaissance-native-image'
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         return 'renaissance'
 
     def renaissance_harness_lib_name(self):
@@ -438,7 +438,7 @@ def daCapoPath(self):
     def daCapoSuiteTitle(self):
         return super(DaCapoNativeImageBenchmarkSuite, self).suite_title()
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         return 'dacapo'
 
     def daCapoIterations(self):
@@ -571,7 +571,7 @@ def daCapoPath(self):
             return lib.get_path(True)
         return None
 
-    def benchSuiteName(self):
+    def benchSuiteName(self, bmSuiteArgs=None):
         return 'scala-dacapo'
 
     def daCapoIterations(self):

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1,5 +1,5 @@
 suite = {
-    "mxversion": "5.294.0",
+    "mxversion": "5.301.0",
     "name": "substratevm",
     "version" : "21.2.0",
     "release" : False,

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -1,7 +1,7 @@
 suite = {
     "name": "vm",
     "version" : "21.2.0",
-    "mxversion" : "5.299.0",
+    "mxversion" : "5.301.0",
     "release" : False,
     "groupId" : "org.graalvm",
 

diff --git a/wasm/mx.wasm/mx_wasm_benchmark.py b/wasm/mx.wasm/mx_wasm_benchmark.py
@@ -212,8 +212,13 @@ def name(self):
     def group(self):
         return "Graal"
 
-    def benchSuiteName(self, bmSuiteArgs):
-        return next(arg for arg in bmSuiteArgs if arg.endswith("BenchmarkSuite"))
+    def benchSuiteName(self, bmSuiteArgs=None):
+        if bmSuiteArgs is None:
+            bmSuiteArgs = []
+        try:
+            return next(arg for arg in bmSuiteArgs if arg.endswith("BenchmarkSuite"))
+        except StopIteration:
+            return self.name()
 
     def subgroup(self):
         return "wasm"

diff --git a/wasm/mx.wasm/suite.py b/wasm/mx.wasm/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion" : "5.249.5",
+  "mxversion" : "5.301.0",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
   "version" : "21.2.0",