[GR-29296] [GR-29330] Move definition of EE benchmarks and fix multi-tier benchmarks.

ansalond · ansalond · commit c18647dda9eb · 2021-02-13T03:19:13.000Z
PullRequest: graal/8248
diff --git a/espresso/ci.jsonnet b/espresso/ci.jsonnet
@@ -36,21 +36,17 @@
     // Benchmarks
     // AWFY peak perf. benchmarks
     common.jdk8_weekly_bench_linux              + common.espresso_benchmark('jvm-ce', 'awfy:*')                                    + {name: 'weekly-bench-espresso-jvm-ce-awfy-jdk8-linux-amd64'},
-    common.jdk8_daily_bench_linux               + common.espresso_benchmark('jvm-ee', "awfy:*")                                    + {name: 'daily-bench-espresso-jvm-ee-awfy-jdk8-linux-amd64'},
     common.jdk8_weekly_bench_linux              + common.espresso_benchmark('native-ce', 'awfy:*')                                 + {name: 'weekly-bench-espresso-native-ce-awfy-jdk8-linux-amd64'},
-    common.jdk8_bench_linux                     + common.espresso_benchmark('native-ee', "awfy:*")                                 + {name: 'bench-espresso-native-ee-awfy-jdk8-linux-amd64'},
 
     // AWFY interpreter benchmarks
     common.jdk8_weekly_bench_linux              + common.espresso_interpreter_benchmark('jvm-ce', 'awfy:*')                        + {name: 'weekly-bench-espresso-jvm-ce-awfy_interpreter-jdk8-linux-amd64'},
-    common.jdk8_daily_bench_linux               + common.espresso_interpreter_benchmark('jvm-ee', "awfy:*")                        + {name: 'daily-bench-espresso-jvm-ee-awfy_interpreter-jdk8-linux-amd64'},
     common.jdk8_weekly_bench_linux              + common.espresso_interpreter_benchmark('native-ce', 'awfy:*')                     + {name: 'weekly-bench-espresso-native-ce-awfy_interpreter-jdk8-linux-amd64'},
-    common.jdk8_daily_bench_linux               + common.espresso_interpreter_benchmark('native-ee', "awfy:*")                     + {name: 'daily-bench-espresso-native-ee-awfy_interpreter-jdk8-linux-amd64'},
 
     // Scala DaCapo warmup benchmarks
-    #common.jdk8_weekly_bench_linux             + common.scala_dacapo_warmup_benchmark('jvm-ce')                                   + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-jdk8-linux-amd64'},
-    #common.jdk8_daily_bench_linux              + common.scala_dacapo_warmup_benchmark('jvm-ee')                                   + {name: 'daily-bench-espresso-jvm-ee-scala_dacapo_warmup-jdk8-linux-amd64'},
-    #common.jdk8_weekly_bench_linux             + common.scala_dacapo_warmup_benchmark('native-ce')                                + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-jdk8-linux-amd64'},
-    common.jdk8_daily_bench_linux               + common.scala_dacapo_warmup_benchmark('native-ee')                                + {name: 'daily-bench-espresso-native-ee-scala_dacapo_warmup-jdk8-linux-amd64'},
+    common.jdk8_weekly_bench_linux              + common.scala_dacapo_warmup_benchmark('jvm-ce', 'single-tier')                    + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-single_tier-jdk8-linux-amd64'},
+    common.jdk8_weekly_bench_linux              + common.scala_dacapo_warmup_benchmark('native-ce', 'single-tier')                 + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-single_tier-jdk8-linux-amd64'},
+    common.jdk8_weekly_bench_linux              + common.scala_dacapo_warmup_benchmark('jvm-ce', 'multi-tier')                     + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo_warmup-multi_tier-jdk8-linux-amd64'},
+    common.jdk8_weekly_bench_linux              + common.scala_dacapo_warmup_benchmark('native-ce', 'multi-tier')                  + {name: 'weekly-bench-espresso-native-ce-scala_dacapo_warmup-multi_tier-jdk8-linux-amd64'},
 
     // On-demand benchmarks
     // Scala DaCapo warmup benchmarks
@@ -60,4 +56,4 @@
     common.jdk8_on_demand_linux                 + common.espresso_minheap_benchmark('jvm-ce', 'awfy:*', 'infinite-overhead')       + {name: 'ondemand-bench-espresso-jvm-ce-awfy-minheap-infinite-ovh-jdk8-linux-amd64'},
     common.jdk8_on_demand_bench_linux           + common.espresso_minheap_benchmark('jvm-ce', 'awfy:*', '1.5-overhead')            + {name: 'ondemand-bench-espresso-jvm-ce-awfy-minheap-1.5-ovh-jdk8-linux-amd64'},
   ]
-}
+}
diff --git a/espresso/ci_common/common.jsonnet b/espresso/ci_common/common.jsonnet
@@ -170,7 +170,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
     name: name,
   },
 
-  espresso_benchmark(env, suite, host_jvm=_host_jvm(env), host_jvm_config=_host_jvm_config(env), guest_jvm='espresso', guest_jvm_config='default', fork_file=null, extra_args=[]):
+  espresso_benchmark(env, suite, host_jvm=_host_jvm(env), host_jvm_config=_host_jvm_config(env), guest_jvm='espresso', guest_jvm_config='default', fork_file=null, extra_args=[], timelimit='3:00:00'):
     self.build_espresso(env) +
     {
       run+: that.maybe_set_ld_debug_flag(env) + [
@@ -184,7 +184,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
               '--vm.Xss32m'] + extra_args
           ),
       ],
-      timelimit: '3:00:00',
+      timelimit: timelimit,
     } +
     self.bench_upload,
 
@@ -201,7 +201,8 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
       host_jvm=_host_jvm(env), host_jvm_config=_host_jvm_config(env),
       guest_jvm='espresso', guest_jvm_config=guest_jvm_config,
       fork_file='ci_common/scala-dacapo-warmup-forks.json',
-      extra_args=extra_args
+      extra_args=extra_args,
+      timelimit='5:00:00'
     ),
 
   graal_benchmark(env, suite, host_jvm='server', host_jvm_config=_graal_host_jvm_config(env), extra_args=[]):
diff --git a/espresso/mx.espresso/mx_espresso_benchmarks.py b/espresso/mx.espresso/mx_espresso_benchmarks.py
@@ -123,6 +123,9 @@ def run_with_heap(heap, args, timeout, suppressStderr=True, nonZeroIsFatal=False
 mx_benchmark.java_vm_registry.add_vm(EspressoVm('interpreter', ['--experimental-options', '--engine.Compilation=false']), _suite)
 mx_benchmark.java_vm_registry.add_vm(EspressoVm('interpreter-inline-accessors', ['--experimental-options', '--engine.Compilation=false', '--java.InlineFieldAccessors']), _suite)
 mx_benchmark.java_vm_registry.add_vm(EspressoVm('inline-accessors', ['--experimental-options', '--java.InlineFieldAccessors']), _suite)
+mx_benchmark.java_vm_registry.add_vm(EspressoVm('single-tier', ['--experimental-options', '--engine.MultiTier=false']), _suite)
+mx_benchmark.java_vm_registry.add_vm(EspressoVm('multi-tier', ['--experimental-options', '--engine.MultiTier=true']), _suite)
+mx_benchmark.java_vm_registry.add_vm(EspressoVm('multi-tier-inline-accessors', ['--experimental-options', '--engine.MultiTier', '--java.InlineFieldAccessors']), _suite)
 mx_benchmark.java_vm_registry.add_vm(EspressoVm('no-inlining', ['--experimental-options', '--engine.Inlining=false']), _suite)
 
 mx_benchmark.java_vm_registry.add_vm(EspressoMinHeapVm(0, 0, 64, 'infinite-overhead', []), _suite)
diff --git a/vm/ce-release-artifacts.json b/vm/ce-release-artifacts.json
@@ -44,7 +44,7 @@
 	{
 		"name": "ruby-standalone-svm-java11",
 		"core": true,
-		"jdk": "jdk_8",
+		"jdk": "jdk_11",
 		"override_name":"truffleruby",
 		"artifacts": [
 			{
@@ -62,7 +62,7 @@
 	{
 		"name": "python-standalone-svm-java11",
 		"core": true,
-		"jdk": "jdk_8",
+		"jdk": "jdk_11",
 		"override_name":"graalpython",
 		"artifacts": [
 			{

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`{`
`45`	`45`	`"name": "ruby-standalone-svm-java11",`
`46`	`46`	`"core": true,`
`47`		`- "jdk": "jdk_8",`
	`47`	`+ "jdk": "jdk_11",`
`48`	`48`	`"override_name":"truffleruby",`
`49`	`49`	`"artifacts": [`
`50`	`50`	`{`
`@@ -62,7 +62,7 @@`
`62`	`62`	`{`
`63`	`63`	`"name": "python-standalone-svm-java11",`
`64`	`64`	`"core": true,`
`65`		`- "jdk": "jdk_8",`
	`65`	`+ "jdk": "jdk_11",`
`66`	`66`	`"override_name":"graalpython",`
`67`	`67`	`"artifacts": [`
`68`	`68`	`{`