Skip to content

Commit 38deece

Browse files
alexmarkovcommit-bot@chromium.org
authored andcommitted
Revert "[vm/tests] Re-enable tests for multiple entry points"
This reverts commit 00eb034. Reason for revert: test failure on vm-kernel-optcounter-threshold-linux-release-x64 bot Original change's description: > [vm/tests] Re-enable tests for multiple entry points > > Closes #37144 > > Change-Id: I9935db44cf01dda106c9211978dca33aac7fcb16 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109551 > Reviewed-by: Ryan Macnak <[email protected]> > Commit-Queue: Alexander Markov <[email protected]> [email protected],[email protected],[email protected] Change-Id: I582c014c4e02216be1575609aa950e8afb7e0702 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109600 Reviewed-by: Alexander Markov <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent 6e34c36 commit 38deece

File tree

6 files changed

+4
-42
lines changed

6 files changed

+4
-42
lines changed

runtime/tests/vm/dart/entrypoints/common.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,3 @@ _validateTearoffFn(String name, int entryPoint) {
5757
const validate = benchmarkMode ? null : _validateFn;
5858
@pragma("vm:entry-point", "get")
5959
const validateTearoff = benchmarkMode ? null : _validateTearoffFn;
60-
61-
void bumpUsageCounter() {}

runtime/tests/vm/dart/entrypoints/jit/polymorphic_optional_this_test.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ import "package:expect/expect.dart";
1515
abstract class C<T> {
1616
@NeverInline
1717
void samir1(T x) {
18-
// Make sure this method gets optimized before main.
19-
// Otherwise it might get inlined into warm-up loop, and subsequent
20-
// loop will call an unoptimized version (which is not guaranteed to
21-
// dispatch to unchecked entry point).
22-
bumpUsageCounter();
23-
bumpUsageCounter();
24-
bumpUsageCounter();
25-
2618
samir2(x, y: "hi");
2719
}
2820

runtime/tests/vm/dart/entrypoints/jit/polymorphic_this_test.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ import "package:expect/expect.dart";
1414
abstract class C<T> {
1515
@NeverInline
1616
void target1(T x) {
17-
// Make sure this method gets optimized before main.
18-
// Otherwise it might get inlined into warm-up loop, and subsequent
19-
// loop will call an unoptimized version (which is not guaranteed to
20-
// dispatch to unchecked entry point).
21-
bumpUsageCounter();
22-
bumpUsageCounter();
23-
bumpUsageCounter();
24-
2517
target2(x);
2618
}
2719

runtime/tests/vm/dart/entrypoints/static_this.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ class C<T> {
1717

1818
@NeverInline
1919
void target1(T x) {
20-
// Make sure this method gets optimized before main.
21-
// Otherwise it might get inlined into warm-up loop, and subsequent
22-
// loop will call an unoptimized version (which is not guaranteed to
23-
// dispatch to unchecked entry point).
24-
bumpUsageCounter();
25-
bumpUsageCounter();
26-
bumpUsageCounter();
27-
2820
target2(x);
2921
}
3022
}

runtime/tests/vm/dart/entrypoints/super.dart

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,13 @@ class C<T> {
1919
class D<T> extends C<T> {
2020
@NeverInline
2121
void target1(T x) {
22-
// Make sure this method gets optimized before main.
23-
// Otherwise it might get inlined into warm-up loop, and subsequent
24-
// loop will call an unoptimized version (which is not guaranteed to
25-
// dispatch to unchecked entry point).
26-
bumpUsageCounter();
27-
bumpUsageCounter();
28-
bumpUsageCounter();
29-
3022
super.target1(x);
3123
}
3224
}
3325

3426
class E<T> extends C<T> {
3527
@NeverInline
3628
void target1(T x) {
37-
// Make sure this method gets optimized before main.
38-
// Otherwise it might get inlined into warm-up loop, and subsequent
39-
// loop will call an unoptimized version (which is not guaranteed to
40-
// dispatch to unchecked entry point).
41-
bumpUsageCounter();
42-
bumpUsageCounter();
43-
bumpUsageCounter();
44-
4529
super.target1(x);
4630
}
4731
}

runtime/tests/vm/vm.status

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ cc/IsolateReload_PendingUnqualifiedCall_InstanceToStatic: Fail # Issue 32981
1313
cc/IsolateReload_PendingUnqualifiedCall_StaticToInstance: Fail # Issue 32981
1414
cc/Profiler_StringInterpolation: Fail # Issue 37208
1515
dart/data_uri_import_test/none: SkipByDesign
16+
dart/entrypoints/jit: Skip # Tests with brittle dependencies on usage counters - Issue 37144
1617
dart/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
1718
dart/snapshot_version_test: Skip # This test is a Dart1 test (script snapshot)
1819
dart/stack_overflow_shared_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
@@ -30,6 +31,9 @@ dart/kernel_determinism_test: SkipSlow
3031
dart/redirection_type_shuffling_test/none: RuntimeError
3132
dart/snapshot_version_test: RuntimeError
3233

34+
[ $compiler == dartk ]
35+
dart/entrypoints/aot/*: SkipByDesign
36+
3337
[ $compiler == dartkb ]
3438
cc/*: Skip # Too many timeouts and crashes for infrastructure to handle.
3539

0 commit comments

Comments
 (0)