diff --git a/espresso/ci/ci.jsonnet b/espresso/ci/ci.jsonnet index d92a1a3892c7..bdd4f460e748 100644 --- a/espresso/ci/ci.jsonnet +++ b/espresso/ci/ci.jsonnet @@ -37,14 +37,14 @@ // Scala DaCapo benchmarks common.jdk21_on_demand_bench_linux + common.scala_dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='single-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'ondemand-bench-espresso-jvm-ce-scala_dacapo-single_tier-jdk21-linux-amd64'}, common.jdk21_on_demand_bench_linux + common.scala_dacapo_benchmark('native-ce-llvm' , guest_jvm_config='single-tier') + {name: 'ondemand-bench-espresso-native-ce-scala_dacapo-single_tier-jdk21-linux-amd64'}, - common.jdk21_weekly_bench_linux + common.scala_dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='multi-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'weekly-bench-espresso-jvm-ce-scala_dacapo-multi_tier-jdk21-linux-amd64'}, - common.jdk21_weekly_bench_linux + common.scala_dacapo_benchmark('native-ce-llvm' , guest_jvm_config='multi-tier') + {name: 'weekly-bench-espresso-native-ce-scala_dacapo-multi_tier-jdk21-linux-amd64'}, + common.jdk21_monthly_bench_linux + common.scala_dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='multi-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'monthly-bench-espresso-jvm-ce-scala_dacapo-multi_tier-jdk21-linux-amd64'}, + common.jdk21_monthly_bench_linux + common.scala_dacapo_benchmark('native-ce-llvm' , guest_jvm_config='multi-tier') + {name: 'monthly-bench-espresso-native-ce-scala_dacapo-multi_tier-jdk21-linux-amd64'}, // DaCapo benchmarks common.jdk21_on_demand_bench_linux + common.dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='single-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'ondemand-bench-espresso-jvm-ce-dacapo-single_tier-jdk21-linux-amd64'}, common.jdk21_on_demand_bench_linux + common.dacapo_benchmark('native-ce-llvm' , guest_jvm_config='single-tier') + {name: 'ondemand-bench-espresso-native-ce-dacapo-single_tier-jdk21-linux-amd64'}, - common.jdk21_weekly_bench_linux + common.dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='multi-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'weekly-bench-espresso-jvm-ce-dacapo-multi_tier-jdk21-linux-amd64'}, - common.jdk21_weekly_bench_linux + common.dacapo_benchmark('native-ce-llvm' , guest_jvm_config='multi-tier') + {name: 'weekly-bench-espresso-native-ce-dacapo-multi_tier-jdk21-linux-amd64'}, + common.jdk21_monthly_bench_linux + common.dacapo_benchmark('jvm-ce-llvm' , guest_jvm_config='multi-tier' , extra_args=['--vm.XX:ReservedCodeCacheSize=1g']) + {name: 'monthly-bench-espresso-jvm-ce-dacapo-multi_tier-jdk21-linux-amd64'}, + common.jdk21_monthly_bench_linux + common.dacapo_benchmark('native-ce-llvm' , guest_jvm_config='multi-tier') + {name: 'monthly-bench-espresso-native-ce-dacapo-multi_tier-jdk21-linux-amd64'}, // Memory footprint common.jdk21_on_demand_linux + common.espresso_minheap_benchmark('jvm-ce-llvm', 'awfy:*', 'infinite-overhead') + {name: 'ondemand-bench-espresso-jvm-ce-awfy-minheap-infinite-ovh-jdk21-linux-amd64'}, diff --git a/espresso/ci/ci_common/common.jsonnet b/espresso/ci/ci_common/common.jsonnet index 81d2511fdfdd..bc4d3d8eea98 100644 --- a/espresso/ci/ci_common/common.jsonnet +++ b/espresso/ci/ci_common/common.jsonnet @@ -94,6 +94,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo']; weekly: {targets+: ['weekly'], notify_groups:: ['espresso']}, monthly: {targets+: ['monthly'], notify_groups:: ['espresso']}, weeklyBench: {targets+: ['bench', 'weekly'], notify_groups:: ['espresso']}, + monthlyBench: {targets+: ['bench', 'monthly'], notify_groups:: ['espresso']}, onDemand: {targets+: ['on-demand']}, onDemandBench: {targets+: ['bench', 'on-demand']}, @@ -125,14 +126,15 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo']; jdk21_weekly_darwin_amd64 : self.weekly + self.darwin_amd64_21, jdk21_weekly_darwin_aarch64 : self.weekly + self.darwin_aarch64_21, jdk21_weekly_windows_amd64 : self.weekly + self.windows_21, - jdk21_monthly_linux_amd64 : self.monthly + self.linux_amd64_21, - jdk21_monthly_linux_aarch64 : self.monthly + self.linux_aarch64_21, - jdk21_monthly_darwin_amd64 : self.monthly + self.darwin_amd64_21, - jdk21_monthly_darwin_aarch64 : self.monthly + self.darwin_aarch64_21, - jdk21_monthly_windows_amd64 : self.monthly + self.windows_21, + jdk21_monthly_linux_amd64 : self.monthly + self.linux_amd64_21, + jdk21_monthly_linux_aarch64 : self.monthly + self.linux_aarch64_21, + jdk21_monthly_darwin_amd64 : self.monthly + self.darwin_amd64_21, + jdk21_monthly_darwin_aarch64 : self.monthly + self.darwin_aarch64_21, + jdk21_monthly_windows_amd64 : self.monthly + self.windows_21, jdk21_weekly_bench_linux : self.weeklyBench + self.linux_amd64_21 + self.e3, jdk21_weekly_bench_darwin : self.weeklyBench + self.darwin_amd64_21, jdk21_weekly_bench_windows : self.weeklyBench + self.windows_21, + jdk21_monthly_bench_linux : self.monthlyBench + self.linux_amd64_21 + self.e3, jdk21_on_demand_linux : self.onDemand + self.linux_amd64_21, jdk21_on_demand_darwin : self.onDemand + self.darwin_amd64_21, jdk21_on_demand_windows : self.onDemand + self.windows_21, @@ -235,7 +237,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo']; self.dacapo_stable(env), guest_jvm_config=guest_jvm_config, extra_args=extra_args, - timelimit=if std.endsWith(_base_env(env), 'ce') then '7:30:00' else '3:00:00' + timelimit=if std.endsWith(_base_env(env), 'ce') then '1:10:00' else '1:00:00' ), @@ -260,14 +262,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo']; # Excluding factorie (too slow). kiama and scalariform have transient issues with compilation enabled. scala_dacapo_jvm_warmup: 'scala-dacapo-warmup:*[scalap,scalac,scaladoc,scalaxb]', - dacapo_stable(env): if std.startsWith(env, 'jvm') - # exclude pmd and lusearch - then 'dacapo:*[h2,fop,jython,luindex,sunflow,xalan]' - # exclude fop on native - else if env == 'native-ce' - # additionally exclude luindex on native-ce: it gets stuck on the first interation - then 'dacapo:*[h2,jython,lusearch,pmd,sunflow,xalan]' - else 'dacapo:*[h2,jython,luindex,lusearch,pmd,sunflow,xalan]', + dacapo_stable(env): 'dacapo:*[fop,lusearch,luindex,sunflow,xalan]', # exclude scalatest, which goes into deopt loop and becomes slower on every subsequent operation scala_dacapo_fast: 'scala-dacapo:*[apparat,factorie,kiama,scalac,scaladoc,scalap,scalariform,scalaxb,tmt]',