Skip to content

Commit 9cf29b7

Browse files
committed
[GR-25942] Workaround GR-25942 by using only 2 compiler threads on SVM CE for specs
1 parent 4ff1434 commit 9cf29b7

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

ci.jsonnet

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@ local part_definitions = {
146146
},
147147

148148
sqlite331: { packages+: { sqlite: ">=3.31" } },
149+
150+
limit_compiler_threads: { # GR-25942
151+
environment+: {
152+
TRUFFLERUBYOPT+: " --experimental-options --engine.CompilerThreads=2",
153+
},
154+
},
149155
},
150156

151157
env: {
@@ -421,7 +427,7 @@ local part_definitions = {
421427
["set-export", "GUEST_VM_CONFIG", "default"],
422428
] + run_benchs + [
423429
["set-export", "GUEST_VM_CONFIG", "no-rubygems"],
424-
["set-export", "TRUFFLERUBYOPT", "--disable-gems"],
430+
["set-export", "TRUFFLERUBYOPT", "$TRUFFLERUBYOPT --disable-gems"],
425431
] + run_benchs,
426432
},
427433

@@ -444,7 +450,7 @@ local part_definitions = {
444450

445451
cext_chunky: {
446452
environment+: {
447-
TRUFFLERUBYOPT: "--experimental-options --cexts-log-load",
453+
TRUFFLERUBYOPT+: " --experimental-options --cexts-log-load",
448454
USE_CEXTS: "true",
449455
},
450456
setup+:
@@ -486,17 +492,17 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
486492
"ruby-test-gems-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
487493
"ruby-test-gems-darwin": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
488494
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
489-
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v8 + gate_no_build + $.run.test_make_standalone_distribution + { timelimit: "40:00" },
495+
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v8 + gate_no_build + $.run.test_make_standalone_distribution + $.use.limit_compiler_threads + { timelimit: "40:00" },
490496

491497
"ruby-test-compiler-graal-core": $.platform.linux + $.jdk.v8 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
492498
"ruby-test-compiler-graal-core-11": $.platform.linux + $.jdk.v11 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
493499
"ruby-test-compiler-graal-enterprise": $.platform.linux + $.jdk.v8 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
494500
"ruby-test-compiler-graal-enterprise-11": $.platform.linux + $.jdk.v11 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
495501

496-
"ruby-test-svm-graal-core-linux": $.platform.linux + $.jdk.v8 + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests,
497-
"ruby-test-svm-graal-core-linux-11": $.platform.linux + $.jdk.v11 + $.env.native + gate + native_tests,
498-
"ruby-test-svm-graal-core-darwin": $.platform.darwin + $.jdk.v8 + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests,
499-
"ruby-test-svm-graal-core-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.native + gate + native_tests,
502+
"ruby-test-svm-graal-core-linux": $.platform.linux + $.jdk.v8 + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests + $.use.limit_compiler_threads,
503+
"ruby-test-svm-graal-core-linux-11": $.platform.linux + $.jdk.v11 + $.env.native + gate + native_tests + $.use.limit_compiler_threads,
504+
"ruby-test-svm-graal-core-darwin": $.platform.darwin + $.jdk.v8 + $.env.native_RemoveSaturatedTypeFlows + gate + native_tests + $.use.limit_compiler_threads,
505+
"ruby-test-svm-graal-core-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.native + gate + native_tests + $.use.limit_compiler_threads,
500506
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v8 + $.env.native_ee + gate + native_tests,
501507
"ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + $.jdk.v8 + $.env.native_ee + gate + native_tests,
502508
},

0 commit comments

Comments
 (0)