Skip to content

Commit 32e210e

Browse files
committed
[GR-26172] Add multi-tier to benchmarks; add chunky benchmark to svm
PullRequest: truffleruby/2005
2 parents 4ea9de8 + 4095483 commit 32e210e

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

ci.jsonnet

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ local part_definitions = {
152152
TRUFFLERUBYOPT+: " --experimental-options --engine.CompilerThreads=2",
153153
},
154154
},
155+
156+
multi_tier: {
157+
environment+: {
158+
GUEST_VM_CONFIG+: "-multi-tier",
159+
TRUFFLERUBYOPT+: " --experimental-options --engine.MultiTier=true",
160+
},
161+
},
155162
},
156163

157164
env: {
@@ -530,7 +537,9 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
530537
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "00:50:00" },
531538

532539
"ruby-metrics-compiler-graal-core": shared + graal_configurations["graal-core"],
540+
"ruby-metrics-compiler-graal-core-multi-tier": shared + graal_configurations["graal-core"] + $.use.multi_tier,
533541
"ruby-metrics-compiler-graal-enterprise": shared + graal_configurations["graal-enterprise"],
542+
"ruby-metrics-compiler-graal-enterprise-multi-tier": shared + graal_configurations["graal-enterprise"] + $.use.multi_tier,
534543
} +
535544

536545
{
@@ -548,7 +557,9 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
548557
$.benchmark.run_svm_metrics + { timelimit: "00:30:00" },
549558

550559
"ruby-metrics-svm-graal-core": shared + svm_configurations["svm-graal-core"],
560+
"ruby-metrics-svm-graal-core-multi-tier": shared + svm_configurations["svm-graal-core"] + $.use.multi_tier,
551561
"ruby-metrics-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"],
562+
"ruby-metrics-svm-graal-enterprise-multi-tier": shared + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
552563
} +
553564

554565
{
@@ -558,9 +569,13 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
558569
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:35:00" },
559570
"ruby-benchmarks-classic-jruby": shared + other_rubies.jruby + { timelimit: "00:35:00" },
560571
"ruby-benchmarks-classic-graal-core": shared + graal_configurations["graal-core"] + { timelimit: "00:35:00" },
572+
"ruby-benchmarks-classic-graal-core-multi-tier": shared + graal_configurations["graal-core"] + { timelimit: "00:35:00" } + $.use.multi_tier,
561573
"ruby-benchmarks-classic-graal-enterprise": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:35:00" },
574+
"ruby-benchmarks-classic-graal-enterprise-multi-tier": shared + graal_configurations["graal-enterprise"] + { timelimit: "00:35:00" } + $.use.multi_tier,
562575
"ruby-benchmarks-classic-svm-graal-core": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:10:00" },
576+
"ruby-benchmarks-classic-svm-graal-core-multi-tier": shared + svm_configurations["svm-graal-core"] + { timelimit: "01:10:00" } + $.use.multi_tier,
563577
"ruby-benchmarks-classic-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:10:00" },
578+
"ruby-benchmarks-classic-svm-graal-enterprise-multi-tier": shared + svm_configurations["svm-graal-enterprise"] + { timelimit: "01:10:00" } + $.use.multi_tier,
564579
} +
565580

566581
{
@@ -570,29 +585,48 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
570585
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
571586
"ruby-benchmarks-chunky-jruby": shared + chunky + other_rubies.jruby,
572587
"ruby-benchmarks-chunky-graal-core": shared + chunky + graal_configurations["graal-core"],
588+
"ruby-benchmarks-chunky-graal-core-multi-tier": shared + chunky + graal_configurations["graal-core"] + $.use.multi_tier,
573589
"ruby-benchmarks-chunky-graal-enterprise": shared + chunky + graal_configurations["graal-enterprise"],
590+
"ruby-benchmarks-chunky-graal-enterprise-multi-tier": shared + chunky + graal_configurations["graal-enterprise"] + $.use.multi_tier,
591+
"ruby-benchmarks-chunky-svm-graal-core": shared + chunky + svm_configurations["svm-graal-core"],
592+
"ruby-benchmarks-chunky-svm-graal-core-multi-tier": shared + chunky + svm_configurations["svm-graal-core"] + $.use.multi_tier,
593+
"ruby-benchmarks-chunky-svm-graal-enterprise": shared + chunky + svm_configurations["svm-graal-enterprise"],
594+
"ruby-benchmarks-chunky-svm-graal-enterprise-multi-tier": shared + chunky + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
574595
local psd = $.benchmark.runner + $.benchmark.psd + { timelimit: "02:00:00" },
575596
"ruby-benchmarks-psd-mri": shared + psd + other_rubies.mri,
576597
"ruby-benchmarks-psd-jruby": shared + psd + other_rubies.jruby,
577598
"ruby-benchmarks-psd-graal-core": shared + psd + graal_configurations["graal-core"],
599+
"ruby-benchmarks-psd-graal-core-multi-tier": shared + psd + graal_configurations["graal-core"] + $.use.multi_tier,
578600
"ruby-benchmarks-psd-graal-enterprise": shared + psd + graal_configurations["graal-enterprise"],
601+
"ruby-benchmarks-psd-graal-enterprise-multi-tier": shared + psd + graal_configurations["graal-enterprise"] + $.use.multi_tier,
579602
"ruby-benchmarks-psd-svm-graal-core": shared + psd + svm_configurations["svm-graal-core"],
603+
"ruby-benchmarks-psd-svm-graal-core-multi-tier": shared + psd + svm_configurations["svm-graal-core"] + $.use.multi_tier,
580604
"ruby-benchmarks-psd-svm-graal-enterprise": shared + psd + svm_configurations["svm-graal-enterprise"],
605+
"ruby-benchmarks-psd-svm-graal-enterprise-multi-tier": shared + psd + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
581606
local asciidoctor = $.benchmark.runner + $.benchmark.asciidoctor + { timelimit: "00:55:00" },
582607
"ruby-benchmarks-asciidoctor-mri": shared + asciidoctor + other_rubies.mri,
583608
"ruby-benchmarks-asciidoctor-jruby": shared + asciidoctor + other_rubies.jruby,
584609
"ruby-benchmarks-asciidoctor-graal-core": shared + asciidoctor + graal_configurations["graal-core"],
610+
"ruby-benchmarks-asciidoctor-graal-core-multi-tier": shared + asciidoctor + graal_configurations["graal-core"] + $.use.multi_tier,
585611
"ruby-benchmarks-asciidoctor-graal-enterprise": shared + asciidoctor + graal_configurations["graal-enterprise"],
612+
"ruby-benchmarks-asciidoctor-graal-enterprise-multi-tier": shared + asciidoctor + graal_configurations["graal-enterprise"] + $.use.multi_tier,
586613
"ruby-benchmarks-asciidoctor-svm-graal-core": shared + asciidoctor + svm_configurations["svm-graal-core"],
614+
"ruby-benchmarks-asciidoctor-svm-graal-core-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-core"] + $.use.multi_tier,
587615
"ruby-benchmarks-asciidoctor-svm-graal-enterprise": shared + asciidoctor + svm_configurations["svm-graal-enterprise"],
616+
"ruby-benchmarks-asciidoctor-svm-graal-enterprise-multi-tier": shared + asciidoctor + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
617+
588618
local other = $.benchmark.runner + $.benchmark.other + $.benchmark.other_extra + { timelimit: "00:40:00" },
589619
local svm_other = $.benchmark.runner + $.benchmark.other + { timelimit: "01:00:00" },
590620
"ruby-benchmarks-other-mri": shared + other + other_rubies.mri,
591621
"ruby-benchmarks-other-jruby": shared + other + other_rubies.jruby,
592622
"ruby-benchmarks-other-graal-core": shared + other + graal_configurations["graal-core"],
623+
"ruby-benchmarks-other-graal-core-multi-tier": shared + other + graal_configurations["graal-core"] + $.use.multi_tier,
593624
"ruby-benchmarks-other-graal-enterprise": shared + other + graal_configurations["graal-enterprise"],
625+
"ruby-benchmarks-other-graal-enterprise-multi-tier": shared + other + graal_configurations["graal-enterprise"] + $.use.multi_tier,
594626
"ruby-benchmarks-other-svm-graal-core": shared + svm_other + svm_configurations["svm-graal-core"],
627+
"ruby-benchmarks-other-svm-graal-core-multi-tier": shared + svm_other + svm_configurations["svm-graal-core"] + $.use.multi_tier,
595628
"ruby-benchmarks-other-svm-graal-enterprise": shared + svm_other + svm_configurations["svm-graal-enterprise"],
629+
"ruby-benchmarks-other-svm-graal-enterprise-multi-tier": shared + svm_other + svm_configurations["svm-graal-enterprise"] + $.use.multi_tier,
596630
} +
597631

598632
{
@@ -603,7 +637,9 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
603637
"ruby-benchmarks-server-mri": shared + other_rubies.mri,
604638
"ruby-benchmarks-server-jruby": shared + other_rubies.jruby,
605639
"ruby-benchmarks-server-graal-core": shared + graal_configurations["graal-core"],
640+
"ruby-benchmarks-server-graal-core-multi-tier": shared + graal_configurations["graal-core"] + $.use.multi_tier,
606641
"ruby-benchmarks-server-graal-enterprise": shared + graal_configurations["graal-enterprise"],
642+
"ruby-benchmarks-server-graal-enterprise-multi-tier": shared + graal_configurations["graal-enterprise"] + $.use.multi_tier,
607643
} +
608644

609645
{

src/main/java/org/truffleruby/extra/ffi/Pointer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void writeZeroTerminatedBytes(long offset, byte[] bytes, int start, int l
9797
writeByte(offset + length, (byte) 0);
9898
}
9999

100+
@TruffleBoundary
100101
public void writeBytes(long offset, long size, byte value) {
101102
assert address + offset != 0 || size == 0;
102103
UNSAFE.setMemory(address + offset, size, value);

0 commit comments

Comments
 (0)