Skip to content

Commit 2372243

Browse files
eregoneregon
committed
CI: Rename graal-core/graal-enterprise to ce/ee to be more concise
1 parent a0ebdd2 commit 2372243

File tree

1 file changed

+63
-63
lines changed

1 file changed

+63
-63
lines changed

‎ci.jsonnet

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -536,19 +536,19 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
536536
"ruby-test-ecosystem-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
537537
"ruby-test-standalone-linux-amd64": $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
538538

539-
"ruby-test-compiler-graal-core-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
540-
"ruby-test-compiler-graal-core-new": $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
541-
"ruby-test-compiler-graal-enterprise-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
542-
"ruby-test-compiler-graal-enterprise-new": $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
539+
"ruby-test-compiler-ce-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
540+
"ruby-test-compiler-ce-new": $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
541+
"ruby-test-compiler-ee-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
542+
"ruby-test-compiler-ee-new": $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
543543

544-
"ruby-test-svm-graal-core-linux-amd64-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
545-
"ruby-test-svm-graal-core-linux-amd64-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
546-
"ruby-test-svm-graal-core-darwin-amd64-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
547-
"ruby-test-svm-graal-core-darwin-amd64-new": $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
548-
"ruby-test-svm-graal-core-darwin-aarch64-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
549-
"ruby-test-svm-graal-core-darwin-aarch64-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
550-
"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" },
551-
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
544+
"ruby-test-svm-ce-linux-amd64-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
545+
"ruby-test-svm-ce-linux-amd64-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
546+
"ruby-test-svm-ce-darwin-amd64-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
547+
"ruby-test-svm-ce-darwin-amd64-new": $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
548+
"ruby-test-svm-ce-darwin-aarch64-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
549+
"ruby-test-svm-ce-darwin-aarch64-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
550+
"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" },
551+
"ruby-test-svm-ee-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
552552
},
553553

554554
local other_rubies = {
@@ -558,23 +558,23 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
558558
local graal_configurations = {
559559
local shared = $.cap.bench + $.cap.daily + $.use.truffleruby + $.use.build,
560560

561-
"graal-core": shared + $.env.jvm_ce,
562-
"graal-enterprise": shared + $.env.jvm_ee,
561+
"jvm-ce": shared + $.env.jvm_ce,
562+
"jvm-ee": shared + $.env.jvm_ee,
563563
},
564564
local svm_configurations = {
565565
local shared = $.cap.bench + $.cap.daily + $.use.truffleruby + $.use.build,
566566

567-
"svm-graal-core": shared + $.env.native + $.env.gdb_svm,
568-
"svm-graal-enterprise": shared + $.env.native_ee + $.env.gdb_svm,
567+
"svm-ce": shared + $.env.native + $.env.gdb_svm,
568+
"svm-ee": shared + $.env.native_ee + $.env.gdb_svm,
569569
},
570570

571571
bench_builds:
572572
{
573573
local shared = $.platform.linux + $.jdk.lts + $.use.common +
574574
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
575575

576-
"ruby-metrics-compiler-graal-core": shared + graal_configurations["graal-core"],
577-
"ruby-metrics-compiler-graal-enterprise": shared + graal_configurations["graal-enterprise"],
576+
"ruby-metrics-compiler-jvm-ce": shared + graal_configurations["jvm-ce"],
577+
"ruby-metrics-compiler-jvm-ee": shared + graal_configurations["jvm-ee"],
578578
} +
579579

580580
{
@@ -583,16 +583,16 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
583583
# TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
584584
local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
585585

586-
"ruby-build-stats-svm-graal-core": shared + svm_configurations["svm-graal-core"] + guest_vm_override,
587-
"ruby-build-stats-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + guest_vm_override,
586+
"ruby-build-stats-svm-ce": shared + svm_configurations["svm-ce"] + guest_vm_override,
587+
"ruby-build-stats-svm-ee": shared + svm_configurations["svm-ee"] + guest_vm_override,
588588
} +
589589

590590
{
591591
local shared = $.platform.linux + $.jdk.lts + $.use.common +
592592
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
593593

594-
"ruby-metrics-svm-graal-core": shared + svm_configurations["svm-graal-core"],
595-
"ruby-metrics-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"],
594+
"ruby-metrics-svm-ce": shared + svm_configurations["svm-ce"],
595+
"ruby-metrics-svm-ee": shared + svm_configurations["svm-ee"],
596596
} +
597597

598598
{
@@ -601,10 +601,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
601601

602602
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
603603
"ruby-benchmarks-classic-jruby": shared + other_rubies.jruby + { timelimit: "00:55:00" },
604-
"ruby-benchmarks-classic-graal-core": shared + graal_configurations["graal-core"] + { timelimit: "00:55:00" },
605-
"ruby-benchmarks-classic-graal-enterprise": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:55:00" },
606-
"ruby-benchmarks-classic-svm-graal-core": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:45:00" },
607-
"ruby-benchmarks-classic-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:45:00" },
604+
"ruby-benchmarks-classic-jvm-ce": shared + graal_configurations["jvm-ce"] + { timelimit: "00:55:00" },
605+
"ruby-benchmarks-classic-jvm-ee": shared + graal_configurations["jvm-ee"] + { timelimit: "00:55:00" },
606+
"ruby-benchmarks-classic-svm-ce": shared + svm_configurations["svm-ce"] + { timelimit: "01:45:00" },
607+
"ruby-benchmarks-classic-svm-ee": shared + svm_configurations["svm-ee"] + { timelimit: "01:45:00" },
608608
} +
609609

610610
{
@@ -613,63 +613,63 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
613613
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
614614
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
615615
"ruby-benchmarks-chunky-jruby": shared + chunky + other_rubies.jruby,
616-
"ruby-benchmarks-chunky-graal-core": shared + chunky + graal_configurations["graal-core"],
617-
"ruby-benchmarks-chunky-graal-enterprise": shared + chunky + graal_configurations["graal-enterprise"],
618-
"ruby-benchmarks-chunky-svm-graal-core": shared + chunky + svm_configurations["svm-graal-core"],
619-
"ruby-benchmarks-chunky-svm-graal-enterprise": shared + chunky + svm_configurations["svm-graal-enterprise"],
616+
"ruby-benchmarks-chunky-jvm-ce": shared + chunky + graal_configurations["jvm-ce"],
617+
"ruby-benchmarks-chunky-jvm-ee": shared + chunky + graal_configurations["jvm-ee"],
618+
"ruby-benchmarks-chunky-svm-ce": shared + chunky + svm_configurations["svm-ce"],
619+
"ruby-benchmarks-chunky-svm-ee": shared + chunky + svm_configurations["svm-ee"],
620620

621621
local psd = $.benchmark.runner + $.benchmark.psd + { timelimit: "01:30:00" },
622622
"ruby-benchmarks-psd-mri": shared + psd + other_rubies.mri,
623623
"ruby-benchmarks-psd-jruby": shared + psd + other_rubies.jruby,
624-
"ruby-benchmarks-psd-graal-core": shared + psd + graal_configurations["graal-core"],
625-
"ruby-benchmarks-psd-graal-enterprise": shared + psd + graal_configurations["graal-enterprise"],
626-
"ruby-benchmarks-psd-svm-graal-core": shared + psd + svm_configurations["svm-graal-core"],
627-
"ruby-benchmarks-psd-svm-graal-enterprise": shared + psd + svm_configurations["svm-graal-enterprise"],
624+
"ruby-benchmarks-psd-jvm-ce": shared + psd + graal_configurations["jvm-ce"],
625+
"ruby-benchmarks-psd-jvm-ee": shared + psd + graal_configurations["jvm-ee"],
626+
"ruby-benchmarks-psd-svm-ce": shared + psd + svm_configurations["svm-ce"],
627+
"ruby-benchmarks-psd-svm-ee": shared + psd + svm_configurations["svm-ee"],
628628

629629
local asciidoctor = $.benchmark.runner + $.benchmark.asciidoctor + { timelimit: "01:25:00" },
630630
"ruby-benchmarks-asciidoctor-mri": shared + asciidoctor + other_rubies.mri,
631631
"ruby-benchmarks-asciidoctor-jruby": shared + asciidoctor + other_rubies.jruby,
632-
"ruby-benchmarks-asciidoctor-graal-core": shared + asciidoctor + graal_configurations["graal-core"],
633-
"ruby-benchmarks-asciidoctor-graal-enterprise": shared + asciidoctor + graal_configurations["graal-enterprise"],
634-
"ruby-benchmarks-asciidoctor-svm-graal-core": shared + asciidoctor + svm_configurations["svm-graal-core"],
635-
"ruby-benchmarks-asciidoctor-svm-graal-enterprise": shared + asciidoctor + svm_configurations["svm-graal-enterprise"],
632+
"ruby-benchmarks-asciidoctor-jvm-ce": shared + asciidoctor + graal_configurations["jvm-ce"],
633+
"ruby-benchmarks-asciidoctor-jvm-ee": shared + asciidoctor + graal_configurations["jvm-ee"],
634+
"ruby-benchmarks-asciidoctor-svm-ce": shared + asciidoctor + svm_configurations["svm-ce"],
635+
"ruby-benchmarks-asciidoctor-svm-ee": shared + asciidoctor + svm_configurations["svm-ee"],
636636

637637
local warmup = $.benchmark.runner + $.benchmark.warmup + { timelimit: "01:05:00" },
638638
"ruby-benchmarks-warmup-mri": shared + warmup + other_rubies.mri + { timelimit: "01:20:00" },
639639
"ruby-benchmarks-warmup-jruby": shared + warmup + other_rubies.jruby,
640-
"ruby-benchmarks-warmup-graal-core": shared + warmup + graal_configurations["graal-core"] + $.use.no_multi_tier,
641-
"ruby-benchmarks-warmup-graal-core-3threads": shared + warmup + graal_configurations["graal-core"] + $.use.no_multi_tier + $.use.three_threads,
642-
"ruby-benchmarks-warmup-graal-core-multi-tier": shared + warmup + graal_configurations["graal-core"] + $.use.multi_tier,
643-
"ruby-benchmarks-warmup-graal-core-multi-tier-3threads": shared + warmup + graal_configurations["graal-core"] + $.use.multi_tier + $.use.three_threads,
644-
"ruby-benchmarks-warmup-graal-enterprise": shared + warmup + graal_configurations["graal-enterprise"] + $.use.no_multi_tier,
645-
"ruby-benchmarks-warmup-graal-enterprise-3threads": shared + warmup + graal_configurations["graal-enterprise"] + $.use.no_multi_tier + $.use.three_threads,
646-
"ruby-benchmarks-warmup-graal-enterprise-multi-tier": shared + warmup + graal_configurations["graal-enterprise"] + $.use.multi_tier,
647-
"ruby-benchmarks-warmup-graal-enterprise-multi-tier-3threads": shared + warmup + graal_configurations["graal-enterprise"] + $.use.multi_tier + $.use.three_threads,
648-
"ruby-benchmarks-warmup-svm-graal-core": shared + warmup + svm_configurations["svm-graal-core"] + $.use.no_multi_tier,
649-
"ruby-benchmarks-warmup-svm-graal-core-3threads": shared + warmup + svm_configurations["svm-graal-core"] + $.use.no_multi_tier + $.use.three_threads,
650-
"ruby-benchmarks-warmup-svm-graal-core-multi-tier": shared + warmup + svm_configurations["svm-graal-core"] + $.use.multi_tier,
651-
"ruby-benchmarks-warmup-svm-graal-core-multi-tier-3threads": shared + warmup + svm_configurations["svm-graal-core"] + $.use.multi_tier + $.use.three_threads,
652-
"ruby-benchmarks-warmup-svm-graal-enterprise": shared + warmup + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier,
653-
"ruby-benchmarks-warmup-svm-graal-enterprise-3threads": shared + warmup + svm_configurations["svm-graal-enterprise"] + $.use.no_multi_tier + $.use.three_threads,
654-
"ruby-benchmarks-warmup-svm-graal-enterprise-multi-tier": shared + warmup + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
655-
"ruby-benchmarks-warmup-svm-graal-enterprise-multi-tier-3threads": shared + warmup + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier + $.use.three_threads,
640+
"ruby-benchmarks-warmup-jvm-ce": shared + warmup + graal_configurations["jvm-ce"] + $.use.no_multi_tier,
641+
"ruby-benchmarks-warmup-jvm-ce-3threads": shared + warmup + graal_configurations["jvm-ce"] + $.use.no_multi_tier + $.use.three_threads,
642+
"ruby-benchmarks-warmup-jvm-ce-multi-tier": shared + warmup + graal_configurations["jvm-ce"] + $.use.multi_tier,
643+
"ruby-benchmarks-warmup-jvm-ce-multi-tier-3threads": shared + warmup + graal_configurations["jvm-ce"] + $.use.multi_tier + $.use.three_threads,
644+
"ruby-benchmarks-warmup-jvm-ee": shared + warmup + graal_configurations["jvm-ee"] + $.use.no_multi_tier,
645+
"ruby-benchmarks-warmup-jvm-ee-3threads": shared + warmup + graal_configurations["jvm-ee"] + $.use.no_multi_tier + $.use.three_threads,
646+
"ruby-benchmarks-warmup-jvm-ee-multi-tier": shared + warmup + graal_configurations["jvm-ee"] + $.use.multi_tier,
647+
"ruby-benchmarks-warmup-jvm-ee-multi-tier-3threads": shared + warmup + graal_configurations["jvm-ee"] + $.use.multi_tier + $.use.three_threads,
648+
"ruby-benchmarks-warmup-svm-ce": shared + warmup + svm_configurations["svm-ce"] + $.use.no_multi_tier,
649+
"ruby-benchmarks-warmup-svm-ce-3threads": shared + warmup + svm_configurations["svm-ce"] + $.use.no_multi_tier + $.use.three_threads,
650+
"ruby-benchmarks-warmup-svm-ce-multi-tier": shared + warmup + svm_configurations["svm-ce"] + $.use.multi_tier,
651+
"ruby-benchmarks-warmup-svm-ce-multi-tier-3threads": shared + warmup + svm_configurations["svm-ce"] + $.use.multi_tier + $.use.three_threads,
652+
"ruby-benchmarks-warmup-svm-ee": shared + warmup + svm_configurations["svm-ee"] + $.use.no_multi_tier,
653+
"ruby-benchmarks-warmup-svm-ee-3threads": shared + warmup + svm_configurations["svm-ee"] + $.use.no_multi_tier + $.use.three_threads,
654+
"ruby-benchmarks-warmup-svm-ee-multi-tier": shared + warmup + svm_configurations["svm-ee"] + $.use.multi_tier,
655+
"ruby-benchmarks-warmup-svm-ee-multi-tier-3threads": shared + warmup + svm_configurations["svm-ee"] + $.use.multi_tier + $.use.three_threads,
656656

657657
local micro = $.benchmark.runner + $.benchmark.micro + { timelimit: "01:30:00" },
658658
"ruby-benchmarks-micro-mri": shared + micro + other_rubies.mri,
659659
"ruby-benchmarks-micro-jruby": shared + micro + other_rubies.jruby,
660-
"ruby-benchmarks-micro-graal-core": shared + micro + graal_configurations["graal-core"],
661-
"ruby-benchmarks-micro-graal-enterprise": shared + micro + graal_configurations["graal-enterprise"],
662-
"ruby-benchmarks-micro-svm-graal-core": shared + micro + svm_configurations["svm-graal-core"],
663-
"ruby-benchmarks-micro-svm-graal-enterprise": shared + micro + svm_configurations["svm-graal-enterprise"],
660+
"ruby-benchmarks-micro-jvm-ce": shared + micro + graal_configurations["jvm-ce"],
661+
"ruby-benchmarks-micro-jvm-ee": shared + micro + graal_configurations["jvm-ee"],
662+
"ruby-benchmarks-micro-svm-ce": shared + micro + svm_configurations["svm-ce"],
663+
"ruby-benchmarks-micro-svm-ee": shared + micro + svm_configurations["svm-ee"],
664664

665665
local other = $.benchmark.runner + $.benchmark.other + $.benchmark.other_extra + { timelimit: "01:00:00" },
666666
local svm_other = $.benchmark.runner + $.benchmark.other + { timelimit: "01:30:00" },
667667
"ruby-benchmarks-other-mri": shared + other + other_rubies.mri,
668668
"ruby-benchmarks-other-jruby": shared + other + other_rubies.jruby,
669-
"ruby-benchmarks-other-graal-core": shared + other + graal_configurations["graal-core"],
670-
"ruby-benchmarks-other-graal-enterprise": shared + other + graal_configurations["graal-enterprise"],
671-
"ruby-benchmarks-other-svm-graal-core": shared + svm_other + svm_configurations["svm-graal-core"],
672-
"ruby-benchmarks-other-svm-graal-enterprise": shared + svm_other + svm_configurations["svm-graal-enterprise"],
669+
"ruby-benchmarks-other-jvm-ce": shared + other + graal_configurations["jvm-ce"],
670+
"ruby-benchmarks-other-jvm-ee": shared + other + graal_configurations["jvm-ee"],
671+
"ruby-benchmarks-other-svm-ce": shared + svm_other + svm_configurations["svm-ce"],
672+
"ruby-benchmarks-other-svm-ee": shared + svm_other + svm_configurations["svm-ee"],
673673
} +
674674

675675
{
@@ -748,7 +748,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
748748
$.<group_name>.<part_name>
749749
- Each part is included in a build at most once. A helper function is
750750
checking it and will raise an error otherwise with a message
751-
`Parts ["$.use.build", "$.use.build"] are used more than once in build: ruby-metrics-svm-graal-core. ...`
751+
`Parts ["$.use.build", "$.use.build"] are used more than once in build: ruby-metrics-svm-ce. ...`
752752
- All parts have to be disjoint and distinct.
753753
- All parts have to be compose-able with each other. Therefore all fields
754754
like setup or run should end with '+' to avoid overriding.

0 commit comments

Comments
 (0)