Use a single suite for all Ruby warmup benchmarks

Author: eregon

ci.jsonnet

@@ -444,9 +444,9 @@ local part_definitions = {
     chunky: { benchmarks+:: ["chunky"] },
     psd: { benchmarks+:: ["psd"] },
     asciidoctor: { benchmarks+:: ["asciidoctor"] },
-    asciidoctor_warmup: { benchmarks+:: ["asciidoctor-warmup"] },
     other_extra: { benchmarks+:: ["savina"] },
     other: { benchmarks+:: ["micro", "image-demo", "optcarrot", "synthetic", "rubykon", "liquid"] },
+    warmup: { benchmarks+:: ["ruby-warmup"] },
 
     server: {
       local build = self,
@@ -615,17 +615,17 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-benchmarks-asciidoctor-svm-graal-core-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-core"] + $.use.multi_tier,
       "ruby-benchmarks-asciidoctor-svm-graal-enterprise": shared + asciidoctor + svm_configurations["svm-graal-enterprise"],
       "ruby-benchmarks-asciidoctor-svm-graal-enterprise-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
-      local asciidoctor_warmup = $.benchmark.runner + $.benchmark.asciidoctor_warmup + { timelimit: "00:55:00" },
-      "ruby-benchmarks-asciidoctor-mri-warmup": shared + asciidoctor_warmup + other_rubies.mri,
-      "ruby-benchmarks-asciidoctor-jruby-warmup": shared + asciidoctor_warmup + other_rubies.jruby,
-      "ruby-benchmarks-asciidoctor-graal-core-warmup": shared + asciidoctor_warmup + graal_configurations["graal-core"],
-      "ruby-benchmarks-asciidoctor-graal-core-multi-tier-warmup": shared + asciidoctor_warmup + graal_configurations["graal-core"] + $.use.multi_tier,
-      "ruby-benchmarks-asciidoctor-graal-enterprise-warmup": shared + asciidoctor_warmup + graal_configurations["graal-enterprise"],
-      "ruby-benchmarks-asciidoctor-graal-enterprise-multi-tier-warmup": shared + asciidoctor_warmup + graal_configurations["graal-enterprise"] + $.use.multi_tier,
-      "ruby-benchmarks-asciidoctor-svm-graal-core-warmup": shared + asciidoctor_warmup + svm_configurations["svm-graal-core"],
-      "ruby-benchmarks-asciidoctor-svm-graal-core-multi-tier-warmup": shared + asciidoctor_warmup + svm_configurations["svm-graal-core"] + $.use.multi_tier,
-      "ruby-benchmarks-asciidoctor-svm-graal-enterprise-warmup": shared + asciidoctor_warmup + svm_configurations["svm-graal-enterprise"],
-      "ruby-benchmarks-asciidoctor-svm-graal-enterprise-multi-tier-warmup": shared + asciidoctor_warmup + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
+      local warmup = $.benchmark.runner + $.benchmark.warmup + { timelimit: "00:55:00" },
+      "ruby-benchmarks-warmup-mri": shared + warmup + other_rubies.mri,
+      "ruby-benchmarks-warmup-jruby": shared + warmup + other_rubies.jruby,
+      "ruby-benchmarks-warmup-graal-core": shared + warmup + graal_configurations["graal-core"],
+      "ruby-benchmarks-warmup-graal-core-multi-tier": shared + warmup + graal_configurations["graal-core"] + $.use.multi_tier,
+      "ruby-benchmarks-warmup-graal-enterprise": shared + warmup + graal_configurations["graal-enterprise"],
+      "ruby-benchmarks-warmup-graal-enterprise-multi-tier": shared + warmup + graal_configurations["graal-enterprise"] + $.use.multi_tier,
+      "ruby-benchmarks-warmup-svm-graal-core": shared + warmup + svm_configurations["svm-graal-core"],
+      "ruby-benchmarks-warmup-svm-graal-core-multi-tier": shared + warmup + svm_configurations["svm-graal-core"] + $.use.multi_tier,
+      "ruby-benchmarks-warmup-svm-graal-enterprise": shared + warmup + svm_configurations["svm-graal-enterprise"],
+      "ruby-benchmarks-warmup-svm-graal-enterprise-multi-tier": shared + warmup + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
 
       local other = $.benchmark.runner + $.benchmark.other + $.benchmark.other_extra + { timelimit: "00:40:00" },
       local svm_other = $.benchmark.runner + $.benchmark.other + { timelimit: "01:00:00" },

mx.truffleruby/mx_truffleruby_benchmark.py

@@ -272,6 +272,10 @@ def filterLines(self, lines):
         return data
 
     def runBenchmark(self, benchmark, bmSuiteArgs):
+        directory = self.directory()
+        if directory is None:
+            directory, benchmark = benchmark.split('/')
+
         arguments = ['benchmark']
         if self.config()['kind'] == 'simple':
             arguments.extend(['--simple', '--elapsed', '--iterations'])
@@ -298,7 +302,7 @@ def runBenchmark(self, benchmark, bmSuiteArgs):
         else:
             benchmark_file = benchmark
             benchmark_names = []
-        arguments.extend(['bench/' + self.directory() + '/' + benchmark_file + '.rb'])
+        arguments.extend(['bench/' + directory + '/' + benchmark_file + '.rb'])
         arguments.extend(benchmark_names)
         arguments.extend(bmSuiteArgs)
         out = mx.OutputCapture()
@@ -507,7 +511,12 @@ def time(self):
     'asciidoctor-load-string'
 ]
 
-asciidoctor_benchmark_time = {'asciidoctor-convert':400, 'asciidoctor-load-file':400, 'asciidoctor-load-string':400, 'default': 120}
+asciidoctor_benchmark_time = {
+    'asciidoctor-convert': 400,
+    'asciidoctor-load-file': 400,
+    'asciidoctor-load-string': 400,
+    'default': 120
+}
 
 class AsciidoctorBenchmarkSuite(AllBenchmarksBenchmarkSuite):
     def name(self):
@@ -672,27 +681,29 @@ def benchmarkList(self, bmSuiteArgs):
     def time(self):
         return 60
 
-asciidoctor_warmup_benchmarks = [
-    'asciidoctor-convert',
-    'asciidoctor-load-file',
-    'asciidoctor-load-string'
+warmup_benchmarks = [
+    'asciidoctor/asciidoctor-convert',
+    'asciidoctor/asciidoctor-load-file',
+    'asciidoctor/asciidoctor-load-string'
 ]
 
-class AsciidoctorWarmupBenchmarkSuite(AllBenchmarksBenchmarkSuite):
+class WarmupBenchmarkSuite(AllBenchmarksBenchmarkSuite):
     def config(self):
-        iterations = {'asciidoctor-convert':     {10:'startup', 20:'early-warmup', 100:'late-warmup'},
-                      'asciidoctor-load-file':   {10:'startup', 100:'early-warmup', 500:'late-warmup'},
-                      'asciidoctor-load-string': {10:'startup', 100:'early-warmup', 500:'late-warmup'}}
+        iterations = {
+            'asciidoctor-convert':     {10:'startup', 20:'early-warmup', 100:'late-warmup'},
+            'asciidoctor-load-file':   {10:'startup', 100:'early-warmup', 500:'late-warmup'},
+            'asciidoctor-load-string': {10:'startup', 100:'early-warmup', 500:'late-warmup'}
+        }
         return {'kind': 'fixed-iterations', 'iterations': iterations}
 
     def name(self):
-        return 'asciidoctor-warmup'
+        return 'ruby-warmup'
 
     def directory(self):
-        return 'asciidoctor'
+        return None
 
     def benchmarkList(self, bmSuiteArgs):
-        return asciidoctor_warmup_benchmarks
+        return warmup_benchmarks
 
 mx_benchmark.add_bm_suite(BuildStatsBenchmarkSuite())
 mx_benchmark.add_bm_suite(AllocationBenchmarkSuite())
@@ -712,4 +723,4 @@ def benchmarkList(self, bmSuiteArgs):
 mx_benchmark.add_bm_suite(ServerBenchmarkSuite())
 mx_benchmark.add_bm_suite(RubykonBenchmarkSuite())
 mx_benchmark.add_bm_suite(LiquidBenchmarkSuite())
-mx_benchmark.add_bm_suite(AsciidoctorWarmupBenchmarkSuite())
+mx_benchmark.add_bm_suite(WarmupBenchmarkSuite())