Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1056)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart

Issue 574683002: Use ConstExp for storing constants. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fixes and further implementation. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« sdk/lib/_internal/compiler/implementation/helpers/helpers.dart ('K') | « tests/compiler/dart2js/backend_dart/opt_constprop_test.dart ('k') | tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart » ('j') | tests/compiler/dart2js/backend_dart/sexpr_test.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart
diff --git a/tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart b/tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart
index c37ce569cdaa2093d273d313de9752cadefc6f8d..9e6ed7ff60a17370bce8544e0b89244aa8a13189 100644
--- a/tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart
+++ b/tests/compiler/dart2js/backend_dart/opt_redundant_phi_test.dart
@@ -19,38 +19,38 @@ import 'package:compiler/implementation/cps_ir/optimizers.dart';
// }
String READ_IN_LOOP_IN = """
-(FunctionDefinition main (return) (LetPrim v0 (Constant 42))
- (LetPrim v1 (Constant 0))
+(FunctionDefinition main (return) (LetPrim v0 (Constant IntConstant(42)))
+ (LetPrim v1 (Constant IntConstant(0)))
(LetCont* (k0 v2 v3)
- (LetCont (k1) (LetPrim v4 (Constant null))
+ (LetCont (k1) (LetPrim v4 (Constant NullConstant))
(InvokeContinuation return v4))
(LetCont (k2)
(LetCont (k3 v5)
- (LetCont (k4 v6) (LetPrim v7 (Constant 1))
+ (LetCont (k4 v6) (LetPrim v7 (Constant IntConstant(1)))
(LetCont (k5 v8) (InvokeContinuation* k0 v2 v8))
(InvokeMethod v3 + v7 k5))
(InvokeStatic print v5 k4))
(InvokeMethod v2 toString k3))
- (LetPrim v9 (Constant 2))
+ (LetPrim v9 (Constant IntConstant(2)))
(LetCont (k6 v10) (Branch (IsTrue v10) k2 k1))
(InvokeMethod v3 < v9 k6))
(InvokeContinuation k0 v0 v1))
""";
String READ_IN_LOOP_OUT = """
-(FunctionDefinition main ( return) (LetPrim v0 (Constant 42))
- (LetPrim v1 (Constant 0))
+(FunctionDefinition main ( return) (LetPrim v0 (Constant IntConstant(42)))
+ (LetPrim v1 (Constant IntConstant(0)))
(LetCont* (k0 v2)
- (LetCont (k1) (LetPrim v3 (Constant null))
+ (LetCont (k1) (LetPrim v3 (Constant NullConstant))
(InvokeContinuation return v3))
(LetCont (k2)
(LetCont (k3 v4)
- (LetCont (k4 v5) (LetPrim v6 (Constant 1))
+ (LetCont (k4 v5) (LetPrim v6 (Constant IntConstant(1)))
(LetCont (k5 v7) (InvokeContinuation* k0 v7))
(InvokeMethod v2 + v6 k5))
(InvokeStatic print v4 k4))
(InvokeMethod v0 toString k3))
- (LetPrim v8 (Constant 2))
+ (LetPrim v8 (Constant IntConstant(2)))
(LetCont (k6 v9) (Branch (IsTrue v9) k2 k1))
(InvokeMethod v2 < v8 k6))
(InvokeContinuation k0 v1))
@@ -72,66 +72,66 @@ String READ_IN_LOOP_OUT = """
// are removed from k5, and only then can k0 be optimized as well.
const String INNER_LOOP_IN = """
-(FunctionDefinition main (return) (LetPrim v0 (Constant 42))
- (LetPrim v1 (Constant 0))
+(FunctionDefinition main (return) (LetPrim v0 (Constant IntConstant(42)))
+ (LetPrim v1 (Constant IntConstant(0)))
(LetCont* (k0 v2 v3)
(LetCont (k1)
(LetCont (k2 v4)
- (LetCont (k3 v5) (LetPrim v6 (Constant null))
+ (LetCont (k3 v5) (LetPrim v6 (Constant NullConstant))
(InvokeContinuation return v6))
(InvokeStatic print v4 k3))
(InvokeMethod v2 toString k2))
- (LetCont (k4) (LetPrim v7 (Constant 0))
+ (LetCont (k4) (LetPrim v7 (Constant IntConstant(0)))
(LetCont* (k5 v8 v9 v10)
- (LetCont (k6) (LetPrim v11 (Constant 1))
+ (LetCont (k6) (LetPrim v11 (Constant IntConstant(1)))
(LetCont (k7 v12) (InvokeContinuation* k0 v8 v12))
(InvokeMethod v9 + v11 k7))
(LetCont (k8)
(LetCont (k9 v13)
- (LetCont (k10 v14) (LetPrim v15 (Constant 1))
+ (LetCont (k10 v14) (LetPrim v15 (Constant IntConstant(1)))
(LetCont (k11 v16)
(InvokeContinuation* k5 v8 v9 v16))
(InvokeMethod v10 + v15 k11))
(InvokeStatic print v13 k10))
(InvokeMethod v9 toString k9))
- (LetPrim v17 (Constant 2))
+ (LetPrim v17 (Constant IntConstant(2)))
(LetCont (k12 v18) (Branch (IsTrue v18) k8 k6))
(InvokeMethod v10 < v17 k12))
(InvokeContinuation k5 v2 v3 v7))
- (LetPrim v19 (Constant 2))
+ (LetPrim v19 (Constant IntConstant(2)))
(LetCont (k13 v20) (Branch (IsTrue v20) k4 k1))
(InvokeMethod v3 < v19 k13))
(InvokeContinuation k0 v0 v1))
""";
const String INNER_LOOP_OUT = """
-(FunctionDefinition main ( return) (LetPrim v0 (Constant 42))
- (LetPrim v1 (Constant 0))
+(FunctionDefinition main ( return) (LetPrim v0 (Constant IntConstant(42)))
+ (LetPrim v1 (Constant IntConstant(0)))
(LetCont* (k0 v2)
(LetCont (k1)
(LetCont (k2 v3)
- (LetCont (k3 v4) (LetPrim v5 (Constant null))
+ (LetCont (k3 v4) (LetPrim v5 (Constant NullConstant))
(InvokeContinuation return v5))
(InvokeStatic print v3 k3))
(InvokeMethod v0 toString k2))
- (LetCont (k4) (LetPrim v6 (Constant 0))
+ (LetCont (k4) (LetPrim v6 (Constant IntConstant(0)))
(LetCont* (k5 v7)
- (LetCont (k6) (LetPrim v8 (Constant 1))
+ (LetCont (k6) (LetPrim v8 (Constant IntConstant(1)))
(LetCont (k7 v9) (InvokeContinuation* k0 v9))
(InvokeMethod v2 + v8 k7))
(LetCont (k8)
(LetCont (k9 v10)
- (LetCont (k10 v11) (LetPrim v12 (Constant 1))
+ (LetCont (k10 v11) (LetPrim v12 (Constant IntConstant(1)))
(LetCont (k11 v13)
(InvokeContinuation* k5 v13))
(InvokeMethod v7 + v12 k11))
(InvokeStatic print v10 k10))
(InvokeMethod v2 toString k9))
- (LetPrim v14 (Constant 2))
+ (LetPrim v14 (Constant IntConstant(2)))
(LetCont (k12 v15) (Branch (IsTrue v15) k8 k6))
(InvokeMethod v7 < v14 k12))
(InvokeContinuation k5 v6))
- (LetPrim v16 (Constant 2))
+ (LetPrim v16 (Constant IntConstant(2)))
(LetCont (k13 v17) (Branch (IsTrue v17) k4 k1))
(InvokeMethod v2 < v16 k13))
(InvokeContinuation k0 v1))
@@ -148,18 +148,18 @@ const String INNER_LOOP_OUT = """
// }
String BASIC_LOOP_IN = """
-(FunctionDefinition main ( return) (LetPrim v0 (Constant 0))
+(FunctionDefinition main ( return) (LetPrim v0 (Constant IntConstant(0)))
(LetCont* (k0 v1)
- (LetCont (k1) (LetPrim v2 (Constant null))
+ (LetCont (k1) (LetPrim v2 (Constant NullConstant))
(InvokeContinuation return v2))
(LetCont (k2)
(LetCont (k3 v3)
- (LetCont (k4 v4) (LetPrim v5 (Constant 1))
+ (LetCont (k4 v4) (LetPrim v5 (Constant IntConstant(1)))
(LetCont (k5 v6) (InvokeContinuation* k0 v6))
(InvokeMethod v1 + v5 k5))
(InvokeStatic print v3 k4))
(InvokeMethod v1 toString k3))
- (LetPrim v7 (Constant 2))
+ (LetPrim v7 (Constant IntConstant(2)))
(LetCont (k6 v8) (Branch (IsTrue v8) k2 k1))
(InvokeMethod v1 < v7 k6))
(InvokeContinuation k0 v0))
@@ -175,17 +175,17 @@ String SCOPING_IN = """
(FunctionDefinition main ( return)
(LetCont (k0 v1)
(InvokeStatic print v1 return))
- (LetPrim v0 (Constant 0))
- (LetPrim v2 (Constant null))
+ (LetPrim v0 (Constant IntConstant(0)))
+ (LetPrim v2 (Constant NullConstant))
(InvokeContinuation k0 v0))
""";
String SCOPING_OUT = """
(FunctionDefinition main ( return)
- (LetPrim v0 (Constant 0))
+ (LetPrim v0 (Constant IntConstant(0)))
(LetCont (k0)
(InvokeStatic print v0 return))
- (LetPrim v1 (Constant null))
+ (LetPrim v1 (Constant NullConstant))
(InvokeContinuation k0 ))
""";
@@ -193,8 +193,8 @@ String SCOPING_OUT = """
// IR written by hand.
String NEVER_INVOKED1_IN = """
-(FunctionDefinition main ( return)
- (LetPrim v0 (Constant 0))
+(FunctionDefinition main ( return)
+ (LetPrim v0 (Constant IntConstant(0)))
(LetCont (k0 v1)
(InvokeStatic print v1 return))
(InvokeContinuation return v0))
@@ -245,7 +245,7 @@ void testRedundantPhi(String input, String expectedOutput) {
String expected = normalizeSExpr(expectedOutput);
String actual = normalizeSExpr(stringifier.visit(f));
- Expect.equals(expected, actual);
+ Expect.equals(expected, actual, "Actual:\n$actual");
}
void main() {
« sdk/lib/_internal/compiler/implementation/helpers/helpers.dart ('K') | « tests/compiler/dart2js/backend_dart/opt_constprop_test.dart ('k') | tests/compiler/dart2js/backend_dart/opt_shrinking_test.dart » ('j') | tests/compiler/dart2js/backend_dart/sexpr_test.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698