Skip to content

Commit 9b4e6b8

Browse files
eregoneregon
committed
[GR-38156] Run benchmarks in MultiTier mode only
PullRequest: truffleruby/3646
2 parents 5bcb403 + 7d05f10 commit 9b4e6b8

File tree

1 file changed

+33
-59
lines changed

1 file changed

+33
-59
lines changed

‎ci.jsonnet

Lines changed: 33 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,15 @@ local part_definitions = {
157157

158158
sqlite331: { packages+: { sqlite: "==3.31.0" } },
159159

160-
no_multi_tier: {
160+
no_multi_tier: { # Only used by warmup benchmarks
161161
environment+: {
162162
TRUFFLERUBYOPT+: " --experimental-options --engine.MultiTier=false",
163163
},
164164
},
165165

166-
multi_tier: {
166+
multi_tier: { # Only used by warmup benchmarks to explicit mark multi-tier
167167
environment+: {
168168
GUEST_VM_CONFIG+: "-multi-tier",
169-
TRUFFLERUBYOPT+: " --experimental-options --engine.MultiTier=true",
170169
},
171170
},
172171

@@ -614,10 +613,8 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
614613
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
615614
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
616615

617-
"ruby-metrics-compiler-graal-core": shared + graal_configurations["graal-core"] + $.use.no_multi_tier,
618-
"ruby-metrics-compiler-graal-core-multi-tier": shared + graal_configurations["graal-core"] + $.use.multi_tier,
619-
"ruby-metrics-compiler-graal-enterprise": shared + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
620-
"ruby-metrics-compiler-graal-enterprise-multi-tier": shared + graal_configurations["graal-enterprise"] + $.use.multi_tier,
616+
"ruby-metrics-compiler-graal-core": shared + graal_configurations["graal-core"],
617+
"ruby-metrics-compiler-graal-enterprise": shared + graal_configurations["graal-enterprise"],
621618
} +
622619

623620
{
@@ -634,10 +631,8 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
634631
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
635632
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
636633

637-
"ruby-metrics-svm-graal-core": shared + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
638-
"ruby-metrics-svm-graal-core-multi-tier": shared + svm_configurations["svm-graal-core"] + $.use.multi_tier,
639-
"ruby-metrics-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
640-
"ruby-metrics-svm-graal-enterprise-multi-tier": shared + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
634+
"ruby-metrics-svm-graal-core": shared + svm_configurations["svm-graal-core"],
635+
"ruby-metrics-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"],
641636
} +
642637

643638
{
@@ -646,14 +641,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
646641

647642
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
648643
"ruby-benchmarks-classic-jruby": shared + other_rubies.jruby + { timelimit: "00:55:00" },
649-
"ruby-benchmarks-classic-graal-core": shared + graal_configurations["graal-core"] + { timelimit: "00:55:00" } + $.use.no_multi_tier,
650-
"ruby-benchmarks-classic-graal-core-multi-tier": shared + graal_configurations["graal-core"] + { timelimit: "00:55:00" } + $.use.multi_tier,
651-
"ruby-benchmarks-classic-graal-enterprise": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:55:00" } + $.use.no_multi_tier,
652-
"ruby-benchmarks-classic-graal-enterprise-multi-tier": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:55:00" } + $.use.multi_tier,
653-
"ruby-benchmarks-classic-svm-graal-core": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:45:00" } + $.use.no_multi_tier,
654-
"ruby-benchmarks-classic-svm-graal-core-multi-tier": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:45:00" } + $.use.multi_tier,
655-
"ruby-benchmarks-classic-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:45:00" } + $.use.no_multi_tier,
656-
"ruby-benchmarks-classic-svm-graal-enterprise-multi-tier": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:45:00" } + $.use.multi_tier,
644+
"ruby-benchmarks-classic-graal-core": shared + graal_configurations["graal-core"] + { timelimit: "00:55:00" },
645+
"ruby-benchmarks-classic-graal-enterprise": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:55:00" },
646+
"ruby-benchmarks-classic-svm-graal-core": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:45:00" },
647+
"ruby-benchmarks-classic-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:45:00" },
657648
} +
658649

659650
{
@@ -662,36 +653,27 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
662653
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
663654
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
664655
"ruby-benchmarks-chunky-jruby": shared + chunky + other_rubies.jruby,
665-
"ruby-benchmarks-chunky-graal-core": shared + chunky + graal_configurations["graal-core"] + $.use.no_multi_tier,
666-
"ruby-benchmarks-chunky-graal-core-multi-tier": shared + chunky + graal_configurations["graal-core"] + $.use.multi_tier,
667-
"ruby-benchmarks-chunky-graal-enterprise": shared + chunky + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
668-
"ruby-benchmarks-chunky-graal-enterprise-multi-tier": shared + chunky + graal_configurations["graal-enterprise"] + $.use.multi_tier,
669-
"ruby-benchmarks-chunky-svm-graal-core": shared + chunky + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
670-
"ruby-benchmarks-chunky-svm-graal-core-multi-tier": shared + chunky + svm_configurations["svm-graal-core"] + $.use.multi_tier,
671-
"ruby-benchmarks-chunky-svm-graal-enterprise": shared + chunky + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
672-
"ruby-benchmarks-chunky-svm-graal-enterprise-multi-tier": shared + chunky + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
656+
"ruby-benchmarks-chunky-graal-core": shared + chunky + graal_configurations["graal-core"],
657+
"ruby-benchmarks-chunky-graal-enterprise": shared + chunky + graal_configurations["graal-enterprise"],
658+
"ruby-benchmarks-chunky-svm-graal-core": shared + chunky + svm_configurations["svm-graal-core"],
659+
"ruby-benchmarks-chunky-svm-graal-enterprise": shared + chunky + svm_configurations["svm-graal-enterprise"],
660+
673661
local psd = $.benchmark.runner + $.benchmark.psd + { timelimit: "01:15:00" },
674662
"ruby-benchmarks-psd-mri": shared + psd + other_rubies.mri,
675663
"ruby-benchmarks-psd-jruby": shared + psd + other_rubies.jruby,
676-
"ruby-benchmarks-psd-graal-core": shared + psd + graal_configurations["graal-core"] + $.use.no_multi_tier,
677-
"ruby-benchmarks-psd-graal-core-multi-tier": shared + psd + graal_configurations["graal-core"] + $.use.multi_tier,
678-
"ruby-benchmarks-psd-graal-enterprise": shared + psd + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
679-
"ruby-benchmarks-psd-graal-enterprise-multi-tier": shared + psd + graal_configurations["graal-enterprise"] + $.use.multi_tier,
680-
"ruby-benchmarks-psd-svm-graal-core": shared + psd + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
681-
"ruby-benchmarks-psd-svm-graal-core-multi-tier": shared + psd + svm_configurations["svm-graal-core"] + $.use.multi_tier,
682-
"ruby-benchmarks-psd-svm-graal-enterprise": shared + psd + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
683-
"ruby-benchmarks-psd-svm-graal-enterprise-multi-tier": shared + psd + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
664+
"ruby-benchmarks-psd-graal-core": shared + psd + graal_configurations["graal-core"],
665+
"ruby-benchmarks-psd-graal-enterprise": shared + psd + graal_configurations["graal-enterprise"],
666+
"ruby-benchmarks-psd-svm-graal-core": shared + psd + svm_configurations["svm-graal-core"],
667+
"ruby-benchmarks-psd-svm-graal-enterprise": shared + psd + svm_configurations["svm-graal-enterprise"],
668+
684669
local asciidoctor = $.benchmark.runner + $.benchmark.asciidoctor + { timelimit: "01:25:00" },
685670
"ruby-benchmarks-asciidoctor-mri": shared + asciidoctor + other_rubies.mri,
686671
"ruby-benchmarks-asciidoctor-jruby": shared + asciidoctor + other_rubies.jruby,
687-
"ruby-benchmarks-asciidoctor-graal-core": shared + asciidoctor + graal_configurations["graal-core"] + $.use.no_multi_tier,
688-
"ruby-benchmarks-asciidoctor-graal-core-multi-tier": shared + asciidoctor + graal_configurations["graal-core"] + $.use.multi_tier,
689-
"ruby-benchmarks-asciidoctor-graal-enterprise": shared + asciidoctor + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
690-
"ruby-benchmarks-asciidoctor-graal-enterprise-multi-tier": shared + asciidoctor + graal_configurations["graal-enterprise"] + $.use.multi_tier,
691-
"ruby-benchmarks-asciidoctor-svm-graal-core": shared + asciidoctor + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
692-
"ruby-benchmarks-asciidoctor-svm-graal-core-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-core"] + $.use.multi_tier,
693-
"ruby-benchmarks-asciidoctor-svm-graal-enterprise": shared + asciidoctor + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
694-
"ruby-benchmarks-asciidoctor-svm-graal-enterprise-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
672+
"ruby-benchmarks-asciidoctor-graal-core": shared + asciidoctor + graal_configurations["graal-core"],
673+
"ruby-benchmarks-asciidoctor-graal-enterprise": shared + asciidoctor + graal_configurations["graal-enterprise"],
674+
"ruby-benchmarks-asciidoctor-svm-graal-core": shared + asciidoctor + svm_configurations["svm-graal-core"],
675+
"ruby-benchmarks-asciidoctor-svm-graal-enterprise": shared + asciidoctor + svm_configurations["svm-graal-enterprise"],
676+
695677
local warmup = $.benchmark.runner + $.benchmark.warmup + { timelimit: "01:05:00" },
696678
"ruby-benchmarks-warmup-mri": shared + warmup + other_rubies.mri + { timelimit: "01:20:00" },
697679
"ruby-benchmarks-warmup-jruby": shared + warmup + other_rubies.jruby,
@@ -715,27 +697,19 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
715697
local micro = $.benchmark.runner + $.benchmark.micro + { timelimit: "01:30:00" },
716698
"ruby-benchmarks-micro-mri": shared + micro + other_rubies.mri,
717699
"ruby-benchmarks-micro-jruby": shared + micro + other_rubies.jruby,
718-
"ruby-benchmarks-micro-graal-core": shared + micro + graal_configurations["graal-core"] + $.use.no_multi_tier,
719-
"ruby-benchmarks-micro-graal-core-multi-tier": shared + micro + graal_configurations["graal-core"] + $.use.multi_tier,
720-
"ruby-benchmarks-micro-graal-enterprise": shared + micro + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
721-
"ruby-benchmarks-micro-graal-enterprise-multi-tier": shared + micro + graal_configurations["graal-enterprise"] + $.use.multi_tier,
722-
"ruby-benchmarks-micro-svm-graal-core": shared + micro + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
723-
"ruby-benchmarks-micro-svm-graal-core-multi-tier": shared + micro + svm_configurations["svm-graal-core"] + $.use.multi_tier,
724-
"ruby-benchmarks-micro-svm-graal-enterprise": shared + micro + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
725-
"ruby-benchmarks-micro-svm-graal-enterprise-multi-tier": shared + micro + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
700+
"ruby-benchmarks-micro-graal-core": shared + micro + graal_configurations["graal-core"],
701+
"ruby-benchmarks-micro-graal-enterprise": shared + micro + graal_configurations["graal-enterprise"],
702+
"ruby-benchmarks-micro-svm-graal-core": shared + micro + svm_configurations["svm-graal-core"],
703+
"ruby-benchmarks-micro-svm-graal-enterprise": shared + micro + svm_configurations["svm-graal-enterprise"],
726704

727705
local other = $.benchmark.runner + $.benchmark.other + $.benchmark.other_extra + { timelimit: "01:00:00" },
728706
local svm_other = $.benchmark.runner + $.benchmark.other + { timelimit: "01:30:00" },
729707
"ruby-benchmarks-other-mri": shared + other + other_rubies.mri,
730708
"ruby-benchmarks-other-jruby": shared + other + other_rubies.jruby,
731-
"ruby-benchmarks-other-graal-core": shared + other + graal_configurations["graal-core"] + $.use.no_multi_tier,
732-
"ruby-benchmarks-other-graal-core-multi-tier": shared + other + graal_configurations["graal-core"] + $.use.multi_tier,
733-
"ruby-benchmarks-other-graal-enterprise": shared + other + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
734-
"ruby-benchmarks-other-graal-enterprise-multi-tier": shared + other + graal_configurations["graal-enterprise"] + $.use.multi_tier,
735-
"ruby-benchmarks-other-svm-graal-core": shared + svm_other + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
736-
"ruby-benchmarks-other-svm-graal-core-multi-tier": shared + svm_other + svm_configurations["svm-graal-core"] + $.use.multi_tier,
737-
"ruby-benchmarks-other-svm-graal-enterprise": shared + svm_other + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
738-
"ruby-benchmarks-other-svm-graal-enterprise-multi-tier": shared + svm_other + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
709+
"ruby-benchmarks-other-graal-core": shared + other + graal_configurations["graal-core"],
710+
"ruby-benchmarks-other-graal-enterprise": shared + other + graal_configurations["graal-enterprise"],
711+
"ruby-benchmarks-other-svm-graal-core": shared + svm_other + svm_configurations["svm-graal-core"],
712+
"ruby-benchmarks-other-svm-graal-enterprise": shared + svm_other + svm_configurations["svm-graal-enterprise"],
739713
} +
740714

741715
{

0 commit comments

Comments
 (0)