Split value_range_test and mark load_elimination_test as slow

Change-Id: I0becd6ddc9edd758f119436ec5ed6cdbde3c6359
Reviewed-on: https://dart-review.googlesource.com/31785
Reviewed-by: Johnni Winther <johnniwinther@google.com>
This commit is contained in:
Johnni Winther 2017-12-29 22:30:11 +01:00
parent b8ff3ae081
commit 68e39ed6dc
4 changed files with 308 additions and 288 deletions

View file

@ -0,0 +1,14 @@
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'package:async_helper/async_helper.dart';
import 'value_range_test_helper.dart';
main() {
asyncTest(() async {
// AST part tested in 'value_range_test.dart'.
print('--test from kernel------------------------------------------------');
await runTests(useKernel: true);
});
}

View file

@ -2,299 +2,13 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
import 'package:expect/expect.dart';
import 'package:async_helper/async_helper.dart';
import '../compiler_helper.dart';
const int REMOVED = 0;
const int ABOVE_ZERO = 1;
const int BELOW_LENGTH = 2;
const int KEPT = 3;
const int ONE_CHECK = 4;
const int ONE_ZERO_CHECK = 5;
const int BELOW_ZERO_CHECK = 6;
final List TESTS = [
"""
main() {
var a = new List();
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List();
var sum = 0;
for (int i = 0; i < value; i++) {
sum += a[i];
}
return sum;
}
""",
ABOVE_ZERO,
"""
main(check) {
// Make sure value is an int.
var value = check ? 42 : 54;
var a = new List(value);
var sum = 0;
for (int i = 0; i < value; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main() {
var a = new List();
return a[0];
}
""",
KEPT,
"""
main() {
var a = new List();
return a.removeLast();
}
""",
KEPT,
"""
main() {
var a = new List(4);
return a[0];
}
""",
REMOVED,
"""
main() {
var a = new List(4);
return a.removeLast();
}
""",
REMOVED,
"""
main(value) {
var a = new List(value);
return a[value];
}
""",
KEPT,
"""
main(value) {
var a = new List(1024);
return a[1023 & value];
}
""",
REMOVED,
"""
main(value) {
var a = new List(1024);
return a[1024 & value];
}
""",
ABOVE_ZERO,
"""
main(value) {
var a = new List();
return a[1];
}
""",
ABOVE_ZERO,
"""
main(value, call) {
var a = new List();
return a[value] + call() + a[value];
}
""",
ONE_ZERO_CHECK,
"""
main(value) {
var a = new List();
return a[1] + a[0];
}
""",
ONE_CHECK,
"""
main() {
var a = new List();
var sum = 0;
for (int i = 0; i <= a.length - 1; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main() {
var a = new List();
var sum = 0;
for (int i = a.length - 1; i >=0; i--) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value > a.length - 1) return;
if (value < 0) return;
return a[value];
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value <= a.length - 1) {
if (value >= 0) {
return a[value];
}
}
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value >= a.length) return;
if (value <= -1) return;
return a[value];
}
""",
REMOVED,
"""
main(value) {
var a = new List(4);
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
if (sum == 0) i++;
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List(5);
var sum = 0;
for (int i = a.length - 1; i >= 0; i--) {
sum += a[i];
if (sum == 0) i--;
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List(6);
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
if (sum == 0) i--;
}
return sum;
}
""",
BELOW_ZERO_CHECK,
"""
main(value) {
var a = new List(7);
var sum = 0;
for (int i = 0; i < a.length;) {
sum += a[i];
sum == 0 ? i-- : i++;
}
return sum;
}
""",
BELOW_ZERO_CHECK,
"""
main(value) {
var a = new List(7);
var sum = 0;
for (int i = -2; i < a.length; i = 0) {
sum += a[i];
}
return sum;
}
""",
BELOW_ZERO_CHECK,
];
Future expect(String code, int kind, {bool useKernel}) {
return compile(code, useKernel: useKernel, check: (String generated) {
switch (kind) {
case REMOVED:
Expect.isTrue(!generated.contains('ioore'));
break;
case ABOVE_ZERO:
Expect.isTrue(!generated.contains('< 0'));
Expect.isTrue(generated.contains('ioore'));
break;
case BELOW_ZERO_CHECK:
Expect.isTrue(generated.contains('< 0'));
Expect.isTrue(!generated.contains('||'));
Expect.isTrue(generated.contains('ioore'));
break;
case BELOW_LENGTH:
Expect.isTrue(!generated.contains('||'));
Expect.isTrue(generated.contains('ioore'));
break;
case KEPT:
Expect.isTrue(generated.contains('ioore'));
break;
case ONE_CHECK:
RegExp regexp = new RegExp('ioore');
Iterator matches = regexp.allMatches(generated).iterator;
checkNumberOfMatches(matches, 1);
break;
case ONE_ZERO_CHECK:
RegExp regexp = new RegExp('< 0|>>> 0 !==');
Iterator matches = regexp.allMatches(generated).iterator;
checkNumberOfMatches(matches, 1);
break;
}
});
}
import 'value_range_test_helper.dart';
main() {
runTests({bool useKernel}) async {
for (int i = 0; i < TESTS.length; i += 2) {
await expect(TESTS[i], TESTS[i + 1], useKernel: useKernel);
}
}
asyncTest(() async {
print('--test from ast---------------------------------------------------');
await runTests(useKernel: false);
print('--test from kernel------------------------------------------------');
await runTests(useKernel: true);
// Kernel part tested in 'value_range_kernel_test.dart'.
});
}

View file

@ -0,0 +1,290 @@
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:async';
import 'package:expect/expect.dart';
import '../compiler_helper.dart';
const int REMOVED = 0;
const int ABOVE_ZERO = 1;
const int BELOW_LENGTH = 2;
const int KEPT = 3;
const int ONE_CHECK = 4;
const int ONE_ZERO_CHECK = 5;
const int BELOW_ZERO_CHECK = 6;
final List TESTS = [
"""
main() {
var a = new List();
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List();
var sum = 0;
for (int i = 0; i < value; i++) {
sum += a[i];
}
return sum;
}
""",
ABOVE_ZERO,
"""
main(check) {
// Make sure value is an int.
var value = check ? 42 : 54;
var a = new List(value);
var sum = 0;
for (int i = 0; i < value; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main() {
var a = new List();
return a[0];
}
""",
KEPT,
"""
main() {
var a = new List();
return a.removeLast();
}
""",
KEPT,
"""
main() {
var a = new List(4);
return a[0];
}
""",
REMOVED,
"""
main() {
var a = new List(4);
return a.removeLast();
}
""",
REMOVED,
"""
main(value) {
var a = new List(value);
return a[value];
}
""",
KEPT,
"""
main(value) {
var a = new List(1024);
return a[1023 & value];
}
""",
REMOVED,
"""
main(value) {
var a = new List(1024);
return a[1024 & value];
}
""",
ABOVE_ZERO,
"""
main(value) {
var a = new List();
return a[1];
}
""",
ABOVE_ZERO,
"""
main(value, call) {
var a = new List();
return a[value] + call() + a[value];
}
""",
ONE_ZERO_CHECK,
"""
main(value) {
var a = new List();
return a[1] + a[0];
}
""",
ONE_CHECK,
"""
main() {
var a = new List();
var sum = 0;
for (int i = 0; i <= a.length - 1; i++) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main() {
var a = new List();
var sum = 0;
for (int i = a.length - 1; i >=0; i--) {
sum += a[i];
}
return sum;
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value > a.length - 1) return;
if (value < 0) return;
return a[value];
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value <= a.length - 1) {
if (value >= 0) {
return a[value];
}
}
}
""",
REMOVED,
"""
main(value) {
value = value is int ? value as int : 42;
int sum = ~value;
for (int i = 0; i < 42; i++) sum += (value & 4);
var a = new List();
if (value >= a.length) return;
if (value <= -1) return;
return a[value];
}
""",
REMOVED,
"""
main(value) {
var a = new List(4);
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
if (sum == 0) i++;
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List(5);
var sum = 0;
for (int i = a.length - 1; i >= 0; i--) {
sum += a[i];
if (sum == 0) i--;
}
return sum;
}
""",
REMOVED,
"""
main(value) {
var a = new List(6);
var sum = 0;
for (int i = 0; i < a.length; i++) {
sum += a[i];
if (sum == 0) i--;
}
return sum;
}
""",
BELOW_ZERO_CHECK,
"""
main(value) {
var a = new List(7);
var sum = 0;
for (int i = 0; i < a.length;) {
sum += a[i];
sum == 0 ? i-- : i++;
}
return sum;
}
""",
BELOW_ZERO_CHECK,
"""
main(value) {
var a = new List(7);
var sum = 0;
for (int i = -2; i < a.length; i = 0) {
sum += a[i];
}
return sum;
}
""",
BELOW_ZERO_CHECK,
];
Future expect(String code, int kind, {bool useKernel}) {
return compile(code, useKernel: useKernel, check: (String generated) {
switch (kind) {
case REMOVED:
Expect.isTrue(!generated.contains('ioore'));
break;
case ABOVE_ZERO:
Expect.isTrue(!generated.contains('< 0'));
Expect.isTrue(generated.contains('ioore'));
break;
case BELOW_ZERO_CHECK:
Expect.isTrue(generated.contains('< 0'));
Expect.isTrue(!generated.contains('||'));
Expect.isTrue(generated.contains('ioore'));
break;
case BELOW_LENGTH:
Expect.isTrue(!generated.contains('||'));
Expect.isTrue(generated.contains('ioore'));
break;
case KEPT:
Expect.isTrue(generated.contains('ioore'));
break;
case ONE_CHECK:
RegExp regexp = new RegExp('ioore');
Iterator matches = regexp.allMatches(generated).iterator;
checkNumberOfMatches(matches, 1);
break;
case ONE_ZERO_CHECK:
RegExp regexp = new RegExp('< 0|>>> 0 !==');
Iterator matches = regexp.allMatches(generated).iterator;
checkNumberOfMatches(matches, 1);
break;
}
});
}
runTests({bool useKernel}) async {
for (int i = 0; i < TESTS.length; i += 2) {
await expect(TESTS[i], TESTS[i + 1], useKernel: useKernel);
}
}

View file

@ -6,6 +6,7 @@ analyze_test: Slow, Pass
async_await_syntax_test: Pass # DON'T CHANGE THIS LINE -- Don't mark these tests as failing. Instead, fix the errors/warnings that they report or update the whitelist in the test-files to temporarily allow digression.
boolified_operator_test: Fail # Issue 8001
codegen/gvn_dynamic_field_get_test: Fail # Issue 18519
codegen/load_elimination_test: Pass, Slow
codegen/logical_expression_test: Fail # Issue 17027
codegen/simple_function_subtype_test: Fail # simple_function_subtype_test is temporarily(?) disabled due to new method for building function type tests.
deferred_loading/deferred_loading_test: Slow, Pass
@ -80,6 +81,7 @@ dart2js_batch2_test: Pass, RuntimeError # Issue 29021
[ $checked ]
codegen/value_range_test: Pass, Slow
codegen/value_range_kernel_test: Pass, Slow
end_to_end/exit_code_test: Pass, Slow
jsinterop/declaration_test: Slow, Pass
jsinterop/interop_anonymous_unreachable_test: Pass, Slow