Skip to content

Commit ee16e36

Browse files
Rebalance isolate stress testing shards.
Cq-Include-Trybots: luci.dart.try:iso-stress-linux-x64-try,iso-stress-linux-arm64-try Change-Id: Ie47b15116053870b04ad95eba0efb6f36d7a35cb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424341 Reviewed-by: Alexander Aprelev <[email protected]>
1 parent 66a57a8 commit ee16e36

File tree

3 files changed

+13
-39
lines changed

3 files changed

+13
-39
lines changed

runtime/tests/concurrency/generate_stress_test.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ main(List<String> args) async {
2424
}
2525

2626
Future<String> generateStressTest(List<String> testFiles) async {
27-
testFiles = testFiles
28-
.map((String file) => path.absolute(path.join(thisDirectory, file)))
29-
.toList();
27+
testFiles =
28+
testFiles
29+
.map((String file) => path.absolute(path.join(thisDirectory, file)))
30+
.toList()
31+
..shuffle();
3032

3133
final sb = StringBuffer();
3234
sb.writeln(r'''

runtime/tests/concurrency/run_stress_test_shards.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ main(List<String> arguments) async {
179179
'--disable-dart-dev',
180180
'--no-inline-alloc',
181181
'--use-slow-path',
182-
'--deoptimize-on-runtime-call-every=3',
182+
'--deoptimize-on-runtime-call-every=300',
183183
'runtime/tests/concurrency/generated_stress_test.dart.jit.dill',
184184
]),
185185
for (int i = 0; i < tsanShards; ++i)

tools/bots/test_matrix.json

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,7 +3624,6 @@
36243624
},
36253625
{
36263626
"builders": [
3627-
"iso-stress-linux",
36283627
"iso-stress-linux-x64",
36293628
"iso-stress-linux-arm64"
36303629
],
@@ -3633,52 +3632,25 @@
36333632
},
36343633
"steps": [
36353634
{
3636-
"name": "Build Dart VM - JIT and AOT - gen_snapshot",
3635+
"name": "build dart (debug)",
36373636
"script": "tools/build.py",
36383637
"arguments": [
3639-
"--mode=debug,release",
3640-
"gen_snapshot"
3641-
]
3642-
},
3643-
{
3644-
"name": "Build Dart VM - JIT and AOT - runtime/bin:dart, run_vm_tests",
3645-
"script": "tools/build.py",
3646-
"arguments": [
3647-
"--mode=debug,release",
3648-
"runtime/bin:dart",
3649-
"runtime/bin:run_vm_tests"
3650-
]
3651-
},
3652-
{
3653-
"name": "Build Dart VM - JIT and AOT - runtime, dartaotruntime",
3654-
"script": "tools/build.py",
3655-
"arguments": [
3656-
"--mode=debug,release",
3638+
"--mode=debug",
36573639
"runtime",
36583640
"dartaotruntime"
36593641
]
36603642
},
36613643
{
3662-
"name": "Build Dart VM - JIT and AOT (Release TSAN) - gen_snapshot",
3644+
"name": "build dart (release)",
36633645
"script": "tools/build.py",
36643646
"arguments": [
36653647
"--mode=release",
3666-
"--sanitizer=tsan",
3667-
"gen_snapshot"
3668-
]
3669-
},
3670-
{
3671-
"name": "Build Dart VM - JIT and AOT (Release TSAN)- runtime/bin:dart, run_vm_tests",
3672-
"script": "tools/build.py",
3673-
"arguments": [
3674-
"--mode=release",
3675-
"--sanitizer=tsan",
3676-
"runtime/bin:dart",
3677-
"runtime/bin:run_vm_tests"
3648+
"runtime",
3649+
"dartaotruntime"
36783650
]
36793651
},
36803652
{
3681-
"name": "Build Dart VM - JIT and AOT (Release TSAN) - runtime, dartaotruntime",
3653+
"name": "build dart (release tsan)",
36823654
"script": "tools/build.py",
36833655
"arguments": [
36843656
"--mode=release",
@@ -3729,7 +3701,7 @@
37293701
"--arch=${arch}",
37303702
"--copy-coredumps"
37313703
],
3732-
"shards": 10,
3704+
"shards": 4,
37333705
"fileset": "vm"
37343706
}
37353707
]

0 commit comments

Comments
 (0)