@@ -535,19 +535,19 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
535535 "ruby-test-ecosystem-linux-amd64" : $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
536536 "ruby-test-standalone-linux-amd64" : $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
537537
538- "ruby-test-compiler-graal-core- lts" : $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
539- "ruby-test-compiler-graal-core- new" : $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
540- "ruby-test-compiler-graal-enterprise -lts" : $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
541- "ruby-test-compiler-graal-enterprise -new" : $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
538+ "ruby-test-compiler-ce- lts" : $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
539+ "ruby-test-compiler-ce- new" : $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
540+ "ruby-test-compiler-ee -lts" : $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
541+ "ruby-test-compiler-ee -new" : $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
542542
543- "ruby-test-svm-graal-core- linux-amd64-lts" : $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
544- "ruby-test-svm-graal-core- linux-amd64-new" : $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
545- "ruby-test-svm-graal-core- darwin-amd64-lts" : $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
546- "ruby-test-svm-graal-core- darwin-amd64-new" : $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
547- "ruby-test-svm-graal-core- darwin-aarch64-lts" : $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
548- "ruby-test-svm-graal-core- darwin-aarch64-new" : $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
549- "ruby-test-svm-graal-enterprise- linux-amd64" : $.platform.linux + $.jdk.lts + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
550- "ruby-test-svm-graal-enterprise- darwin-aarch64" : $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
543+ "ruby-test-svm-ce- linux-amd64-lts" : $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
544+ "ruby-test-svm-ce- linux-amd64-new" : $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
545+ "ruby-test-svm-ce- darwin-amd64-lts" : $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
546+ "ruby-test-svm-ce- darwin-amd64-new" : $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
547+ "ruby-test-svm-ce- darwin-aarch64-lts" : $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
548+ "ruby-test-svm-ce- darwin-aarch64-new" : $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
549+ "ruby-test-svm-ee- linux-amd64" : $.platform.linux + $.jdk.lts + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
550+ "ruby-test-svm-ee- darwin-aarch64" : $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
551551 },
552552
553553 local other_rubies = {
@@ -557,23 +557,23 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
557557 local graal_configurations = {
558558 local shared = $.cap.bench + $.cap.daily + $.use.truffleruby + $.use.build,
559559
560- "graal-core " : shared + $.env.jvm_ce,
561- "graal-enterprise " : shared + $.env.jvm_ee,
560+ "jvm-ce " : shared + $.env.jvm_ce,
561+ "jvm-ee " : shared + $.env.jvm_ee,
562562 },
563563 local svm_configurations = {
564564 local shared = $.cap.bench + $.cap.daily + $.use.truffleruby + $.use.build,
565565
566- "svm-graal-core " : shared + $.env.native + $.env.gdb_svm,
567- "svm-graal-enterprise " : shared + $.env.native_ee + $.env.gdb_svm,
566+ "svm-ce " : shared + $.env.native + $.env.gdb_svm,
567+ "svm-ee " : shared + $.env.native_ee + $.env.gdb_svm,
568568 },
569569
570570 bench_builds:
571571 {
572572 local shared = $.platform.linux + $.jdk.lts + $.use.common +
573573 $.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
574574
575- "ruby-metrics-compiler-graal-core " : shared + graal_configurations["graal-core " ],
576- "ruby-metrics-compiler-graal-enterprise " : shared + graal_configurations["graal-enterprise " ],
575+ "ruby-metrics-compiler-jvm-ce " : shared + graal_configurations["jvm-ce " ],
576+ "ruby-metrics-compiler-jvm-ee " : shared + graal_configurations["jvm-ee " ],
577577 } +
578578
579579 {
@@ -582,16 +582,16 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
582582 # TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
583583 local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
584584
585- "ruby-build-stats-svm-graal-core " : shared + svm_configurations["svm-graal-core " ] + guest_vm_override,
586- "ruby-build-stats-svm-graal-enterprise " : shared + svm_configurations["svm-graal-enterprise " ] + guest_vm_override,
585+ "ruby-build-stats-svm-ce " : shared + svm_configurations["svm-ce " ] + guest_vm_override,
586+ "ruby-build-stats-svm-ee " : shared + svm_configurations["svm-ee " ] + guest_vm_override,
587587 } +
588588
589589 {
590590 local shared = $.platform.linux + $.jdk.lts + $.use.common +
591591 $.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
592592
593- "ruby-metrics-svm-graal-core " : shared + svm_configurations["svm-graal-core " ],
594- "ruby-metrics-svm-graal-enterprise " : shared + svm_configurations["svm-graal-enterprise " ],
593+ "ruby-metrics-svm-ce " : shared + svm_configurations["svm-ce " ],
594+ "ruby-metrics-svm-ee " : shared + svm_configurations["svm-ee " ],
595595 } +
596596
597597 {
@@ -600,10 +600,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
600600
601601 "ruby-benchmarks-classic-mri" : shared + other_rubies.mri + { timelimit: "00:55:00" },
602602 "ruby-benchmarks-classic-jruby" : shared + other_rubies.jruby + { timelimit: "00:55:00" },
603- "ruby-benchmarks-classic-graal-core " : shared + graal_configurations["graal-core " ] + { timelimit: "00:55:00" },
604- "ruby-benchmarks-classic-graal-enterprise " : shared + graal_configurations["graal-enterprise " ] + { timelimit: "00:55:00" },
605- "ruby-benchmarks-classic-svm-graal-core " : shared + svm_configurations["svm-graal-core " ] + { timelimit: "01:45:00" },
606- "ruby-benchmarks-classic-svm-graal-enterprise " : shared + svm_configurations["svm-graal-enterprise " ] + { timelimit: "01:45:00" },
603+ "ruby-benchmarks-classic-jvm-ce " : shared + graal_configurations["jvm-ce " ] + { timelimit: "00:55:00" },
604+ "ruby-benchmarks-classic-jvm-ee " : shared + graal_configurations["jvm-ee " ] + { timelimit: "00:55:00" },
605+ "ruby-benchmarks-classic-svm-ce " : shared + svm_configurations["svm-ce " ] + { timelimit: "01:45:00" },
606+ "ruby-benchmarks-classic-svm-ee " : shared + svm_configurations["svm-ee " ] + { timelimit: "01:45:00" },
607607 } +
608608
609609 {
@@ -612,63 +612,63 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
612612 local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
613613 "ruby-benchmarks-chunky-mri" : shared + chunky + other_rubies.mri,
614614 "ruby-benchmarks-chunky-jruby" : shared + chunky + other_rubies.jruby,
615- "ruby-benchmarks-chunky-graal-core " : shared + chunky + graal_configurations["graal-core " ],
616- "ruby-benchmarks-chunky-graal-enterprise " : shared + chunky + graal_configurations["graal-enterprise " ],
617- "ruby-benchmarks-chunky-svm-graal-core " : shared + chunky + svm_configurations["svm-graal-core " ],
618- "ruby-benchmarks-chunky-svm-graal-enterprise " : shared + chunky + svm_configurations["svm-graal-enterprise " ],
615+ "ruby-benchmarks-chunky-jvm-ce " : shared + chunky + graal_configurations["jvm-ce " ],
616+ "ruby-benchmarks-chunky-jvm-ee " : shared + chunky + graal_configurations["jvm-ee " ],
617+ "ruby-benchmarks-chunky-svm-ce " : shared + chunky + svm_configurations["svm-ce " ],
618+ "ruby-benchmarks-chunky-svm-ee " : shared + chunky + svm_configurations["svm-ee " ],
619619
620620 local psd = $.benchmark.runner + $.benchmark.psd + { timelimit: "01:30:00" },
621621 "ruby-benchmarks-psd-mri" : shared + psd + other_rubies.mri,
622622 "ruby-benchmarks-psd-jruby" : shared + psd + other_rubies.jruby,
623- "ruby-benchmarks-psd-graal-core " : shared + psd + graal_configurations["graal-core " ],
624- "ruby-benchmarks-psd-graal-enterprise " : shared + psd + graal_configurations["graal-enterprise " ],
625- "ruby-benchmarks-psd-svm-graal-core " : shared + psd + svm_configurations["svm-graal-core " ],
626- "ruby-benchmarks-psd-svm-graal-enterprise " : shared + psd + svm_configurations["svm-graal-enterprise " ],
623+ "ruby-benchmarks-psd-jvm-ce " : shared + psd + graal_configurations["jvm-ce " ],
624+ "ruby-benchmarks-psd-jvm-ee " : shared + psd + graal_configurations["jvm-ee " ],
625+ "ruby-benchmarks-psd-svm-ce " : shared + psd + svm_configurations["svm-ce " ],
626+ "ruby-benchmarks-psd-svm-ee " : shared + psd + svm_configurations["svm-ee " ],
627627
628628 local asciidoctor = $.benchmark.runner + $.benchmark.asciidoctor + { timelimit: "01:25:00" },
629629 "ruby-benchmarks-asciidoctor-mri" : shared + asciidoctor + other_rubies.mri,
630630 "ruby-benchmarks-asciidoctor-jruby" : shared + asciidoctor + other_rubies.jruby,
631- "ruby-benchmarks-asciidoctor-graal-core " : shared + asciidoctor + graal_configurations["graal-core " ],
632- "ruby-benchmarks-asciidoctor-graal-enterprise " : shared + asciidoctor + graal_configurations["graal-enterprise " ],
633- "ruby-benchmarks-asciidoctor-svm-graal-core " : shared + asciidoctor + svm_configurations["svm-graal-core " ],
634- "ruby-benchmarks-asciidoctor-svm-graal-enterprise " : shared + asciidoctor + svm_configurations["svm-graal-enterprise " ],
631+ "ruby-benchmarks-asciidoctor-jvm-ce " : shared + asciidoctor + graal_configurations["jvm-ce " ],
632+ "ruby-benchmarks-asciidoctor-jvm-ee " : shared + asciidoctor + graal_configurations["jvm-ee " ],
633+ "ruby-benchmarks-asciidoctor-svm-ce " : shared + asciidoctor + svm_configurations["svm-ce " ],
634+ "ruby-benchmarks-asciidoctor-svm-ee " : shared + asciidoctor + svm_configurations["svm-ee " ],
635635
636636 local warmup = $.benchmark.runner + $.benchmark.warmup + { timelimit: "01:05:00" },
637637 "ruby-benchmarks-warmup-mri" : shared + warmup + other_rubies.mri + { timelimit: "01:20:00" },
638638 "ruby-benchmarks-warmup-jruby" : shared + warmup + other_rubies.jruby,
639- "ruby-benchmarks-warmup-graal-core " : shared + warmup + graal_configurations["graal-core " ] + $.use.no_multi_tier,
640- "ruby-benchmarks-warmup-graal-core -3threads" : shared + warmup + graal_configurations["graal-core " ] + $.use.no_multi_tier + $.use.three_threads,
641- "ruby-benchmarks-warmup-graal-core -multi-tier" : shared + warmup + graal_configurations["graal-core " ] + $.use.multi_tier,
642- "ruby-benchmarks-warmup-graal-core -multi-tier-3threads" : shared + warmup + graal_configurations["graal-core " ] + $.use.multi_tier + $.use.three_threads,
643- "ruby-benchmarks-warmup-graal-enterprise " : shared + warmup + graal_configurations["graal-enterprise " ] + $.use.no_multi_tier,
644- "ruby-benchmarks-warmup-graal-enterprise -3threads" : shared + warmup + graal_configurations["graal-enterprise " ] + $.use.no_multi_tier + $.use.three_threads,
645- "ruby-benchmarks-warmup-graal-enterprise -multi-tier" : shared + warmup + graal_configurations["graal-enterprise " ] + $.use.multi_tier,
646- "ruby-benchmarks-warmup-graal-enterprise -multi-tier-3threads" : shared + warmup + graal_configurations["graal-enterprise " ] + $.use.multi_tier + $.use.three_threads,
647- "ruby-benchmarks-warmup-svm-graal-core " : shared + warmup + svm_configurations["svm-graal-core " ] + $.use.no_multi_tier,
648- "ruby-benchmarks-warmup-svm-graal-core- 3threads" : shared + warmup + svm_configurations["svm-graal-core " ] + $.use.no_multi_tier + $.use.three_threads,
649- "ruby-benchmarks-warmup-svm-graal-core- multi-tier" : shared + warmup + svm_configurations["svm-graal-core " ] + $.use.multi_tier,
650- "ruby-benchmarks-warmup-svm-graal-core- multi-tier-3threads" : shared + warmup + svm_configurations["svm-graal-core " ] + $.use.multi_tier + $.use.three_threads,
651- "ruby-benchmarks-warmup-svm-graal-enterprise " : shared + warmup + svm_configurations["svm-graal-enterprise " ] + $.use.no_multi_tier,
652- "ruby-benchmarks-warmup-svm-graal-enterprise- 3threads" : shared + warmup + svm_configurations["svm-graal-enterprise " ] + $.use.no_multi_tier + $.use.three_threads,
653- "ruby-benchmarks-warmup-svm-graal-enterprise- multi-tier" : shared + warmup + svm_configurations["svm-graal-enterprise " ] + $.use.multi_tier,
654- "ruby-benchmarks-warmup-svm-graal-enterprise- multi-tier-3threads" : shared + warmup + svm_configurations["svm-graal-enterprise " ] + $.use.multi_tier + $.use.three_threads,
639+ "ruby-benchmarks-warmup-jvm-ce " : shared + warmup + graal_configurations["jvm-ce " ] + $.use.no_multi_tier,
640+ "ruby-benchmarks-warmup-jvm-ce -3threads" : shared + warmup + graal_configurations["jvm-ce " ] + $.use.no_multi_tier + $.use.three_threads,
641+ "ruby-benchmarks-warmup-jvm-ce -multi-tier" : shared + warmup + graal_configurations["jvm-ce " ] + $.use.multi_tier,
642+ "ruby-benchmarks-warmup-jvm-ce -multi-tier-3threads" : shared + warmup + graal_configurations["jvm-ce " ] + $.use.multi_tier + $.use.three_threads,
643+ "ruby-benchmarks-warmup-jvm-ee " : shared + warmup + graal_configurations["jvm-ee " ] + $.use.no_multi_tier,
644+ "ruby-benchmarks-warmup-jvm-ee -3threads" : shared + warmup + graal_configurations["jvm-ee " ] + $.use.no_multi_tier + $.use.three_threads,
645+ "ruby-benchmarks-warmup-jvm-ee -multi-tier" : shared + warmup + graal_configurations["jvm-ee " ] + $.use.multi_tier,
646+ "ruby-benchmarks-warmup-jvm-ee -multi-tier-3threads" : shared + warmup + graal_configurations["jvm-ee " ] + $.use.multi_tier + $.use.three_threads,
647+ "ruby-benchmarks-warmup-svm-ce " : shared + warmup + svm_configurations["svm-ce " ] + $.use.no_multi_tier,
648+ "ruby-benchmarks-warmup-svm-ce- 3threads" : shared + warmup + svm_configurations["svm-ce " ] + $.use.no_multi_tier + $.use.three_threads,
649+ "ruby-benchmarks-warmup-svm-ce- multi-tier" : shared + warmup + svm_configurations["svm-ce " ] + $.use.multi_tier,
650+ "ruby-benchmarks-warmup-svm-ce- multi-tier-3threads" : shared + warmup + svm_configurations["svm-ce " ] + $.use.multi_tier + $.use.three_threads,
651+ "ruby-benchmarks-warmup-svm-ee " : shared + warmup + svm_configurations["svm-ee " ] + $.use.no_multi_tier,
652+ "ruby-benchmarks-warmup-svm-ee- 3threads" : shared + warmup + svm_configurations["svm-ee " ] + $.use.no_multi_tier + $.use.three_threads,
653+ "ruby-benchmarks-warmup-svm-ee- multi-tier" : shared + warmup + svm_configurations["svm-ee " ] + $.use.multi_tier,
654+ "ruby-benchmarks-warmup-svm-ee- multi-tier-3threads" : shared + warmup + svm_configurations["svm-ee " ] + $.use.multi_tier + $.use.three_threads,
655655
656656 local micro = $.benchmark.runner + $.benchmark.micro + { timelimit: "01:30:00" },
657657 "ruby-benchmarks-micro-mri" : shared + micro + other_rubies.mri,
658658 "ruby-benchmarks-micro-jruby" : shared + micro + other_rubies.jruby,
659- "ruby-benchmarks-micro-graal-core " : shared + micro + graal_configurations["graal-core " ],
660- "ruby-benchmarks-micro-graal-enterprise " : shared + micro + graal_configurations["graal-enterprise " ],
661- "ruby-benchmarks-micro-svm-graal-core " : shared + micro + svm_configurations["svm-graal-core " ],
662- "ruby-benchmarks-micro-svm-graal-enterprise " : shared + micro + svm_configurations["svm-graal-enterprise " ],
659+ "ruby-benchmarks-micro-jvm-ce " : shared + micro + graal_configurations["jvm-ce " ],
660+ "ruby-benchmarks-micro-jvm-ee " : shared + micro + graal_configurations["jvm-ee " ],
661+ "ruby-benchmarks-micro-svm-ce " : shared + micro + svm_configurations["svm-ce " ],
662+ "ruby-benchmarks-micro-svm-ee " : shared + micro + svm_configurations["svm-ee " ],
663663
664664 local other = $.benchmark.runner + $.benchmark.other + $.benchmark.other_extra + { timelimit: "01:00:00" },
665665 local svm_other = $.benchmark.runner + $.benchmark.other + { timelimit: "01:30:00" },
666666 "ruby-benchmarks-other-mri" : shared + other + other_rubies.mri,
667667 "ruby-benchmarks-other-jruby" : shared + other + other_rubies.jruby,
668- "ruby-benchmarks-other-graal-core " : shared + other + graal_configurations["graal-core " ],
669- "ruby-benchmarks-other-graal-enterprise " : shared + other + graal_configurations["graal-enterprise " ],
670- "ruby-benchmarks-other-svm-graal-core " : shared + svm_other + svm_configurations["svm-graal-core " ],
671- "ruby-benchmarks-other-svm-graal-enterprise " : shared + svm_other + svm_configurations["svm-graal-enterprise " ],
668+ "ruby-benchmarks-other-jvm-ce " : shared + other + graal_configurations["jvm-ce " ],
669+ "ruby-benchmarks-other-jvm-ee " : shared + other + graal_configurations["jvm-ee " ],
670+ "ruby-benchmarks-other-svm-ce " : shared + svm_other + svm_configurations["svm-ce " ],
671+ "ruby-benchmarks-other-svm-ee " : shared + svm_other + svm_configurations["svm-ee " ],
672672 } +
673673
674674 {
@@ -747,7 +747,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
747747 $.<group_name>.<part_name>
748748- Each part is included in a build at most once. A helper function is
749749 checking it and will raise an error otherwise with a message
750- `Parts ["$.use.build", "$.use.build"] are used more than once in build: ruby-metrics-svm-graal-core . ...`
750+ `Parts ["$.use.build", "$.use.build"] are used more than once in build: ruby-metrics-svm-ce . ...`
751751- All parts have to be disjoint and distinct.
752752- All parts have to be compose-able with each other. Therefore all fields
753753 like setup or run should end with '+' to avoid overriding.
0 commit comments