Skip to content

Commit 2b84599

Browse files
eregoneregon
committed
[GR-24578] [GR-25743] Update to latest graal
PullRequest: truffleruby/1902
2 parents 05fe851 + fae1bb5 commit 2b84599

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
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,
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
},

‎common.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"openjdk8": {"name": "openjdk", "version": "8u262+10-jvmci-20.2-b03", "platformspecific": true },
77
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u261+33-jvmci-20.2-b03-fastdebug", "platformspecific": true },
88
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
9-
"oraclejdk15": {"name": "oraclejdk", "version": "15+33", "platformspecific": true },
9+
"oraclejdk15": {"name": "oraclejdk", "version": "15.0.1+6", "platformspecific": true },
10+
"oraclejdk15Debug":{"name": "oraclejdk", "version": "15.0.1+6-debug", "platformspecific": true },
1011
"openjdk11": {"name": "openjdk", "version": "11.0.3+7", "platformspecific": true },
11-
"openjdk15": {"name": "openjdk", "version": "15+30", "platformspecific": true },
1212
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.8+10-jvmci-20.2-b03", "platformspecific": true },
1313
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.8.0.2+1-jvmci-20.2-b03", "platformspecific": true }
1414
},

‎mx.truffleruby/mx_truffleruby.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ def ruby_run_ruby(args):
125125
jt = join(root, 'tool/jt.rb')
126126
os.execlp(jt, jt, "ruby", *args)
127127

128-
def ruby_run_specs(args):
128+
def ruby_run_specs(ruby, args):
129129
with VerboseMx():
130-
jt('test', 'specs', *args)
130+
jt('--use', ruby, 'test', 'specs', *args)
131131

132132
def ruby_testdownstream_hello(args):
133133
"""Run a minimal Hello World test"""
@@ -140,16 +140,12 @@ def ruby_testdownstream_aot(args):
140140
mx.abort("Incorrect argument count: mx ruby_testdownstream_aot <aot_bin> [<format>] [<build_type>]")
141141

142142
aot_bin = args[0]
143-
spec_format = args[1] if len(args) >= 2 else 'dot'
144-
145143
fast = ['--excl-tag', 'slow']
146-
mspec_args = ['--format', spec_format, '--excl-tag', 'ci']
147144

148-
os.environ['RUBY_BIN'] = aot_bin
149-
ruby_run_specs(mspec_args)
145+
ruby_run_specs(aot_bin, [])
150146

151147
# Run "jt test fast --native :truffle" to catch slow specs in Truffle which only apply to native
152-
ruby_run_specs(fast + mspec_args + [':truffle'])
148+
ruby_run_specs(aot_bin, fast + [':truffle'])
153149

154150
def ruby_testdownstream_sulong(args):
155151
"""Run C extension tests"""

‎mx.truffleruby/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "sulong",
99
"subdir": True,
10-
"version": "3dd9a51f9f56142268a8b2a7244ab119b8903f03",
10+
"version": "df007aafea9720ec5a05757301a1b240b0b8cb93",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)