Skip to content

Commit 6b3abe0

Browse files
aamcommit-bot@chromium.org
authored andcommitted
[vm/concurrency] Add --experimental_enable_isolate_groups_jit flag, make --enable_isolate_groups AOT only.
Issue b/177800357. TEST=existing test suite Change-Id: Id6b113932ab7014b8fa6c105845c5c490b60f5e8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/181320 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Vyacheslav Egorov <[email protected]>
1 parent 10abe4e commit 6b3abe0

File tree

278 files changed

+325
-292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+325
-292
lines changed

runtime/lib/isolate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ class SpawnIsolateTask : public ThreadPool::Task {
586586
ASSERT(name != nullptr);
587587

588588
auto group = state_->isolate_group();
589-
if (!FLAG_enable_isolate_groups || group == nullptr) {
589+
if (!IsolateGroup::AreIsolateGroupsEnabled() || group == nullptr) {
590590
RunHeavyweight(name);
591591
} else {
592592
RunLightweight(name);

runtime/tests/vm/dart/isolates/dart_api_create_lightweight_isolate_test.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// SharedObjects=ffi_test_functions
66
// VMOptions=
7-
// VMOptions=--enable-isolate-groups --disable-heap-verification
7+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
88

99
import 'dart:async';
1010
import 'dart:ffi';
@@ -18,8 +18,10 @@ import '../../../../../tests/ffi/calloc.dart';
1818
import '../../../../../tests/ffi/dylib_utils.dart';
1919

2020
final bool isAOT = Platform.executable.contains('dart_precompiled_runtime');
21-
final bool isolateGropusEnabled =
21+
final bool isolateGroupsEnabled =
2222
Platform.executableArguments.contains('--enable-isolate-groups');
23+
final bool isolateGroupsEnabledInJIT = Platform.executableArguments
24+
.contains('--experimental-enable-isolate-groups-jit');
2325
final sdkRoot = Platform.script.resolve('../../../../../');
2426

2527
class Isolate extends Opaque {}
@@ -242,13 +244,17 @@ Future testJit() async {
242244
}
243245

244246
Future main(args) async {
245-
if (!isolateGropusEnabled) {
247+
if (!isolateGroupsEnabled) {
246248
await testNotSupported();
247249
return;
248250
}
249251
if (isAOT) {
250252
await testAot();
251253
} else {
252-
await testJit();
254+
if (isolateGroupsEnabledInJIT) {
255+
await testJit();
256+
} else {
257+
await testNotSupported();
258+
}
253259
}
254260
}

runtime/tests/vm/dart/isolates/fibonacci_call_ig_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:isolate';
88

runtime/tests/vm/dart/isolates/fibonacci_call_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:isolate';
88

runtime/tests/vm/dart/isolates/limited_active_mutator_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
// SharedObjects=ffi_test_functions
6-
// VMOptions=--enable-isolate-groups --disable-heap-verification --disable-thread-pool-limit
6+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification --disable-thread-pool-limit
77

88
import 'dart:async';
99
import 'dart:math' as math;

runtime/tests/vm/dart/isolates/ring_gc_sendAndExit_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:math' as math;
88

runtime/tests/vm/dart/isolates/ring_gc_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:async';
88
import 'dart:math' as math;

runtime/tests/vm/dart/isolates/spawn_function_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit
66
// VMOptions=--no-enable-isolate-groups
77

88
import 'dart:isolate';

runtime/tests/vm/dart/isolates/sum_recursive_call_ig_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:isolate';
88

runtime/tests/vm/dart/isolates/sum_recursive_call_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// VMOptions=--enable-isolate-groups --disable-heap-verification
5+
// VMOptions=--enable-isolate-groups --experimental-enable-isolate-groups-jit --disable-heap-verification
66

77
import 'dart:isolate';
88

0 commit comments

Comments
 (0)