diff options
| author | 2015-05-15 14:24:31 +0100 | |
|---|---|---|
| committer | 2015-05-15 14:50:51 +0100 | |
| commit | c2c48ffdd623b4e58b34115d1521b0988a42b217 (patch) | |
| tree | 56a7aea7fa187c388592e3d6df60be9c8edbfd0e | |
| parent | 1cad536d675846ac9c110b5b3a412dfc55ace3ed (diff) | |
ART: Change Checker syntax for variables
This patch changes the syntax for defining and referencing variables
from square brackets '[[VAR]]' to angle brackets '<<VAR>>'. This is
done in order to avoid clashes when matching against lists enclosed
in square brackets.
Change-Id: Ib9560b07bdc7bd641fd1eb6143c0063e0783f1eb
19 files changed, 968 insertions, 968 deletions
diff --git a/test/441-checker-inliner/src/Main.java b/test/441-checker-inliner/src/Main.java index 631b140683..1c3855f5d2 100644 --- a/test/441-checker-inliner/src/Main.java +++ b/test/441-checker-inliner/src/Main.java @@ -17,9 +17,9 @@ public class Main { // CHECK-START: void Main.InlineVoid() inliner (before) - // CHECK-DAG: [[Const42:i\d+]] IntConstant 42 + // CHECK-DAG: <<Const42:i\d+>> IntConstant 42 // CHECK-DAG: InvokeStaticOrDirect - // CHECK-DAG: InvokeStaticOrDirect [ [[Const42]] ] + // CHECK-DAG: InvokeStaticOrDirect [ <<Const42>> ] // CHECK-START: void Main.InlineVoid() inliner (after) // CHECK-NOT: InvokeStaticOrDirect @@ -30,94 +30,94 @@ public class Main { } // CHECK-START: int Main.InlineParameter(int) inliner (before) - // CHECK-DAG: [[Param:i\d+]] ParameterValue - // CHECK-DAG: [[Result:i\d+]] InvokeStaticOrDirect [ [[Param]] ] - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Param:i\d+>> ParameterValue + // CHECK-DAG: <<Result:i\d+>> InvokeStaticOrDirect [ <<Param>> ] + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: int Main.InlineParameter(int) inliner (after) - // CHECK-DAG: [[Param:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Param]] ] + // CHECK-DAG: <<Param:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Param>> ] public static int InlineParameter(int a) { return returnParameter(a); } // CHECK-START: long Main.InlineWideParameter(long) inliner (before) - // CHECK-DAG: [[Param:j\d+]] ParameterValue - // CHECK-DAG: [[Result:j\d+]] InvokeStaticOrDirect [ [[Param]] ] - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Param:j\d+>> ParameterValue + // CHECK-DAG: <<Result:j\d+>> InvokeStaticOrDirect [ <<Param>> ] + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: long Main.InlineWideParameter(long) inliner (after) - // CHECK-DAG: [[Param:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Param]] ] + // CHECK-DAG: <<Param:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Param>> ] public static long InlineWideParameter(long a) { return returnWideParameter(a); } // CHECK-START: java.lang.Object Main.InlineReferenceParameter(java.lang.Object) inliner (before) - // CHECK-DAG: [[Param:l\d+]] ParameterValue - // CHECK-DAG: [[Result:l\d+]] InvokeStaticOrDirect [ [[Param]] ] - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Param:l\d+>> ParameterValue + // CHECK-DAG: <<Result:l\d+>> InvokeStaticOrDirect [ <<Param>> ] + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: java.lang.Object Main.InlineReferenceParameter(java.lang.Object) inliner (after) - // CHECK-DAG: [[Param:l\d+]] ParameterValue - // CHECK-DAG: Return [ [[Param]] ] + // CHECK-DAG: <<Param:l\d+>> ParameterValue + // CHECK-DAG: Return [ <<Param>> ] public static Object InlineReferenceParameter(Object o) { return returnReferenceParameter(o); } // CHECK-START: int Main.InlineInt() inliner (before) - // CHECK-DAG: [[Result:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Result:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: int Main.InlineInt() inliner (after) - // CHECK-DAG: [[Const4:i\d+]] IntConstant 4 - // CHECK-DAG: Return [ [[Const4]] ] + // CHECK-DAG: <<Const4:i\d+>> IntConstant 4 + // CHECK-DAG: Return [ <<Const4>> ] public static int InlineInt() { return returnInt(); } // CHECK-START: long Main.InlineWide() inliner (before) - // CHECK-DAG: [[Result:j\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Result:j\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: long Main.InlineWide() inliner (after) - // CHECK-DAG: [[Const8:j\d+]] LongConstant 8 - // CHECK-DAG: Return [ [[Const8]] ] + // CHECK-DAG: <<Const8:j\d+>> LongConstant 8 + // CHECK-DAG: Return [ <<Const8>> ] public static long InlineWide() { return returnWide(); } // CHECK-START: int Main.InlineAdd() inliner (before) - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Result:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Result]] ] + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Result:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Result>> ] // CHECK-START: int Main.InlineAdd() inliner (after) - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Add:i\d+]] Add [ [[Const3]] [[Const5]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Add:i\d+>> Add [ <<Const3>> <<Const5>> ] + // CHECK-DAG: Return [ <<Add>> ] public static int InlineAdd() { return returnAdd(3, 5); } // CHECK-START: int Main.InlineFieldAccess() inliner (before) - // CHECK-DAG: [[After:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[After]] ] + // CHECK-DAG: <<After:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<After>> ] // CHECK-START: int Main.InlineFieldAccess() inliner (after) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Before:i\d+]] StaticFieldGet - // CHECK-DAG: [[After:i\d+]] Add [ [[Before]] [[Const1]] ] - // CHECK-DAG: StaticFieldSet [ {{l\d+}} [[After]] ] - // CHECK-DAG: Return [ [[After]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Before:i\d+>> StaticFieldGet + // CHECK-DAG: <<After:i\d+>> Add [ <<Before>> <<Const1>> ] + // CHECK-DAG: StaticFieldSet [ {{l\d+}} <<After>> ] + // CHECK-DAG: Return [ <<After>> ] // CHECK-START: int Main.InlineFieldAccess() inliner (after) // CHECK-NOT: InvokeStaticOrDirect @@ -127,22 +127,22 @@ public class Main { } // CHECK-START: int Main.InlineWithControlFlow(boolean) inliner (before) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Add:i\d+]] InvokeStaticOrDirect [ [[Const1]] [[Const3]] ] - // CHECK-DAG: [[Sub:i\d+]] InvokeStaticOrDirect [ [[Const5]] [[Const3]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Add]] [[Sub]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Add:i\d+>> InvokeStaticOrDirect [ <<Const1>> <<Const3>> ] + // CHECK-DAG: <<Sub:i\d+>> InvokeStaticOrDirect [ <<Const5>> <<Const3>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: int Main.InlineWithControlFlow(boolean) inliner (after) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Add:i\d+]] Add [ [[Const1]] [[Const3]] ] - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Const5]] [[Const3]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Add]] [[Sub]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Add:i\d+>> Add [ <<Const1>> <<Const3>> ] + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const5>> <<Const3>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ] + // CHECK-DAG: Return [ <<Phi>> ] public static int InlineWithControlFlow(boolean cond) { int x, const1, const3, const5; diff --git a/test/442-checker-constant-folding/src/Main.java b/test/442-checker-constant-folding/src/Main.java index 6699acd96e..9a2e4fc4ee 100644 --- a/test/442-checker-constant-folding/src/Main.java +++ b/test/442-checker-constant-folding/src/Main.java @@ -52,13 +52,13 @@ public class Main { */ // CHECK-START: int Main.IntNegation() constant_folding (before) - // CHECK-DAG: [[Const42:i\d+]] IntConstant 42 - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Const42]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Const42:i\d+>> IntConstant 42 + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Const42>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.IntNegation() constant_folding (after) - // CHECK-DAG: [[ConstN42:i\d+]] IntConstant -42 - // CHECK-DAG: Return [ [[ConstN42]] ] + // CHECK-DAG: <<ConstN42:i\d+>> IntConstant -42 + // CHECK-DAG: Return [ <<ConstN42>> ] public static int IntNegation() { int x, y; @@ -73,14 +73,14 @@ public class Main { */ // CHECK-START: int Main.IntAddition1() constant_folding (before) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Const2:i\d+]] IntConstant 2 - // CHECK-DAG: [[Add:i\d+]] Add [ [[Const1]] [[Const2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Const2:i\d+>> IntConstant 2 + // CHECK-DAG: <<Add:i\d+>> Add [ <<Const1>> <<Const2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.IntAddition1() constant_folding (after) - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: Return [ [[Const3]] ] + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: Return [ <<Const3>> ] public static int IntAddition1() { int a, b, c; @@ -96,18 +96,18 @@ public class Main { */ // CHECK-START: int Main.IntAddition2() constant_folding (before) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Const2:i\d+]] IntConstant 2 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Const6:i\d+]] IntConstant 6 - // CHECK-DAG: [[Add1:i\d+]] Add [ [[Const1]] [[Const2]] ] - // CHECK-DAG: [[Add2:i\d+]] Add [ [[Const5]] [[Const6]] ] - // CHECK-DAG: [[Add3:i\d+]] Add [ [[Add1]] [[Add2]] ] - // CHECK-DAG: Return [ [[Add3]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Const2:i\d+>> IntConstant 2 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Const6:i\d+>> IntConstant 6 + // CHECK-DAG: <<Add1:i\d+>> Add [ <<Const1>> <<Const2>> ] + // CHECK-DAG: <<Add2:i\d+>> Add [ <<Const5>> <<Const6>> ] + // CHECK-DAG: <<Add3:i\d+>> Add [ <<Add1>> <<Add2>> ] + // CHECK-DAG: Return [ <<Add3>> ] // CHECK-START: int Main.IntAddition2() constant_folding (after) - // CHECK-DAG: [[Const14:i\d+]] IntConstant 14 - // CHECK-DAG: Return [ [[Const14]] ] + // CHECK-DAG: <<Const14:i\d+>> IntConstant 14 + // CHECK-DAG: Return [ <<Const14>> ] public static int IntAddition2() { int a, b, c; @@ -127,14 +127,14 @@ public class Main { */ // CHECK-START: int Main.IntSubtraction() constant_folding (before) - // CHECK-DAG: [[Const6:i\d+]] IntConstant 6 - // CHECK-DAG: [[Const2:i\d+]] IntConstant 2 - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Const6]] [[Const2]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Const6:i\d+>> IntConstant 6 + // CHECK-DAG: <<Const2:i\d+>> IntConstant 2 + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const6>> <<Const2>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.IntSubtraction() constant_folding (after) - // CHECK-DAG: [[Const4:i\d+]] IntConstant 4 - // CHECK-DAG: Return [ [[Const4]] ] + // CHECK-DAG: <<Const4:i\d+>> IntConstant 4 + // CHECK-DAG: Return [ <<Const4>> ] public static int IntSubtraction() { int a, b, c; @@ -150,14 +150,14 @@ public class Main { */ // CHECK-START: long Main.LongAddition() constant_folding (before) - // CHECK-DAG: [[Const1:j\d+]] LongConstant 1 - // CHECK-DAG: [[Const2:j\d+]] LongConstant 2 - // CHECK-DAG: [[Add:j\d+]] Add [ [[Const1]] [[Const2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Const1:j\d+>> LongConstant 1 + // CHECK-DAG: <<Const2:j\d+>> LongConstant 2 + // CHECK-DAG: <<Add:j\d+>> Add [ <<Const1>> <<Const2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: long Main.LongAddition() constant_folding (after) - // CHECK-DAG: [[Const3:j\d+]] LongConstant 3 - // CHECK-DAG: Return [ [[Const3]] ] + // CHECK-DAG: <<Const3:j\d+>> LongConstant 3 + // CHECK-DAG: Return [ <<Const3>> ] public static long LongAddition() { long a, b, c; @@ -173,14 +173,14 @@ public class Main { */ // CHECK-START: long Main.LongSubtraction() constant_folding (before) - // CHECK-DAG: [[Const6:j\d+]] LongConstant 6 - // CHECK-DAG: [[Const2:j\d+]] LongConstant 2 - // CHECK-DAG: [[Sub:j\d+]] Sub [ [[Const6]] [[Const2]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Const6:j\d+>> LongConstant 6 + // CHECK-DAG: <<Const2:j\d+>> LongConstant 2 + // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Const6>> <<Const2>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: long Main.LongSubtraction() constant_folding (after) - // CHECK-DAG: [[Const4:j\d+]] LongConstant 4 - // CHECK-DAG: Return [ [[Const4]] ] + // CHECK-DAG: <<Const4:j\d+>> LongConstant 4 + // CHECK-DAG: Return [ <<Const4>> ] public static long LongSubtraction() { long a, b, c; @@ -195,14 +195,14 @@ public class Main { */ // CHECK-START: int Main.StaticCondition() constant_folding (before) - // CHECK-DAG: [[Const7:i\d+]] IntConstant 7 - // CHECK-DAG: [[Const2:i\d+]] IntConstant 2 - // CHECK-DAG: [[Cond:z\d+]] GreaterThanOrEqual [ [[Const7]] [[Const2]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Const7:i\d+>> IntConstant 7 + // CHECK-DAG: <<Const2:i\d+>> IntConstant 2 + // CHECK-DAG: <<Cond:z\d+>> GreaterThanOrEqual [ <<Const7>> <<Const2>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.StaticCondition() constant_folding (after) - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: If [ [[Const1]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: If [ <<Const1>> ] public static int StaticCondition() { int a, b, c; @@ -225,18 +225,18 @@ public class Main { */ // CHECK-START: int Main.JumpsAndConditionals(boolean) constant_folding (before) - // CHECK-DAG: [[Const2:i\d+]] IntConstant 2 - // CHECK-DAG: [[Const5:i\d+]] IntConstant 5 - // CHECK-DAG: [[Add:i\d+]] Add [ [[Const5]] [[Const2]] ] - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Const5]] [[Const2]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Add]] [[Sub]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Const2:i\d+>> IntConstant 2 + // CHECK-DAG: <<Const5:i\d+>> IntConstant 5 + // CHECK-DAG: <<Add:i\d+>> Add [ <<Const5>> <<Const2>> ] + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const5>> <<Const2>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: int Main.JumpsAndConditionals(boolean) constant_folding (after) - // CHECK-DAG: [[Const3:i\d+]] IntConstant 3 - // CHECK-DAG: [[Const7:i\d+]] IntConstant 7 - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const7]] [[Const3]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Const3:i\d+>> IntConstant 3 + // CHECK-DAG: <<Const7:i\d+>> IntConstant 7 + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const7>> <<Const3>> ] + // CHECK-DAG: Return [ <<Phi>> ] public static int JumpsAndConditionals(boolean cond) { int a, b, c; @@ -254,192 +254,192 @@ public class Main { */ // CHECK-START: int Main.And0(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[And:i\d+]] And [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[And]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<And:i\d+>> And [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<And>> ] // CHECK-START: int Main.And0(int) constant_folding (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: And - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static int And0(int arg) { return arg & 0; } // CHECK-START: long Main.Mul0(long) constant_folding (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[Mul:j\d+]] Mul [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<Mul:j\d+>> Mul [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: long Main.Mul0(long) constant_folding (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 // CHECK-NOT: Mul - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static long Mul0(long arg) { return arg * 0; } // CHECK-START: int Main.OrAllOnes(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstF:i\d+]] IntConstant -1 - // CHECK-DAG: [[Or:i\d+]] Or [ [[Arg]] [[ConstF]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstF:i\d+>> IntConstant -1 + // CHECK-DAG: <<Or:i\d+>> Or [ <<Arg>> <<ConstF>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.OrAllOnes(int) constant_folding (after) - // CHECK-DAG: [[ConstF:i\d+]] IntConstant -1 + // CHECK-DAG: <<ConstF:i\d+>> IntConstant -1 // CHECK-NOT: Or - // CHECK-DAG: Return [ [[ConstF]] ] + // CHECK-DAG: Return [ <<ConstF>> ] public static int OrAllOnes(int arg) { return arg | -1; } // CHECK-START: long Main.Rem0(long) constant_folding (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[DivZeroCheck:j\d+]] DivZeroCheck [ [[Arg]] ] - // CHECK-DAG: [[Rem:j\d+]] Rem [ [[Const0]] [[DivZeroCheck]] ] - // CHECK-DAG: Return [ [[Rem]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [ <<Arg>> ] + // CHECK-DAG: <<Rem:j\d+>> Rem [ <<Const0>> <<DivZeroCheck>> ] + // CHECK-DAG: Return [ <<Rem>> ] // CHECK-START: long Main.Rem0(long) constant_folding (after) - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 // CHECK-NOT: Rem - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static long Rem0(long arg) { return 0 % arg; } // CHECK-START: int Main.Rem1(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Rem:i\d+]] Rem [ [[Arg]] [[Const1]] ] - // CHECK-DAG: Return [ [[Rem]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Rem:i\d+>> Rem [ <<Arg>> <<Const1>> ] + // CHECK-DAG: Return [ <<Rem>> ] // CHECK-START: int Main.Rem1(int) constant_folding (after) - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: Rem - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static int Rem1(int arg) { return arg % 1; } // CHECK-START: long Main.RemN1(long) constant_folding (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[ConstN1:j\d+]] LongConstant -1 - // CHECK-DAG: [[DivZeroCheck:j\d+]] DivZeroCheck [ [[Arg]] ] - // CHECK-DAG: [[Rem:j\d+]] Rem [ [[Arg]] [[DivZeroCheck]] ] - // CHECK-DAG: Return [ [[Rem]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<ConstN1:j\d+>> LongConstant -1 + // CHECK-DAG: <<DivZeroCheck:j\d+>> DivZeroCheck [ <<Arg>> ] + // CHECK-DAG: <<Rem:j\d+>> Rem [ <<Arg>> <<DivZeroCheck>> ] + // CHECK-DAG: Return [ <<Rem>> ] // CHECK-START: long Main.RemN1(long) constant_folding (after) - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 // CHECK-NOT: Rem - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static long RemN1(long arg) { return arg % -1; } // CHECK-START: int Main.Shl0(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Shl:i\d+]] Shl [ [[Const0]] [[Arg]] ] - // CHECK-DAG: Return [ [[Shl]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Shl:i\d+>> Shl [ <<Const0>> <<Arg>> ] + // CHECK-DAG: Return [ <<Shl>> ] // CHECK-START: int Main.Shl0(int) constant_folding (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: Shl - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static int Shl0(int arg) { return 0 << arg; } // CHECK-START: long Main.Shr0(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[Shr:j\d+]] Shr [ [[Const0]] [[Arg]] ] - // CHECK-DAG: Return [ [[Shr]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<Shr:j\d+>> Shr [ <<Const0>> <<Arg>> ] + // CHECK-DAG: Return [ <<Shr>> ] // CHECK-START: long Main.Shr0(int) constant_folding (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 // CHECK-NOT: Shr - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static long Shr0(int arg) { return (long)0 >> arg; } // CHECK-START: long Main.SubSameLong(long) constant_folding (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Sub:j\d+]] Sub [ [[Arg]] [[Arg]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Arg>> <<Arg>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: long Main.SubSameLong(long) constant_folding (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 // CHECK-NOT: Sub - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static long SubSameLong(long arg) { return arg - arg; } // CHECK-START: int Main.UShr0(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[UShr:i\d+]] UShr [ [[Const0]] [[Arg]] ] - // CHECK-DAG: Return [ [[UShr]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<UShr:i\d+>> UShr [ <<Const0>> <<Arg>> ] + // CHECK-DAG: Return [ <<UShr>> ] // CHECK-START: int Main.UShr0(int) constant_folding (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: UShr - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static int UShr0(int arg) { return 0 >>> arg; } // CHECK-START: int Main.XorSameInt(int) constant_folding (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Xor:i\d+]] Xor [ [[Arg]] [[Arg]] ] - // CHECK-DAG: Return [ [[Xor]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Xor:i\d+>> Xor [ <<Arg>> <<Arg>> ] + // CHECK-DAG: Return [ <<Xor>> ] // CHECK-START: int Main.XorSameInt(int) constant_folding (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: Xor - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: Return [ <<Const0>> ] public static int XorSameInt(int arg) { return arg ^ arg; } // CHECK-START: boolean Main.CmpFloatGreaterThanNaN(float) constant_folding (before) - // CHECK-DAG: [[Arg:f\d+]] ParameterValue - // CHECK-DAG: [[ConstNan:f\d+]] FloatConstant nan - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:f\d+>> ParameterValue + // CHECK-DAG: <<ConstNan:f\d+>> FloatConstant nan + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-DAG: IntConstant 1 - // CHECK-DAG: [[Cmp:i\d+]] Compare [ [[Arg]] [[ConstNan]] ] - // CHECK-DAG: [[Le:z\d+]] LessThanOrEqual [ [[Cmp]] [[Const0]] ] - // CHECK-DAG: If [ [[Le]] ] + // CHECK-DAG: <<Cmp:i\d+>> Compare [ <<Arg>> <<ConstNan>> ] + // CHECK-DAG: <<Le:z\d+>> LessThanOrEqual [ <<Cmp>> <<Const0>> ] + // CHECK-DAG: If [ <<Le>> ] // CHECK-START: boolean Main.CmpFloatGreaterThanNaN(float) constant_folding (after) // CHECK-DAG: ParameterValue // CHECK-DAG: FloatConstant nan // CHECK-DAG: IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: If [ [[Const1]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: If [ <<Const1>> ] // CHECK-START: boolean Main.CmpFloatGreaterThanNaN(float) constant_folding (after) // CHECK-NOT: Compare @@ -450,20 +450,20 @@ public class Main { } // CHECK-START: boolean Main.CmpDoubleLessThanNaN(double) constant_folding (before) - // CHECK-DAG: [[Arg:d\d+]] ParameterValue - // CHECK-DAG: [[ConstNan:d\d+]] DoubleConstant nan - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 + // CHECK-DAG: <<Arg:d\d+>> ParameterValue + // CHECK-DAG: <<ConstNan:d\d+>> DoubleConstant nan + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 // CHECK-DAG: IntConstant 1 - // CHECK-DAG: [[Cmp:i\d+]] Compare [ [[Arg]] [[ConstNan]] ] - // CHECK-DAG: [[Ge:z\d+]] GreaterThanOrEqual [ [[Cmp]] [[Const0]] ] - // CHECK-DAG: If [ [[Ge]] ] + // CHECK-DAG: <<Cmp:i\d+>> Compare [ <<Arg>> <<ConstNan>> ] + // CHECK-DAG: <<Ge:z\d+>> GreaterThanOrEqual [ <<Cmp>> <<Const0>> ] + // CHECK-DAG: If [ <<Ge>> ] // CHECK-START: boolean Main.CmpDoubleLessThanNaN(double) constant_folding (after) // CHECK-DAG: ParameterValue // CHECK-DAG: DoubleConstant nan // CHECK-DAG: IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: If [ [[Const1]] ] + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: If [ <<Const1>> ] // CHECK-START: boolean Main.CmpDoubleLessThanNaN(double) constant_folding (after) // CHECK-NOT: Compare @@ -474,13 +474,13 @@ public class Main { } // CHECK-START: int Main.ReturnInt33() constant_folding (before) - // CHECK-DAG: [[Const33:j\d+]] LongConstant 33 - // CHECK-DAG: [[Convert:i\d+]] TypeConversion [[Const33]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const33:j\d+>> LongConstant 33 + // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<Const33>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: int Main.ReturnInt33() constant_folding (after) - // CHECK-DAG: [[Const33:i\d+]] IntConstant 33 - // CHECK-DAG: Return [ [[Const33]] ] + // CHECK-DAG: <<Const33:i\d+>> IntConstant 33 + // CHECK-DAG: Return [ <<Const33>> ] public static int ReturnInt33() { long imm = 33L; @@ -488,13 +488,13 @@ public class Main { } // CHECK-START: int Main.ReturnIntMax() constant_folding (before) - // CHECK-DAG: [[ConstMax:f\d+]] FloatConstant 1e+34 - // CHECK-DAG: [[Convert:i\d+]] TypeConversion [[ConstMax]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<ConstMax:f\d+>> FloatConstant 1e+34 + // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<ConstMax>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: int Main.ReturnIntMax() constant_folding (after) - // CHECK-DAG: [[ConstMax:i\d+]] IntConstant 2147483647 - // CHECK-DAG: Return [ [[ConstMax]] ] + // CHECK-DAG: <<ConstMax:i\d+>> IntConstant 2147483647 + // CHECK-DAG: Return [ <<ConstMax>> ] public static int ReturnIntMax() { float imm = 1.0e34f; @@ -502,13 +502,13 @@ public class Main { } // CHECK-START: int Main.ReturnInt0() constant_folding (before) - // CHECK-DAG: [[ConstNaN:d\d+]] DoubleConstant nan - // CHECK-DAG: [[Convert:i\d+]] TypeConversion [[ConstNaN]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<ConstNaN:d\d+>> DoubleConstant nan + // CHECK-DAG: <<Convert:i\d+>> TypeConversion <<ConstNaN>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: int Main.ReturnInt0() constant_folding (after) - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: Return [ <<Const0>> ] public static int ReturnInt0() { double imm = Double.NaN; @@ -516,13 +516,13 @@ public class Main { } // CHECK-START: long Main.ReturnLong33() constant_folding (before) - // CHECK-DAG: [[Const33:i\d+]] IntConstant 33 - // CHECK-DAG: [[Convert:j\d+]] TypeConversion [[Const33]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const33:i\d+>> IntConstant 33 + // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<Const33>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: long Main.ReturnLong33() constant_folding (after) - // CHECK-DAG: [[Const33:j\d+]] LongConstant 33 - // CHECK-DAG: Return [ [[Const33]] ] + // CHECK-DAG: <<Const33:j\d+>> LongConstant 33 + // CHECK-DAG: Return [ <<Const33>> ] public static long ReturnLong33() { int imm = 33; @@ -530,13 +530,13 @@ public class Main { } // CHECK-START: long Main.ReturnLong34() constant_folding (before) - // CHECK-DAG: [[Const34:f\d+]] FloatConstant 34 - // CHECK-DAG: [[Convert:j\d+]] TypeConversion [[Const34]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const34:f\d+>> FloatConstant 34 + // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<Const34>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: long Main.ReturnLong34() constant_folding (after) - // CHECK-DAG: [[Const34:j\d+]] LongConstant 34 - // CHECK-DAG: Return [ [[Const34]] ] + // CHECK-DAG: <<Const34:j\d+>> LongConstant 34 + // CHECK-DAG: Return [ <<Const34>> ] public static long ReturnLong34() { float imm = 34.0f; @@ -544,13 +544,13 @@ public class Main { } // CHECK-START: long Main.ReturnLong0() constant_folding (before) - // CHECK-DAG: [[ConstNaN:d\d+]] DoubleConstant nan - // CHECK-DAG: [[Convert:j\d+]] TypeConversion [[ConstNaN]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<ConstNaN:d\d+>> DoubleConstant nan + // CHECK-DAG: <<Convert:j\d+>> TypeConversion <<ConstNaN>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: long Main.ReturnLong0() constant_folding (after) - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: Return [ [[Const0]] ] + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: Return [ <<Const0>> ] public static long ReturnLong0() { double imm = -Double.NaN; @@ -558,13 +558,13 @@ public class Main { } // CHECK-START: float Main.ReturnFloat33() constant_folding (before) - // CHECK-DAG: [[Const33:i\d+]] IntConstant 33 - // CHECK-DAG: [[Convert:f\d+]] TypeConversion [[Const33]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const33:i\d+>> IntConstant 33 + // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const33>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: float Main.ReturnFloat33() constant_folding (after) - // CHECK-DAG: [[Const33:f\d+]] FloatConstant 33 - // CHECK-DAG: Return [ [[Const33]] ] + // CHECK-DAG: <<Const33:f\d+>> FloatConstant 33 + // CHECK-DAG: Return [ <<Const33>> ] public static float ReturnFloat33() { int imm = 33; @@ -572,13 +572,13 @@ public class Main { } // CHECK-START: float Main.ReturnFloat34() constant_folding (before) - // CHECK-DAG: [[Const34:j\d+]] LongConstant 34 - // CHECK-DAG: [[Convert:f\d+]] TypeConversion [[Const34]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const34:j\d+>> LongConstant 34 + // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const34>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: float Main.ReturnFloat34() constant_folding (after) - // CHECK-DAG: [[Const34:f\d+]] FloatConstant 34 - // CHECK-DAG: Return [ [[Const34]] ] + // CHECK-DAG: <<Const34:f\d+>> FloatConstant 34 + // CHECK-DAG: Return [ <<Const34>> ] public static float ReturnFloat34() { long imm = 34L; @@ -586,13 +586,13 @@ public class Main { } // CHECK-START: float Main.ReturnFloat99P25() constant_folding (before) - // CHECK-DAG: [[Const:d\d+]] DoubleConstant 99.25 - // CHECK-DAG: [[Convert:f\d+]] TypeConversion [[Const]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const:d\d+>> DoubleConstant 99.25 + // CHECK-DAG: <<Convert:f\d+>> TypeConversion <<Const>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: float Main.ReturnFloat99P25() constant_folding (after) - // CHECK-DAG: [[Const:f\d+]] FloatConstant 99.25 - // CHECK-DAG: Return [ [[Const]] ] + // CHECK-DAG: <<Const:f\d+>> FloatConstant 99.25 + // CHECK-DAG: Return [ <<Const>> ] public static float ReturnFloat99P25() { double imm = 99.25; @@ -600,13 +600,13 @@ public class Main { } // CHECK-START: double Main.ReturnDouble33() constant_folding (before) - // CHECK-DAG: [[Const33:i\d+]] IntConstant 33 - // CHECK-DAG: [[Convert:d\d+]] TypeConversion [[Const33]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const33:i\d+>> IntConstant 33 + // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const33>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: double Main.ReturnDouble33() constant_folding (after) - // CHECK-DAG: [[Const33:d\d+]] DoubleConstant 33 - // CHECK-DAG: Return [ [[Const33]] ] + // CHECK-DAG: <<Const33:d\d+>> DoubleConstant 33 + // CHECK-DAG: Return [ <<Const33>> ] public static double ReturnDouble33() { int imm = 33; @@ -614,13 +614,13 @@ public class Main { } // CHECK-START: double Main.ReturnDouble34() constant_folding (before) - // CHECK-DAG: [[Const34:j\d+]] LongConstant 34 - // CHECK-DAG: [[Convert:d\d+]] TypeConversion [[Const34]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const34:j\d+>> LongConstant 34 + // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const34>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: double Main.ReturnDouble34() constant_folding (after) - // CHECK-DAG: [[Const34:d\d+]] DoubleConstant 34 - // CHECK-DAG: Return [ [[Const34]] ] + // CHECK-DAG: <<Const34:d\d+>> DoubleConstant 34 + // CHECK-DAG: Return [ <<Const34>> ] public static double ReturnDouble34() { long imm = 34L; @@ -628,13 +628,13 @@ public class Main { } // CHECK-START: double Main.ReturnDouble99P25() constant_folding (before) - // CHECK-DAG: [[Const:f\d+]] FloatConstant 99.25 - // CHECK-DAG: [[Convert:d\d+]] TypeConversion [[Const]] - // CHECK-DAG: Return [ [[Convert]] ] + // CHECK-DAG: <<Const:f\d+>> FloatConstant 99.25 + // CHECK-DAG: <<Convert:d\d+>> TypeConversion <<Const>> + // CHECK-DAG: Return [ <<Convert>> ] // CHECK-START: double Main.ReturnDouble99P25() constant_folding (after) - // CHECK-DAG: [[Const:d\d+]] DoubleConstant 99.25 - // CHECK-DAG: Return [ [[Const]] ] + // CHECK-DAG: <<Const:d\d+>> DoubleConstant 99.25 + // CHECK-DAG: Return [ <<Const>> ] public static double ReturnDouble99P25() { float imm = 99.25f; diff --git a/test/445-checker-licm/src/Main.java b/test/445-checker-licm/src/Main.java index c7a5f04884..ce2ab9a1a3 100644 --- a/test/445-checker-licm/src/Main.java +++ b/test/445-checker-licm/src/Main.java @@ -88,16 +88,16 @@ public class Main { } // CHECK-START: int Main.arrayLength(int[]) licm (before) - // CHECK-DAG: [[NullCheck:l\d+]] NullCheck loop:{{B\d+}} - // CHECK-DAG: ArrayLength [ [[NullCheck]] ] loop:{{B\d+}} + // CHECK-DAG: <<NullCheck:l\d+>> NullCheck loop:{{B\d+}} + // CHECK-DAG: ArrayLength [ <<NullCheck>> ] loop:{{B\d+}} // CHECK-START: int Main.arrayLength(int[]) licm (after) // CHECK-NOT: NullCheck loop:{{B\d+}} // CHECK-NOT: ArrayLength loop:{{B\d+}} // CHECK-START: int Main.arrayLength(int[]) licm (after) - // CHECK-DAG: [[NullCheck:l\d+]] NullCheck loop:none - // CHECK-DAG: ArrayLength [ [[NullCheck]] ] loop:none + // CHECK-DAG: <<NullCheck:l\d+>> NullCheck loop:none + // CHECK-DAG: ArrayLength [ <<NullCheck>> ] loop:none public static int arrayLength(int[] array) { int result = 0; diff --git a/test/446-checker-inliner2/src/Main.java b/test/446-checker-inliner2/src/Main.java index ecf071e459..5d4ddf8eb0 100644 --- a/test/446-checker-inliner2/src/Main.java +++ b/test/446-checker-inliner2/src/Main.java @@ -17,15 +17,15 @@ public class Main { // CHECK-START: int Main.inlineInstanceCall(Main) inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineInstanceCall(Main) inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: int Main.inlineInstanceCall(Main) inliner (after) - // CHECK-DAG: [[Field:i\d+]] InstanceFieldGet - // CHECK-DAG: Return [ [[Field]] ] + // CHECK-DAG: <<Field:i\d+>> InstanceFieldGet + // CHECK-DAG: Return [ <<Field>> ] public static int inlineInstanceCall(Main m) { return m.foo(); @@ -38,15 +38,15 @@ public class Main { int field = 42; // CHECK-START: int Main.inlineNestedCall() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineNestedCall() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: int Main.inlineNestedCall() inliner (after) - // CHECK-DAG: [[Const38:i\d+]] IntConstant 38 - // CHECK-DAG: Return [ [[Const38]] ] + // CHECK-DAG: <<Const38:i\d+>> IntConstant 38 + // CHECK-DAG: Return [ <<Const38>> ] public static int inlineNestedCall() { return nestedCall(); diff --git a/test/447-checker-inliner3/src/Main.java b/test/447-checker-inliner3/src/Main.java index db4b236b73..34faafa466 100644 --- a/test/447-checker-inliner3/src/Main.java +++ b/test/447-checker-inliner3/src/Main.java @@ -17,8 +17,8 @@ public class Main { // CHECK-START: int Main.inlineIfThenElse() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineIfThenElse() inliner (after) // CHECK-NOT: InvokeStaticOrDirect diff --git a/test/458-checker-instruction-simplification/src/Main.java b/test/458-checker-instruction-simplification/src/Main.java index efb7b83e33..ebad8e5ac6 100644 --- a/test/458-checker-instruction-simplification/src/Main.java +++ b/test/458-checker-instruction-simplification/src/Main.java @@ -51,14 +51,14 @@ public class Main { */ // CHECK-START: long Main.Add0(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[Add:j\d+]] Add [ [[Const0]] [[Arg]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<Add:j\d+>> Add [ <<Const0>> <<Arg>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: long Main.Add0(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.Add0(long) instruction_simplifier (after) // CHECK-NOT: Add @@ -68,14 +68,14 @@ public class Main { } // CHECK-START: int Main.AndAllOnes(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstF:i\d+]] IntConstant -1 - // CHECK-DAG: [[And:i\d+]] And [ [[Arg]] [[ConstF]] ] - // CHECK-DAG: Return [ [[And]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstF:i\d+>> IntConstant -1 + // CHECK-DAG: <<And:i\d+>> And [ <<Arg>> <<ConstF>> ] + // CHECK-DAG: Return [ <<And>> ] // CHECK-START: int Main.AndAllOnes(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.AndAllOnes(int) instruction_simplifier (after) // CHECK-NOT: And @@ -85,14 +85,14 @@ public class Main { } // CHECK-START: long Main.Div1(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const1:j\d+]] LongConstant 1 - // CHECK-DAG: [[Div:j\d+]] Div [ [[Arg]] [[Const1]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const1:j\d+>> LongConstant 1 + // CHECK-DAG: <<Div:j\d+>> Div [ <<Arg>> <<Const1>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: long Main.Div1(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.Div1(long) instruction_simplifier (after) // CHECK-NOT: Div @@ -102,15 +102,15 @@ public class Main { } // CHECK-START: int Main.DivN1(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstN1:i\d+]] IntConstant -1 - // CHECK-DAG: [[Div:i\d+]] Div [ [[Arg]] [[ConstN1]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstN1:i\d+>> IntConstant -1 + // CHECK-DAG: <<Div:i\d+>> Div [ <<Arg>> <<ConstN1>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: int Main.DivN1(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.DivN1(int) instruction_simplifier (after) // CHECK-NOT: Div @@ -120,14 +120,14 @@ public class Main { } // CHECK-START: long Main.Mul1(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const1:j\d+]] LongConstant 1 - // CHECK-DAG: [[Mul:j\d+]] Mul [ [[Arg]] [[Const1]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const1:j\d+>> LongConstant 1 + // CHECK-DAG: <<Mul:j\d+>> Mul [ <<Arg>> <<Const1>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: long Main.Mul1(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.Mul1(long) instruction_simplifier (after) // CHECK-NOT: Mul @@ -137,15 +137,15 @@ public class Main { } // CHECK-START: int Main.MulN1(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstN1:i\d+]] IntConstant -1 - // CHECK-DAG: [[Mul:i\d+]] Mul [ [[Arg]] [[ConstN1]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstN1:i\d+>> IntConstant -1 + // CHECK-DAG: <<Mul:i\d+>> Mul [ <<Arg>> <<ConstN1>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: int Main.MulN1(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.MulN1(int) instruction_simplifier (after) // CHECK-NOT: Mul @@ -155,16 +155,16 @@ public class Main { } // CHECK-START: long Main.MulPowerOfTwo128(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const128:j\d+]] LongConstant 128 - // CHECK-DAG: [[Mul:j\d+]] Mul [ [[Arg]] [[Const128]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const128:j\d+>> LongConstant 128 + // CHECK-DAG: <<Mul:j\d+>> Mul [ <<Arg>> <<Const128>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: long Main.MulPowerOfTwo128(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const7:i\d+]] IntConstant 7 - // CHECK-DAG: [[Shl:j\d+]] Shl [ [[Arg]] [[Const7]] ] - // CHECK-DAG: Return [ [[Shl]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const7:i\d+>> IntConstant 7 + // CHECK-DAG: <<Shl:j\d+>> Shl [ <<Arg>> <<Const7>> ] + // CHECK-DAG: Return [ <<Shl>> ] // CHECK-START: long Main.MulPowerOfTwo128(long) instruction_simplifier (after) // CHECK-NOT: Mul @@ -174,14 +174,14 @@ public class Main { } // CHECK-START: int Main.Or0(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Or:i\d+]] Or [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Or:i\d+>> Or [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.Or0(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.Or0(int) instruction_simplifier (after) // CHECK-NOT: Or @@ -191,13 +191,13 @@ public class Main { } // CHECK-START: long Main.OrSame(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Or:j\d+]] Or [ [[Arg]] [[Arg]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Or:j\d+>> Or [ <<Arg>> <<Arg>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: long Main.OrSame(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.OrSame(long) instruction_simplifier (after) // CHECK-NOT: Or @@ -207,14 +207,14 @@ public class Main { } // CHECK-START: int Main.Shl0(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Shl:i\d+]] Shl [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Shl]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Shl:i\d+>> Shl [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Shl>> ] // CHECK-START: int Main.Shl0(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.Shl0(int) instruction_simplifier (after) // CHECK-NOT: Shl @@ -224,15 +224,15 @@ public class Main { } // CHECK-START: int Main.Shl1(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Shl:i\d+]] Shl [ [[Arg]] [[Const1]] ] - // CHECK-DAG: Return [ [[Shl]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Shl:i\d+>> Shl [ <<Arg>> <<Const1>> ] + // CHECK-DAG: Return [ <<Shl>> ] // CHECK-START: int Main.Shl1(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Add:i\d+]] Add [ [[Arg]] [[Arg]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Add:i\d+>> Add [ <<Arg>> <<Arg>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.Shl1(int) instruction_simplifier (after) // CHECK-NOT: Shl @@ -242,14 +242,14 @@ public class Main { } // CHECK-START: long Main.Shr0(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Shr:j\d+]] Shr [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Shr]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Shr:j\d+>> Shr [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Shr>> ] // CHECK-START: long Main.Shr0(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.Shr0(long) instruction_simplifier (after) // CHECK-NOT: Shr @@ -259,14 +259,14 @@ public class Main { } // CHECK-START: long Main.Sub0(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[Sub:j\d+]] Sub [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: long Main.Sub0(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.Sub0(long) instruction_simplifier (after) // CHECK-NOT: Sub @@ -276,15 +276,15 @@ public class Main { } // CHECK-START: int Main.SubAliasNeg(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Const0]] [[Arg]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Const0>> <<Arg>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.SubAliasNeg(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.SubAliasNeg(int) instruction_simplifier (after) // CHECK-NOT: Sub @@ -294,14 +294,14 @@ public class Main { } // CHECK-START: long Main.UShr0(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[UShr:j\d+]] UShr [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[UShr]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<UShr:j\d+>> UShr [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<UShr>> ] // CHECK-START: long Main.UShr0(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.UShr0(long) instruction_simplifier (after) // CHECK-NOT: UShr @@ -311,14 +311,14 @@ public class Main { } // CHECK-START: int Main.Xor0(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Xor:i\d+]] Xor [ [[Arg]] [[Const0]] ] - // CHECK-DAG: Return [ [[Xor]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Xor:i\d+>> Xor [ <<Arg>> <<Const0>> ] + // CHECK-DAG: Return [ <<Xor>> ] // CHECK-START: int Main.Xor0(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.Xor0(int) instruction_simplifier (after) // CHECK-NOT: Xor @@ -328,15 +328,15 @@ public class Main { } // CHECK-START: int Main.XorAllOnes(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstF:i\d+]] IntConstant -1 - // CHECK-DAG: [[Xor:i\d+]] Xor [ [[Arg]] [[ConstF]] ] - // CHECK-DAG: Return [ [[Xor]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstF:i\d+>> IntConstant -1 + // CHECK-DAG: <<Xor:i\d+>> Xor [ <<Arg>> <<ConstF>> ] + // CHECK-DAG: Return [ <<Xor>> ] // CHECK-START: int Main.XorAllOnes(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Not:i\d+]] Not [ [[Arg]] ] - // CHECK-DAG: Return [ [[Not]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Not:i\d+>> Not [ <<Arg>> ] + // CHECK-DAG: Return [ <<Not>> ] // CHECK-START: int Main.XorAllOnes(int) instruction_simplifier (after) // CHECK-NOT: Xor @@ -353,20 +353,20 @@ public class Main { */ // CHECK-START: int Main.AddNegs1(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.AddNegs1(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue // CHECK-NOT: Neg - // CHECK-DAG: [[Add:i\d+]] Add [ [[Arg1]] [[Arg2]] ] - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Add]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Arg1>> <<Arg2>> ] + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Add>> ] + // CHECK-DAG: Return [ <<Neg>> ] public static int AddNegs1(int arg1, int arg2) { return -arg1 + -arg2; @@ -384,34 +384,34 @@ public class Main { */ // CHECK-START: int Main.AddNegs2(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add1:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: [[Add2:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Add1]] [[Add2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add1:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: <<Add2:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Add1>> <<Add2>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.AddNegs2(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add1:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: [[Add2:i\d+]] Add [ [[Neg1]] [[Neg2]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add1:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: <<Add2:i\d+>> Add [ <<Neg1>> <<Neg2>> ] // CHECK-NOT: Neg - // CHECK-DAG: [[Or:i\d+]] Or [ [[Add1]] [[Add2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Add1>> <<Add2>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.AddNegs2(int, int) GVN (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Add]] [[Add]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Add>> <<Add>> ] + // CHECK-DAG: Return [ <<Or>> ] public static int AddNegs2(int arg1, int arg2) { int temp1 = -arg1; @@ -429,26 +429,26 @@ public class Main { // CHECK-START: long Main.AddNegs3(long, long) instruction_simplifier (before) // -------------- Arguments and initial negation operations. - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg1:j\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:j\d+]] Neg [ [[Arg2]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg1:j\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:j\d+>> Neg [ <<Arg2>> ] // CHECK: Goto // -------------- Loop // CHECK: SuspendCheck - // CHECK: [[Add:j\d+]] Add [ [[Neg1]] [[Neg2]] ] + // CHECK: <<Add:j\d+>> Add [ <<Neg1>> <<Neg2>> ] // CHECK: Goto // CHECK-START: long Main.AddNegs3(long, long) instruction_simplifier (after) // -------------- Arguments and initial negation operations. - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg1:j\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Neg2:j\d+]] Neg [ [[Arg2]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg1:j\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Neg2:j\d+>> Neg [ <<Arg2>> ] // CHECK: Goto // -------------- Loop // CHECK: SuspendCheck - // CHECK: [[Add:j\d+]] Add [ [[Neg1]] [[Neg2]] ] + // CHECK: <<Add:j\d+>> Add [ <<Neg1>> <<Neg2>> ] // CHECK-NOT: Neg // CHECK: Goto @@ -469,17 +469,17 @@ public class Main { */ // CHECK-START: long Main.AddNeg1(long, long) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Add:j\d+]] Add [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Add:j\d+>> Add [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: long Main.AddNeg1(long, long) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Sub:j\d+]] Sub [ [[Arg2]] [[Arg1]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Arg2>> <<Arg1>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: long Main.AddNeg1(long, long) instruction_simplifier (after) // CHECK-NOT: Neg @@ -499,22 +499,22 @@ public class Main { */ // CHECK-START: long Main.AddNeg2(long, long) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add1:j\d+]] Add [ [[Arg1]] [[Neg]] ] - // CHECK-DAG: [[Add2:j\d+]] Add [ [[Arg1]] [[Neg]] ] - // CHECK-DAG: [[Res:j\d+]] Or [ [[Add1]] [[Add2]] ] - // CHECK-DAG: Return [ [[Res]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add1:j\d+>> Add [ <<Arg1>> <<Neg>> ] + // CHECK-DAG: <<Add2:j\d+>> Add [ <<Arg1>> <<Neg>> ] + // CHECK-DAG: <<Res:j\d+>> Or [ <<Add1>> <<Add2>> ] + // CHECK-DAG: Return [ <<Res>> ] // CHECK-START: long Main.AddNeg2(long, long) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg2]] ] - // CHECK-DAG: [[Add1:j\d+]] Add [ [[Arg1]] [[Neg]] ] - // CHECK-DAG: [[Add2:j\d+]] Add [ [[Arg1]] [[Neg]] ] - // CHECK-DAG: [[Res:j\d+]] Or [ [[Add1]] [[Add2]] ] - // CHECK-DAG: Return [ [[Res]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg2>> ] + // CHECK-DAG: <<Add1:j\d+>> Add [ <<Arg1>> <<Neg>> ] + // CHECK-DAG: <<Add2:j\d+>> Add [ <<Arg1>> <<Neg>> ] + // CHECK-DAG: <<Res:j\d+>> Or [ <<Add1>> <<Add2>> ] + // CHECK-DAG: Return [ <<Res>> ] // CHECK-START: long Main.AddNeg2(long, long) instruction_simplifier (after) // CHECK-NOT: Sub @@ -530,14 +530,14 @@ public class Main { */ // CHECK-START: long Main.NegNeg1(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Neg1:j\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: [[Neg2:j\d+]] Neg [ [[Neg1]] ] - // CHECK-DAG: Return [ [[Neg2]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Neg1:j\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: <<Neg2:j\d+>> Neg [ <<Neg1>> ] + // CHECK-DAG: Return [ <<Neg2>> ] // CHECK-START: long Main.NegNeg1(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.NegNeg1(long) instruction_simplifier (after) // CHECK-NOT: Neg @@ -554,26 +554,26 @@ public class Main { */ // CHECK-START: int Main.NegNeg2(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Neg1]] ] - // CHECK-DAG: [[Add:i\d+]] Add [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Neg1>> ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.NegNeg2(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Arg]] [[Arg]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Arg>> <<Arg>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.NegNeg2(int) instruction_simplifier (after) // CHECK-NOT: Neg // CHECK-NOT: Add // CHECK-START: int Main.NegNeg2(int) constant_folding_after_inlining (after) - // CHECK: [[Const0:i\d+]] IntConstant 0 + // CHECK: <<Const0:i\d+>> IntConstant 0 // CHECK-NOT: Neg // CHECK-NOT: Add - // CHECK: Return [ [[Const0]] ] + // CHECK: Return [ <<Const0>> ] public static int NegNeg2(int arg) { int temp = -arg; @@ -588,15 +588,15 @@ public class Main { */ // CHECK-START: long Main.NegNeg3(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[Const0:j\d+]] LongConstant 0 - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg]] ] - // CHECK-DAG: [[Sub:j\d+]] Sub [ [[Const0]] [[Neg]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<Const0:j\d+>> LongConstant 0 + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg>> ] + // CHECK-DAG: <<Sub:j\d+>> Sub [ <<Const0>> <<Neg>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: long Main.NegNeg3(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.NegNeg3(long) instruction_simplifier (after) // CHECK-NOT: Neg @@ -613,17 +613,17 @@ public class Main { */ // CHECK-START: int Main.NegSub1(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Arg1]] [[Arg2]] ] - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Sub]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Arg1>> <<Arg2>> ] + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Sub>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.NegSub1(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Arg2]] [[Arg1]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Arg2>> <<Arg1>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.NegSub1(int, int) instruction_simplifier (after) // CHECK-NOT: Neg @@ -643,22 +643,22 @@ public class Main { */ // CHECK-START: int Main.NegSub2(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Arg1]] [[Arg2]] ] - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Sub]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Sub]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Arg1>> <<Arg2>> ] + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Sub>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Sub>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.NegSub2(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Arg1]] [[Arg2]] ] - // CHECK-DAG: [[Neg1:i\d+]] Neg [ [[Sub]] ] - // CHECK-DAG: [[Neg2:i\d+]] Neg [ [[Sub]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Neg1]] [[Neg2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Arg1>> <<Arg2>> ] + // CHECK-DAG: <<Neg1:i\d+>> Neg [ <<Sub>> ] + // CHECK-DAG: <<Neg2:i\d+>> Neg [ <<Sub>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Neg1>> <<Neg2>> ] + // CHECK-DAG: Return [ <<Or>> ] public static int NegSub2(int arg1, int arg2) { int temp = arg1 - arg2; @@ -671,15 +671,15 @@ public class Main { */ // CHECK-START: long Main.NotNot1(long) instruction_simplifier (before) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: [[ConstF1:j\d+]] LongConstant -1 - // CHECK-DAG: [[Xor1:j\d+]] Xor [ [[Arg]] [[ConstF1]] ] - // CHECK-DAG: [[Xor2:j\d+]] Xor [ [[Xor1]] [[ConstF1]] ] - // CHECK-DAG: Return [ [[Xor2]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: <<ConstF1:j\d+>> LongConstant -1 + // CHECK-DAG: <<Xor1:j\d+>> Xor [ <<Arg>> <<ConstF1>> ] + // CHECK-DAG: <<Xor2:j\d+>> Xor [ <<Xor1>> <<ConstF1>> ] + // CHECK-DAG: Return [ <<Xor2>> ] // CHECK-START: long Main.NotNot1(long) instruction_simplifier (after) - // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:j\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: long Main.NotNot1(long) instruction_simplifier (after) // CHECK-NOT: Xor @@ -689,18 +689,18 @@ public class Main { } // CHECK-START: int Main.NotNot2(int) instruction_simplifier (before) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[ConstF1:i\d+]] IntConstant -1 - // CHECK-DAG: [[Xor1:i\d+]] Xor [ [[Arg]] [[ConstF1]] ] - // CHECK-DAG: [[Xor2:i\d+]] Xor [ [[Xor1]] [[ConstF1]] ] - // CHECK-DAG: [[Add:i\d+]] Add [ [[Xor1]] [[Xor2]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<ConstF1:i\d+>> IntConstant -1 + // CHECK-DAG: <<Xor1:i\d+>> Xor [ <<Arg>> <<ConstF1>> ] + // CHECK-DAG: <<Xor2:i\d+>> Xor [ <<Xor1>> <<ConstF1>> ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Xor1>> <<Xor2>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.NotNot2(int) instruction_simplifier (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: [[Not:i\d+]] Not [ [[Arg]] ] - // CHECK-DAG: [[Add:i\d+]] Add [ [[Not]] [[Arg]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: <<Not:i\d+>> Not [ <<Arg>> ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<Not>> <<Arg>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.NotNot2(int) instruction_simplifier (after) // CHECK-NOT: Xor @@ -716,18 +716,18 @@ public class Main { */ // CHECK-START: int Main.SubNeg1(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.SubNeg1(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Add:i\d+]] Add [ [[Arg1]] [[Arg2]] ] - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Add]] ] - // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Add:i\d+>> Add [ <<Arg1>> <<Arg2>> ] + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Add>> ] + // CHECK-DAG: Return [ <<Neg>> ] // CHECK-START: int Main.SubNeg1(int, int) instruction_simplifier (after) // CHECK-NOT: Sub @@ -747,22 +747,22 @@ public class Main { */ // CHECK-START: int Main.SubNeg2(int, int) instruction_simplifier (before) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Sub1:i\d+]] Sub [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: [[Sub2:i\d+]] Sub [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Sub1]] [[Sub2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Sub1:i\d+>> Sub [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: <<Sub2:i\d+>> Sub [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Sub1>> <<Sub2>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.SubNeg2(int, int) instruction_simplifier (after) - // CHECK-DAG: [[Arg1:i\d+]] ParameterValue - // CHECK-DAG: [[Arg2:i\d+]] ParameterValue - // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg1]] ] - // CHECK-DAG: [[Sub1:i\d+]] Sub [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: [[Sub2:i\d+]] Sub [ [[Neg]] [[Arg2]] ] - // CHECK-DAG: [[Or:i\d+]] Or [ [[Sub1]] [[Sub2]] ] - // CHECK-DAG: Return [ [[Or]] ] + // CHECK-DAG: <<Arg1:i\d+>> ParameterValue + // CHECK-DAG: <<Arg2:i\d+>> ParameterValue + // CHECK-DAG: <<Neg:i\d+>> Neg [ <<Arg1>> ] + // CHECK-DAG: <<Sub1:i\d+>> Sub [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: <<Sub2:i\d+>> Sub [ <<Neg>> <<Arg2>> ] + // CHECK-DAG: <<Or:i\d+>> Or [ <<Sub1>> <<Sub2>> ] + // CHECK-DAG: Return [ <<Or>> ] // CHECK-START: int Main.SubNeg2(int, int) instruction_simplifier (after) // CHECK-NOT: Add @@ -781,24 +781,24 @@ public class Main { // CHECK-START: long Main.SubNeg3(long, long) instruction_simplifier (before) // -------------- Arguments and initial negation operation. - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg1]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg1>> ] // CHECK: Goto // -------------- Loop // CHECK: SuspendCheck - // CHECK: [[Sub:j\d+]] Sub [ [[Neg]] [[Arg2]] ] + // CHECK: <<Sub:j\d+>> Sub [ <<Neg>> <<Arg2>> ] // CHECK: Goto // CHECK-START: long Main.SubNeg3(long, long) instruction_simplifier (after) // -------------- Arguments and initial negation operation. - // CHECK-DAG: [[Arg1:j\d+]] ParameterValue - // CHECK-DAG: [[Arg2:j\d+]] ParameterValue - // CHECK-DAG: [[Neg:j\d+]] Neg [ [[Arg1]] ] + // CHECK-DAG: <<Arg1:j\d+>> ParameterValue + // CHECK-DAG: <<Arg2:j\d+>> ParameterValue + // CHECK-DAG: <<Neg:j\d+>> Neg [ <<Arg1>> ] // CHECK-DAG: Goto // -------------- Loop // CHECK: SuspendCheck - // CHECK: [[Sub:j\d+]] Sub [ [[Neg]] [[Arg2]] ] + // CHECK: <<Sub:j\d+>> Sub [ <<Neg>> <<Arg2>> ] // CHECK-NOT: Neg // CHECK: Goto @@ -812,116 +812,116 @@ public class Main { } // CHECK-START: int Main.EqualTrueRhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] Equal [ [[Arg]] [[Const1]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> Equal [ <<Arg>> <<Const1>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.EqualTrueRhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: If [ [[Arg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: If [ <<Arg>> ] public static int EqualTrueRhs(boolean arg) { return (arg != true) ? 3 : 5; } // CHECK-START: int Main.EqualTrueLhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] Equal [ [[Const1]] [[Arg]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> Equal [ <<Const1>> <<Arg>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.EqualTrueLhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: If [ [[Arg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: If [ <<Arg>> ] public static int EqualTrueLhs(boolean arg) { return (true != arg) ? 3 : 5; } // CHECK-START: int Main.EqualFalseRhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Cond:z\d+]] Equal [ [[Arg]] [[Const0]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Cond:z\d+>> Equal [ <<Arg>> <<Const0>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.EqualFalseRhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[NotArg:z\d+]] BooleanNot [ [[Arg]] ] - // CHECK-DAG: If [ [[NotArg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<NotArg:z\d+>> BooleanNot [ <<Arg>> ] + // CHECK-DAG: If [ <<NotArg>> ] public static int EqualFalseRhs(boolean arg) { return (arg != false) ? 3 : 5; } // CHECK-START: int Main.EqualFalseLhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Cond:z\d+]] Equal [ [[Const0]] [[Arg]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Cond:z\d+>> Equal [ <<Const0>> <<Arg>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.EqualFalseLhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[NotArg:z\d+]] BooleanNot [ [[Arg]] ] - // CHECK-DAG: If [ [[NotArg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<NotArg:z\d+>> BooleanNot [ <<Arg>> ] + // CHECK-DAG: If [ <<NotArg>> ] public static int EqualFalseLhs(boolean arg) { return (false != arg) ? 3 : 5; } // CHECK-START: int Main.NotEqualTrueRhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] NotEqual [ [[Arg]] [[Const1]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> NotEqual [ <<Arg>> <<Const1>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.NotEqualTrueRhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[NotArg:z\d+]] BooleanNot [ [[Arg]] ] - // CHECK-DAG: If [ [[NotArg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<NotArg:z\d+>> BooleanNot [ <<Arg>> ] + // CHECK-DAG: If [ <<NotArg>> ] public static int NotEqualTrueRhs(boolean arg) { return (arg == true) ? 3 : 5; } // CHECK-START: int Main.NotEqualTrueLhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] NotEqual [ [[Const1]] [[Arg]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> NotEqual [ <<Const1>> <<Arg>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.NotEqualTrueLhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[NotArg:z\d+]] BooleanNot [ [[Arg]] ] - // CHECK-DAG: If [ [[NotArg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<NotArg:z\d+>> BooleanNot [ <<Arg>> ] + // CHECK-DAG: If [ <<NotArg>> ] public static int NotEqualTrueLhs(boolean arg) { return (true == arg) ? 3 : 5; } // CHECK-START: int Main.NotEqualFalseRhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Cond:z\d+]] NotEqual [ [[Arg]] [[Const0]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Cond:z\d+>> NotEqual [ <<Arg>> <<Const0>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.NotEqualFalseRhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: If [ [[Arg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: If [ <<Arg>> ] public static int NotEqualFalseRhs(boolean arg) { return (arg == false) ? 3 : 5; } // CHECK-START: int Main.NotEqualFalseLhs(boolean) instruction_simplifier (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Cond:z\d+]] NotEqual [ [[Const0]] [[Arg]] ] - // CHECK-DAG: If [ [[Cond]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Cond:z\d+>> NotEqual [ <<Const0>> <<Arg>> ] + // CHECK-DAG: If [ <<Cond>> ] // CHECK-START: int Main.NotEqualFalseLhs(boolean) instruction_simplifier (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: If [ [[Arg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: If [ <<Arg>> ] public static int NotEqualFalseLhs(boolean arg) { return (false == arg) ? 3 : 5; @@ -934,15 +934,15 @@ public class Main { */ // CHECK-START: boolean Main.NotNotBool(boolean) instruction_simplifier_after_types (before) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: [[NotArg:z\d+]] BooleanNot [ [[Arg]] ] - // CHECK-DAG: [[NotNotArg:z\d+]] BooleanNot [ [[NotArg]] ] - // CHECK-DAG: Return [ [[NotNotArg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: <<NotArg:z\d+>> BooleanNot [ <<Arg>> ] + // CHECK-DAG: <<NotNotArg:z\d+>> BooleanNot [ <<NotArg>> ] + // CHECK-DAG: Return [ <<NotNotArg>> ] // CHECK-START: boolean Main.NotNotBool(boolean) instruction_simplifier_after_types (after) - // CHECK-DAG: [[Arg:z\d+]] ParameterValue - // CHECK-DAG: BooleanNot [ [[Arg]] ] - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:z\d+>> ParameterValue + // CHECK-DAG: BooleanNot [ <<Arg>> ] + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: boolean Main.NotNotBool(boolean) instruction_simplifier_after_types (after) // CHECK: BooleanNot @@ -957,16 +957,16 @@ public class Main { } // CHECK-START: float Main.Div2(float) instruction_simplifier (before) - // CHECK-DAG: [[Arg:f\d+]] ParameterValue - // CHECK-DAG: [[Const2:f\d+]] FloatConstant 2 - // CHECK-DAG: [[Div:f\d+]] Div [ [[Arg]] [[Const2]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:f\d+>> ParameterValue + // CHECK-DAG: <<Const2:f\d+>> FloatConstant 2 + // CHECK-DAG: <<Div:f\d+>> Div [ <<Arg>> <<Const2>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: float Main.Div2(float) instruction_simplifier (after) - // CHECK-DAG: [[Arg:f\d+]] ParameterValue - // CHECK-DAG: [[ConstP5:f\d+]] FloatConstant 0.5 - // CHECK-DAG: [[Mul:f\d+]] Mul [ [[Arg]] [[ConstP5]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:f\d+>> ParameterValue + // CHECK-DAG: <<ConstP5:f\d+>> FloatConstant 0.5 + // CHECK-DAG: <<Mul:f\d+>> Mul [ <<Arg>> <<ConstP5>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: float Main.Div2(float) instruction_simplifier (after) // CHECK-NOT: Div @@ -976,16 +976,16 @@ public class Main { } // CHECK-START: double Main.Div2(double) instruction_simplifier (before) - // CHECK-DAG: [[Arg:d\d+]] ParameterValue - // CHECK-DAG: [[Const2:d\d+]] DoubleConstant 2 - // CHECK-DAG: [[Div:d\d+]] Div [ [[Arg]] [[Const2]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:d\d+>> ParameterValue + // CHECK-DAG: <<Const2:d\d+>> DoubleConstant 2 + // CHECK-DAG: <<Div:d\d+>> Div [ <<Arg>> <<Const2>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: double Main.Div2(double) instruction_simplifier (after) - // CHECK-DAG: [[Arg:d\d+]] ParameterValue - // CHECK-DAG: [[ConstP5:d\d+]] DoubleConstant 0.5 - // CHECK-DAG: [[Mul:d\d+]] Mul [ [[Arg]] [[ConstP5]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:d\d+>> ParameterValue + // CHECK-DAG: <<ConstP5:d\d+>> DoubleConstant 0.5 + // CHECK-DAG: <<Mul:d\d+>> Mul [ <<Arg>> <<ConstP5>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: double Main.Div2(double) instruction_simplifier (after) // CHECK-NOT: Div @@ -994,16 +994,16 @@ public class Main { } // CHECK-START: float Main.DivMP25(float) instruction_simplifier (before) - // CHECK-DAG: [[Arg:f\d+]] ParameterValue - // CHECK-DAG: [[ConstMP25:f\d+]] FloatConstant -0.25 - // CHECK-DAG: [[Div:f\d+]] Div [ [[Arg]] [[ConstMP25]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:f\d+>> ParameterValue + // CHECK-DAG: <<ConstMP25:f\d+>> FloatConstant -0.25 + // CHECK-DAG: <<Div:f\d+>> Div [ <<Arg>> <<ConstMP25>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: float Main.DivMP25(float) instruction_simplifier (after) - // CHECK-DAG: [[Arg:f\d+]] ParameterValue - // CHECK-DAG: [[ConstM4:f\d+]] FloatConstant -4 - // CHECK-DAG: [[Mul:f\d+]] Mul [ [[Arg]] [[ConstM4]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:f\d+>> ParameterValue + // CHECK-DAG: <<ConstM4:f\d+>> FloatConstant -4 + // CHECK-DAG: <<Mul:f\d+>> Mul [ <<Arg>> <<ConstM4>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: float Main.DivMP25(float) instruction_simplifier (after) // CHECK-NOT: Div @@ -1013,16 +1013,16 @@ public class Main { } // CHECK-START: double Main.DivMP25(double) instruction_simplifier (before) - // CHECK-DAG: [[Arg:d\d+]] ParameterValue - // CHECK-DAG: [[ConstMP25:d\d+]] DoubleConstant -0.25 - // CHECK-DAG: [[Div:d\d+]] Div [ [[Arg]] [[ConstMP25]] ] - // CHECK-DAG: Return [ [[Div]] ] + // CHECK-DAG: <<Arg:d\d+>> ParameterValue + // CHECK-DAG: <<ConstMP25:d\d+>> DoubleConstant -0.25 + // CHECK-DAG: <<Div:d\d+>> Div [ <<Arg>> <<ConstMP25>> ] + // CHECK-DAG: Return [ <<Div>> ] // CHECK-START: double Main.DivMP25(double) instruction_simplifier (after) - // CHECK-DAG: [[Arg:d\d+]] ParameterValue - // CHECK-DAG: [[ConstM4:d\d+]] DoubleConstant -4 - // CHECK-DAG: [[Mul:d\d+]] Mul [ [[Arg]] [[ConstM4]] ] - // CHECK-DAG: Return [ [[Mul]] ] + // CHECK-DAG: <<Arg:d\d+>> ParameterValue + // CHECK-DAG: <<ConstM4:d\d+>> DoubleConstant -4 + // CHECK-DAG: <<Mul:d\d+>> Mul [ <<Arg>> <<ConstM4>> ] + // CHECK-DAG: Return [ <<Mul>> ] // CHECK-START: double Main.DivMP25(double) instruction_simplifier (after) // CHECK-NOT: Div diff --git a/test/462-checker-inlining-across-dex-files/src/Main.java b/test/462-checker-inlining-across-dex-files/src/Main.java index d5563b85b3..5ebf3d1eb4 100644 --- a/test/462-checker-inlining-across-dex-files/src/Main.java +++ b/test/462-checker-inlining-across-dex-files/src/Main.java @@ -22,7 +22,7 @@ class AAA { public class Main { // CHECK-START: void Main.inlineEmptyMethod() inliner (before) - // CHECK-DAG: [[Invoke:v\d+]] InvokeStaticOrDirect + // CHECK-DAG: <<Invoke:v\d+>> InvokeStaticOrDirect // CHECK-DAG: ReturnVoid // CHECK-START: void Main.inlineEmptyMethod() inliner (after) @@ -33,120 +33,120 @@ public class Main { } // CHECK-START: int Main.inlineReturnIntMethod() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineReturnIntMethod() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: int Main.inlineReturnIntMethod() inliner (after) - // CHECK-DAG: [[Const38:i\d+]] IntConstant 38 - // CHECK-DAG: Return [ [[Const38]] ] + // CHECK-DAG: <<Const38:i\d+>> IntConstant 38 + // CHECK-DAG: Return [ <<Const38>> ] public static int inlineReturnIntMethod() { return OtherDex.returnIntMethod(); } // CHECK-START: int Main.dontInlineOtherDexStatic() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.dontInlineOtherDexStatic() inliner (after) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] public static int dontInlineOtherDexStatic() { return OtherDex.returnOtherDexStatic(); } // CHECK-START: int Main.inlineMainStatic() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineMainStatic() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: int Main.inlineMainStatic() inliner (after) - // CHECK-DAG: [[Static:i\d+]] StaticFieldGet - // CHECK-DAG: Return [ [[Static]] ] + // CHECK-DAG: <<Static:i\d+>> StaticFieldGet + // CHECK-DAG: Return [ <<Static>> ] public static int inlineMainStatic() { return OtherDex.returnMainStatic(); } // CHECK-START: int Main.dontInlineRecursiveCall() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.dontInlineRecursiveCall() inliner (after) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] public static int dontInlineRecursiveCall() { return OtherDex.recursiveCall(); } // CHECK-START: java.lang.String Main.dontInlineReturnString() inliner (before) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: java.lang.String Main.dontInlineReturnString() inliner (after) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] public static String dontInlineReturnString() { return OtherDex.returnString(); } // CHECK-START: java.lang.Class Main.dontInlineOtherDexClass() inliner (before) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: java.lang.Class Main.dontInlineOtherDexClass() inliner (after) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] public static Class dontInlineOtherDexClass() { return OtherDex.returnOtherDexClass(); } // CHECK-START: java.lang.Class Main.inlineMainClass() inliner (before) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: java.lang.Class Main.inlineMainClass() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: java.lang.Class Main.inlineMainClass() inliner (after) - // CHECK-DAG: [[Class:l\d+]] LoadClass - // CHECK-DAG: Return [ [[Class]] ] + // CHECK-DAG: <<Class:l\d+>> LoadClass + // CHECK-DAG: Return [ <<Class>> ] public static Class inlineMainClass() { return OtherDex.returnMainClass(); } // CHECK-START: java.lang.Class Main.dontInlineOtherDexClassStaticCall() inliner (before) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: java.lang.Class Main.dontInlineOtherDexClassStaticCall() inliner (after) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] public static Class dontInlineOtherDexClassStaticCall() { return OtherDex.returnOtherDexClassStaticCall(); } // CHECK-START: java.lang.Class Main.inlineOtherDexCallingMain() inliner (before) - // CHECK-DAG: [[Invoke:l\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:l\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: java.lang.Class Main.inlineOtherDexCallingMain() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: java.lang.Class Main.inlineOtherDexCallingMain() inliner (after) - // CHECK-DAG: [[Class:l\d+]] LoadClass - // CHECK-DAG: Return [ [[Class]] ] + // CHECK-DAG: <<Class:l\d+>> LoadClass + // CHECK-DAG: Return [ <<Class>> ] public static Class inlineOtherDexCallingMain() { return OtherDex.returnOtherDexCallingMain(); diff --git a/test/463-checker-boolean-simplifier/src/Main.java b/test/463-checker-boolean-simplifier/src/Main.java index 4346103c19..3f3110fff4 100644 --- a/test/463-checker-boolean-simplifier/src/Main.java +++ b/test/463-checker-boolean-simplifier/src/Main.java @@ -38,12 +38,12 @@ public class Main { */ // CHECK-START: boolean Main.BooleanNot(boolean) boolean_simplifier (before) - // CHECK-DAG: [[Param:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: If [ [[Param]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const1]] [[Const0]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Param:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: If [ <<Param>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const1>> <<Const0>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: boolean Main.BooleanNot(boolean) boolean_simplifier (before) // CHECK: Goto @@ -52,10 +52,10 @@ public class Main { // CHECK-NOT: Goto // CHECK-START: boolean Main.BooleanNot(boolean) boolean_simplifier (after) - // CHECK-DAG: [[Param:z\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[NotParam:z\d+]] BooleanNot [ [[Param]] ] - // CHECK-DAG: Return [ [[NotParam]] ] + // CHECK-DAG: <<Param:z\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<NotParam:z\d+>> BooleanNot [ <<Param>> ] + // CHECK-DAG: Return [ <<NotParam>> ] // CHECK-START: boolean Main.BooleanNot(boolean) boolean_simplifier (after) // CHECK-NOT: If @@ -75,22 +75,22 @@ public class Main { */ // CHECK-START: boolean Main.GreaterThan(int, int) boolean_simplifier (before) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] GreaterThan [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: If [ [[Cond]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const0]] [[Const1]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> GreaterThan [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: If [ <<Cond>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const0>> <<Const1>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: boolean Main.GreaterThan(int, int) boolean_simplifier (after) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] GreaterThan [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: Return [ [[Cond]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> GreaterThan [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: Return [ <<Cond>> ] public static boolean GreaterThan(int x, int y) { return (x <= y) ? false : true; @@ -102,22 +102,22 @@ public class Main { */ // CHECK-START: boolean Main.LessThan(int, int) boolean_simplifier (before) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] GreaterThanOrEqual [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: If [ [[Cond]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const1]] [[Const0]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> GreaterThanOrEqual [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: If [ <<Cond>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const1>> <<Const0>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: boolean Main.LessThan(int, int) boolean_simplifier (after) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[Cond:z\d+]] LessThan [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: Return [ [[Cond]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<Cond:z\d+>> LessThan [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: Return [ <<Cond>> ] // CHECK-START: boolean Main.LessThan(int, int) boolean_simplifier (after) // CHECK-NOT: GreaterThanOrEqual @@ -132,51 +132,51 @@ public class Main { */ // CHECK-START: boolean Main.ValuesOrdered(int, int, int) boolean_simplifier (before) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[ParamZ:i\d+]] ParameterValue - // CHECK-DAG: [[Const0:i\d+]] IntConstant 0 - // CHECK-DAG: [[Const1:i\d+]] IntConstant 1 - // CHECK-DAG: [[CondXY:z\d+]] GreaterThan [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: If [ [[CondXY]] ] - // CHECK-DAG: [[CondYZ:z\d+]] GreaterThan [ [[ParamY]] [[ParamZ]] ] - // CHECK-DAG: If [ [[CondYZ]] ] - // CHECK-DAG: [[CondXYZ:z\d+]] NotEqual [ [[PhiXY:i\d+]] [[PhiYZ:i\d+]] ] - // CHECK-DAG: If [ [[CondXYZ]] ] - // CHECK-DAG: Return [ [[PhiXYZ:i\d+]] ] - // CHECK-DAG: [[PhiXY]] Phi [ [[Const1]] [[Const0]] ] - // CHECK-DAG: [[PhiYZ]] Phi [ [[Const1]] [[Const0]] ] - // CHECK-DAG: [[PhiXYZ]] Phi [ [[Const1]] [[Const0]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<ParamZ:i\d+>> ParameterValue + // CHECK-DAG: <<Const0:i\d+>> IntConstant 0 + // CHECK-DAG: <<Const1:i\d+>> IntConstant 1 + // CHECK-DAG: <<CondXY:z\d+>> GreaterThan [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: If [ <<CondXY>> ] + // CHECK-DAG: <<CondYZ:z\d+>> GreaterThan [ <<ParamY>> <<ParamZ>> ] + // CHECK-DAG: If [ <<CondYZ>> ] + // CHECK-DAG: <<CondXYZ:z\d+>> NotEqual [ <<PhiXY:i\d+>> <<PhiYZ:i\d+>> ] + // CHECK-DAG: If [ <<CondXYZ>> ] + // CHECK-DAG: Return [ <<PhiXYZ:i\d+>> ] + // CHECK-DAG: <<PhiXY>> Phi [ <<Const1>> <<Const0>> ] + // CHECK-DAG: <<PhiYZ>> Phi [ <<Const1>> <<Const0>> ] + // CHECK-DAG: <<PhiXYZ>> Phi [ <<Const1>> <<Const0>> ] // CHECK-START: boolean Main.ValuesOrdered(int, int, int) boolean_simplifier (after) - // CHECK-DAG: [[ParamX:i\d+]] ParameterValue - // CHECK-DAG: [[ParamY:i\d+]] ParameterValue - // CHECK-DAG: [[ParamZ:i\d+]] ParameterValue - // CHECK-DAG: [[CmpXY:z\d+]] LessThanOrEqual [ [[ParamX]] [[ParamY]] ] - // CHECK-DAG: [[CmpYZ:z\d+]] LessThanOrEqual [ [[ParamY]] [[ParamZ]] ] - // CHECK-DAG: [[CmpXYZ:z\d+]] Equal [ [[CmpXY]] [[CmpYZ]] ] - // CHECK-DAG: Return [ [[CmpXYZ]] ] + // CHECK-DAG: <<ParamX:i\d+>> ParameterValue + // CHECK-DAG: <<ParamY:i\d+>> ParameterValue + // CHECK-DAG: <<ParamZ:i\d+>> ParameterValue + // CHECK-DAG: <<CmpXY:z\d+>> LessThanOrEqual [ <<ParamX>> <<ParamY>> ] + // CHECK-DAG: <<CmpYZ:z\d+>> LessThanOrEqual [ <<ParamY>> <<ParamZ>> ] + // CHECK-DAG: <<CmpXYZ:z\d+>> Equal [ <<CmpXY>> <<CmpYZ>> ] + // CHECK-DAG: Return [ <<CmpXYZ>> ] public static boolean ValuesOrdered(int x, int y, int z) { return (x <= y) == (y <= z); } // CHECK-START: int Main.NegatedCondition(boolean) boolean_simplifier (before) - // CHECK-DAG: [[Param:z\d+]] ParameterValue - // CHECK-DAG: [[Const42:i\d+]] IntConstant 42 - // CHECK-DAG: [[Const43:i\d+]] IntConstant 43 - // CHECK-DAG: [[NotParam:z\d+]] BooleanNot [ [[Param]] ] - // CHECK-DAG: If [ [[NotParam]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const42]] [[Const43]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Param:z\d+>> ParameterValue + // CHECK-DAG: <<Const42:i\d+>> IntConstant 42 + // CHECK-DAG: <<Const43:i\d+>> IntConstant 43 + // CHECK-DAG: <<NotParam:z\d+>> BooleanNot [ <<Param>> ] + // CHECK-DAG: If [ <<NotParam>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const42>> <<Const43>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: int Main.NegatedCondition(boolean) boolean_simplifier (after) - // CHECK-DAG: [[Param:z\d+]] ParameterValue - // CHECK-DAG: [[Const42:i\d+]] IntConstant 42 - // CHECK-DAG: [[Const43:i\d+]] IntConstant 43 - // CHECK-DAG: If [ [[Param]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const42]] [[Const43]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Param:z\d+>> ParameterValue + // CHECK-DAG: <<Const42:i\d+>> IntConstant 42 + // CHECK-DAG: <<Const43:i\d+>> IntConstant 43 + // CHECK-DAG: If [ <<Param>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const42>> <<Const43>> ] + // CHECK-DAG: Return [ <<Phi>> ] // Note: The fact that branches are swapped is verified by running the test. diff --git a/test/464-checker-inline-sharpen-calls/src/Main.java b/test/464-checker-inline-sharpen-calls/src/Main.java index 1b25b4257f..626823ea3b 100644 --- a/test/464-checker-inline-sharpen-calls/src/Main.java +++ b/test/464-checker-inline-sharpen-calls/src/Main.java @@ -20,7 +20,7 @@ public final class Main { } // CHECK-START: void Main.inlineSharpenInvokeVirtual(Main) inliner (before) - // CHECK-DAG: [[Invoke:v\d+]] InvokeStaticOrDirect + // CHECK-DAG: <<Invoke:v\d+>> InvokeStaticOrDirect // CHECK-DAG: ReturnVoid // CHECK-START: void Main.inlineSharpenInvokeVirtual(Main) inliner (after) @@ -31,15 +31,15 @@ public final class Main { } // CHECK-START: int Main.inlineSharpenStringInvoke() inliner (before) - // CHECK-DAG: [[Invoke:i\d+]] InvokeStaticOrDirect - // CHECK-DAG: Return [ [[Invoke]] ] + // CHECK-DAG: <<Invoke:i\d+>> InvokeStaticOrDirect + // CHECK-DAG: Return [ <<Invoke>> ] // CHECK-START: int Main.inlineSharpenStringInvoke() inliner (after) // CHECK-NOT: InvokeStaticOrDirect // CHECK-START: int Main.inlineSharpenStringInvoke() inliner (after) - // CHECK-DAG: [[Field:i\d+]] InstanceFieldGet - // CHECK-DAG: Return [ [[Field]] ] + // CHECK-DAG: <<Field:i\d+>> InstanceFieldGet + // CHECK-DAG: Return [ <<Field>> ] public static int inlineSharpenStringInvoke() { return "Foo".length(); diff --git a/test/465-checker-clinit-gvn/src/Main.java b/test/465-checker-clinit-gvn/src/Main.java index dcaef6fcfe..b712715c45 100644 --- a/test/465-checker-clinit-gvn/src/Main.java +++ b/test/465-checker-clinit-gvn/src/Main.java @@ -27,14 +27,14 @@ class OtherClass { public final class Main { // CHECK-START: int Main.accessTwoStatics() GVN (before) - // CHECK-DAG: [[Class1:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class1]] ] - // CHECK-DAG: [[Class2:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class2]] ] + // CHECK-DAG: <<Class1:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class1>> ] + // CHECK-DAG: <<Class2:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class2>> ] // CHECK-START: int Main.accessTwoStatics() GVN (after) - // CHECK-DAG: [[Class:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class]] ] + // CHECK-DAG: <<Class:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class>> ] // CHECK-NOT: ClinitCheck public static int accessTwoStatics() { @@ -42,14 +42,14 @@ public final class Main { } // CHECK-START: int Main.accessTwoStaticsCallInBetween() GVN (before) - // CHECK-DAG: [[Class1:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class1]] ] - // CHECK-DAG: [[Class2:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class2]] ] + // CHECK-DAG: <<Class1:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class1>> ] + // CHECK-DAG: <<Class2:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class2>> ] // CHECK-START: int Main.accessTwoStaticsCallInBetween() GVN (after) - // CHECK-DAG: [[Class:l\d+]] LoadClass - // CHECK-DAG: ClinitCheck [ [[Class]] ] + // CHECK-DAG: <<Class:l\d+>> LoadClass + // CHECK-DAG: ClinitCheck [ <<Class>> ] // CHECK-NOT: ClinitCheck public static int accessTwoStaticsCallInBetween() { diff --git a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali index 6ff43910d5..0cb5313ff6 100644 --- a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali +++ b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali @@ -19,17 +19,17 @@ .field public static value:Z # CHECK-START: boolean TestCase.testCase() boolean_simplifier (before) -# CHECK-DAG: [[Const0:i\d+]] IntConstant 0 -# CHECK-DAG: [[Const1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Value:z\d+]] StaticFieldGet -# CHECK-DAG: If [ [[Value]] ] -# CHECK-DAG: [[Phi:i\d+]] Phi [ [[Const1]] [[Const0]] ] -# CHECK-DAG: Return [ [[Phi]] ] +# CHECK-DAG: <<Const0:i\d+>> IntConstant 0 +# CHECK-DAG: <<Const1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Value:z\d+>> StaticFieldGet +# CHECK-DAG: If [ <<Value>> ] +# CHECK-DAG: <<Phi:i\d+>> Phi [ <<Const1>> <<Const0>> ] +# CHECK-DAG: Return [ <<Phi>> ] # CHECK-START: boolean TestCase.testCase() boolean_simplifier (after) -# CHECK-DAG: [[Value:z\d+]] StaticFieldGet -# CHECK-DAG: [[Not:z\d+]] BooleanNot [ [[Value]] ] -# CHECK-DAG: Return [ [[Not]] ] +# CHECK-DAG: <<Value:z\d+>> StaticFieldGet +# CHECK-DAG: <<Not:z\d+>> BooleanNot [ <<Value>> ] +# CHECK-DAG: Return [ <<Not>> ] .method public static testCase()Z .registers 2 diff --git a/test/474-checker-boolean-input/src/Main.java b/test/474-checker-boolean-input/src/Main.java index 9151986ca2..a395ff915a 100644 --- a/test/474-checker-boolean-input/src/Main.java +++ b/test/474-checker-boolean-input/src/Main.java @@ -28,8 +28,8 @@ public class Main { */ // CHECK-START: boolean Main.TestPhiAsBoolean(int) boolean_simplifier (after) - // CHECK-DAG: [[Phi:i\d+]] Phi - // CHECK-DAG: BooleanNot [ [[Phi]] ] + // CHECK-DAG: <<Phi:i\d+>> Phi + // CHECK-DAG: BooleanNot [ <<Phi>> ] public static boolean f1; public static boolean f2; @@ -48,8 +48,8 @@ public class Main { */ // CHECK-START: boolean Main.TestAndAsBoolean(boolean, boolean) boolean_simplifier (after) - // CHECK-DAG: [[And:i\d+]] And - // CHECK-DAG: BooleanNot [ [[And]] ] + // CHECK-DAG: <<And:i\d+>> And + // CHECK-DAG: BooleanNot [ <<And>> ] public static boolean InlineAnd(boolean x, boolean y) { return x & y; @@ -65,8 +65,8 @@ public class Main { */ // CHECK-START: boolean Main.TestOrAsBoolean(boolean, boolean) boolean_simplifier (after) - // CHECK-DAG: [[Or:i\d+]] Or - // CHECK-DAG: BooleanNot [ [[Or]] ] + // CHECK-DAG: <<Or:i\d+>> Or + // CHECK-DAG: BooleanNot [ <<Or>> ] public static boolean InlineOr(boolean x, boolean y) { return x | y; @@ -82,8 +82,8 @@ public class Main { */ // CHECK-START: boolean Main.TestXorAsBoolean(boolean, boolean) boolean_simplifier (after) - // CHECK-DAG: [[Xor:i\d+]] Xor - // CHECK-DAG: BooleanNot [ [[Xor]] ] + // CHECK-DAG: <<Xor:i\d+>> Xor + // CHECK-DAG: BooleanNot [ <<Xor>> ] public static boolean InlineXor(boolean x, boolean y) { return x ^ y; diff --git a/test/478-checker-clinit-check-pruning/src/Main.java b/test/478-checker-clinit-check-pruning/src/Main.java index 6da8945c43..b36b7d6b44 100644 --- a/test/478-checker-clinit-check-pruning/src/Main.java +++ b/test/478-checker-clinit-check-pruning/src/Main.java @@ -24,13 +24,13 @@ public class Main { */ // CHECK-START: void Main.invokeStaticInlined() builder (after) - // CHECK-DAG: [[LoadClass:l\d+]] LoadClass - // CHECK-DAG: [[ClinitCheck:l\d+]] ClinitCheck [ [[LoadClass]] ] - // CHECK-DAG: InvokeStaticOrDirect [ [[ClinitCheck]] ] + // CHECK-DAG: <<LoadClass:l\d+>> LoadClass + // CHECK-DAG: <<ClinitCheck:l\d+>> ClinitCheck [ <<LoadClass>> ] + // CHECK-DAG: InvokeStaticOrDirect [ <<ClinitCheck>> ] // CHECK-START: void Main.invokeStaticInlined() inliner (after) - // CHECK-DAG: [[LoadClass:l\d+]] LoadClass - // CHECK-DAG: [[ClinitCheck:l\d+]] ClinitCheck [ [[LoadClass]] ] + // CHECK-DAG: <<LoadClass:l\d+>> LoadClass + // CHECK-DAG: <<ClinitCheck:l\d+>> ClinitCheck [ <<LoadClass>> ] // CHECK-START: void Main.invokeStaticInlined() inliner (after) // CHECK-NOT: InvokeStaticOrDirect @@ -67,14 +67,14 @@ public class Main { */ // CHECK-START: void Main.invokeStaticNotInlined() builder (after) - // CHECK-DAG: [[LoadClass:l\d+]] LoadClass - // CHECK-DAG: [[ClinitCheck:l\d+]] ClinitCheck [ [[LoadClass]] ] - // CHECK-DAG: InvokeStaticOrDirect [ [[ClinitCheck]] ] + // CHECK-DAG: <<LoadClass:l\d+>> LoadClass + // CHECK-DAG: <<ClinitCheck:l\d+>> ClinitCheck [ <<LoadClass>> ] + // CHECK-DAG: InvokeStaticOrDirect [ <<ClinitCheck>> ] // CHECK-START: void Main.invokeStaticNotInlined() inliner (after) - // CHECK-DAG: [[LoadClass:l\d+]] LoadClass - // CHECK-DAG: [[ClinitCheck:l\d+]] ClinitCheck [ [[LoadClass]] ] - // CHECK-DAG: InvokeStaticOrDirect [ [[ClinitCheck]] ] + // CHECK-DAG: <<LoadClass:l\d+>> LoadClass + // CHECK-DAG: <<ClinitCheck:l\d+>> ClinitCheck [ <<LoadClass>> ] + // CHECK-DAG: InvokeStaticOrDirect [ <<ClinitCheck>> ] // The following checks ensure the clinit check and load class // instructions added by the builder are pruned by the diff --git a/test/480-checker-dead-blocks/src/Main.java b/test/480-checker-dead-blocks/src/Main.java index 83dbb26898..dda1a43d0b 100644 --- a/test/480-checker-dead-blocks/src/Main.java +++ b/test/480-checker-dead-blocks/src/Main.java @@ -31,19 +31,19 @@ public class Main { } // CHECK-START: int Main.testTrueBranch(int, int) dead_code_elimination_final (before) - // CHECK-DAG: [[ArgX:i\d+]] ParameterValue - // CHECK-DAG: [[ArgY:i\d+]] ParameterValue + // CHECK-DAG: <<ArgX:i\d+>> ParameterValue + // CHECK-DAG: <<ArgY:i\d+>> ParameterValue // CHECK-DAG: If - // CHECK-DAG: [[Add:i\d+]] Add [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Add]] [[Sub]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: int Main.testTrueBranch(int, int) dead_code_elimination_final (after) - // CHECK-DAG: [[ArgX:i\d+]] ParameterValue - // CHECK-DAG: [[ArgY:i\d+]] ParameterValue - // CHECK-DAG: [[Add:i\d+]] Add [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: Return [ [[Add]] ] + // CHECK-DAG: <<ArgX:i\d+>> ParameterValue + // CHECK-DAG: <<ArgY:i\d+>> ParameterValue + // CHECK-DAG: <<Add:i\d+>> Add [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: Return [ <<Add>> ] // CHECK-START: int Main.testTrueBranch(int, int) dead_code_elimination_final (after) // CHECK-NOT: If @@ -61,19 +61,19 @@ public class Main { } // CHECK-START: int Main.testFalseBranch(int, int) dead_code_elimination_final (before) - // CHECK-DAG: [[ArgX:i\d+]] ParameterValue - // CHECK-DAG: [[ArgY:i\d+]] ParameterValue + // CHECK-DAG: <<ArgX:i\d+>> ParameterValue + // CHECK-DAG: <<ArgY:i\d+>> ParameterValue // CHECK-DAG: If - // CHECK-DAG: [[Add:i\d+]] Add [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: [[Phi:i\d+]] Phi [ [[Add]] [[Sub]] ] - // CHECK-DAG: Return [ [[Phi]] ] + // CHECK-DAG: <<Add:i\d+>> Add [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: <<Phi:i\d+>> Phi [ <<Add>> <<Sub>> ] + // CHECK-DAG: Return [ <<Phi>> ] // CHECK-START: int Main.testFalseBranch(int, int) dead_code_elimination_final (after) - // CHECK-DAG: [[ArgX:i\d+]] ParameterValue - // CHECK-DAG: [[ArgY:i\d+]] ParameterValue - // CHECK-DAG: [[Sub:i\d+]] Sub [ [[ArgX]] [[ArgY]] ] - // CHECK-DAG: Return [ [[Sub]] ] + // CHECK-DAG: <<ArgX:i\d+>> ParameterValue + // CHECK-DAG: <<ArgY:i\d+>> ParameterValue + // CHECK-DAG: <<Sub:i\d+>> Sub [ <<ArgX>> <<ArgY>> ] + // CHECK-DAG: Return [ <<Sub>> ] // CHECK-START: int Main.testFalseBranch(int, int) dead_code_elimination_final (after) // CHECK-NOT: If @@ -125,8 +125,8 @@ public class Main { // CHECK-DAG: Add // CHECK-START: int Main.testDeadLoop(int) dead_code_elimination_final (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.testDeadLoop(int) dead_code_elimination_final (after) // CHECK-NOT: If @@ -145,8 +145,8 @@ public class Main { // CHECK-DAG: Add // CHECK-START: int Main.testUpdateLoopInformation(int) dead_code_elimination_final (after) - // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-DAG: <<Arg:i\d+>> ParameterValue + // CHECK-DAG: Return [ <<Arg>> ] // CHECK-START: int Main.testUpdateLoopInformation(int) dead_code_elimination_final (after) // CHECK-NOT: If diff --git a/test/485-checker-dce-loop-update/smali/TestCase.smali b/test/485-checker-dce-loop-update/smali/TestCase.smali index 663a6ea1d5..bdc40380fd 100644 --- a/test/485-checker-dce-loop-update/smali/TestCase.smali +++ b/test/485-checker-dce-loop-update/smali/TestCase.smali @@ -24,26 +24,26 @@ # CHECK-START: int TestCase.testSingleExit(int, boolean) dead_code_elimination_final (before) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[Cst1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Cst5:i\d+]] IntConstant 5 -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[Add5:i\d+]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[Cst1]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add5]] Add [ [[PhiX]] [[Cst5]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<Cst1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Cst5:i\d+>> IntConstant 5 +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<Add5:i\d+>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<Cst1>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add5>> Add [ <<PhiX>> <<Cst5>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: Return [ <<PhiX>> ] loop:none # CHECK-START: int TestCase.testSingleExit(int, boolean) dead_code_elimination_final (after) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[AddX:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: [[AddX]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<AddX:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: <<AddX>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: Return [ <<PhiX>> ] loop:none .method public static testSingleExit(IZ)I .registers 3 @@ -74,30 +74,30 @@ # CHECK-START: int TestCase.testMultipleExits(int, boolean, boolean) dead_code_elimination_final (before) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Cst5:i\d+]] IntConstant 5 -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[Add5:i\d+]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgZ]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[Cst1]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add5]] Add [ [[PhiX]] [[Cst5]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Cst5:i\d+>> IntConstant 5 +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<Add5:i\d+>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgZ>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<Cst1>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add5>> Add [ <<PhiX>> <<Cst5>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: Return [ <<PhiX>> ] loop:none # CHECK-START: int TestCase.testMultipleExits(int, boolean, boolean) dead_code_elimination_final (after) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgZ]] ] loop:none -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgZ>> ] loop:none +# CHECK-DAG: Return [ <<PhiX>> ] loop:none .method public static testMultipleExits(IZZ)I .registers 4 @@ -130,36 +130,36 @@ # CHECK-START: int TestCase.testExitPredecessors(int, boolean, boolean) dead_code_elimination_final (before) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Cst5:i\d+]] IntConstant 5 -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[Cst9:i\d+]] IntConstant 9 -# CHECK-DAG: [[PhiX1:i\d+]] Phi [ [[ArgX]] [[Add5:i\d+]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgZ]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Mul9:i\d+]] Mul [ [[PhiX1]] [[Cst9]] ] loop:[[HeaderY]] -# CHECK-DAG: [[PhiX2:i\d+]] Phi [ [[Mul9]] [[PhiX1]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[Cst1]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add5]] Add [ [[PhiX2]] [[Cst5]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX1]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: Return [ [[PhiX2]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Cst5:i\d+>> IntConstant 5 +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<Cst9:i\d+>> IntConstant 9 +# CHECK-DAG: <<PhiX1:i\d+>> Phi [ <<ArgX>> <<Add5:i\d+>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgZ>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Mul9:i\d+>> Mul [ <<PhiX1>> <<Cst9>> ] loop:<<HeaderY>> +# CHECK-DAG: <<PhiX2:i\d+>> Phi [ <<Mul9>> <<PhiX1>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<Cst1>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add5>> Add [ <<PhiX2>> <<Cst5>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX1>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: Return [ <<PhiX2>> ] loop:none # CHECK-START: int TestCase.testExitPredecessors(int, boolean, boolean) dead_code_elimination_final (after) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 -# CHECK-DAG: [[Cst9:i\d+]] IntConstant 9 -# CHECK-DAG: [[PhiX1:i\d+]] Phi [ [[ArgX]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX1]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgZ]] ] loop:none -# CHECK-DAG: [[Mul9:i\d+]] Mul [ [[PhiX1]] [[Cst9]] ] loop:none -# CHECK-DAG: [[PhiX2:i\d+]] Phi [ [[Mul9]] [[PhiX1]] ] loop:none -# CHECK-DAG: Return [ [[PhiX2]] ] loop:none +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 +# CHECK-DAG: <<Cst9:i\d+>> IntConstant 9 +# CHECK-DAG: <<PhiX1:i\d+>> Phi [ <<ArgX>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX1>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgZ>> ] loop:none +# CHECK-DAG: <<Mul9:i\d+>> Mul [ <<PhiX1>> <<Cst9>> ] loop:none +# CHECK-DAG: <<PhiX2:i\d+>> Phi [ <<Mul9>> <<PhiX1>> ] loop:none +# CHECK-DAG: Return [ <<PhiX2>> ] loop:none .method public static testExitPredecessors(IZZ)I .registers 4 @@ -197,48 +197,48 @@ # CHECK-START: int TestCase.testInnerLoop(int, boolean, boolean) dead_code_elimination_final (before) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst0:i\d+]] IntConstant 0 -# CHECK-DAG: [[Cst1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Cst5:i\d+]] IntConstant 5 -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst0:i\d+>> IntConstant 0 +# CHECK-DAG: <<Cst1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Cst5:i\d+>> IntConstant 5 +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 # -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[Add5:i\d+]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: [[PhiZ1:i\d+]] Phi [ [[ArgZ]] [[XorZ:i\d+]] [[PhiZ1]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<Add5:i\d+>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: <<PhiZ1:i\d+>> Phi [ <<ArgZ>> <<XorZ:i\d+>> <<PhiZ1>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> # # ### Inner loop ### -# CHECK-DAG: [[PhiZ2:i\d+]] Phi [ [[PhiZ1]] [[XorZ]] ] loop:[[HeaderZ:B\d+]] -# CHECK-DAG: [[XorZ]] Xor [ [[PhiZ2]] [[Cst1]] ] loop:[[HeaderZ]] -# CHECK-DAG: [[CondZ:z\d+]] Equal [ [[XorZ]] [[Cst0]] ] loop:[[HeaderZ]] -# CHECK-DAG: If [ [[CondZ]] ] loop:[[HeaderZ]] +# CHECK-DAG: <<PhiZ2:i\d+>> Phi [ <<PhiZ1>> <<XorZ>> ] loop:<<HeaderZ:B\d+>> +# CHECK-DAG: <<XorZ>> Xor [ <<PhiZ2>> <<Cst1>> ] loop:<<HeaderZ>> +# CHECK-DAG: <<CondZ:z\d+>> Equal [ <<XorZ>> <<Cst0>> ] loop:<<HeaderZ>> +# CHECK-DAG: If [ <<CondZ>> ] loop:<<HeaderZ>> # -# CHECK-DAG: [[Add5]] Add [ [[PhiX]] [[Cst5]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: <<Add5>> Add [ <<PhiX>> <<Cst5>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> +# CHECK-DAG: Return [ <<PhiX>> ] loop:none # CHECK-START: int TestCase.testInnerLoop(int, boolean, boolean) dead_code_elimination_final (after) -# CHECK-DAG: [[ArgX:i\d+]] ParameterValue -# CHECK-DAG: [[ArgY:z\d+]] ParameterValue -# CHECK-DAG: [[ArgZ:z\d+]] ParameterValue -# CHECK-DAG: [[Cst0:i\d+]] IntConstant 0 -# CHECK-DAG: [[Cst1:i\d+]] IntConstant 1 -# CHECK-DAG: [[Cst7:i\d+]] IntConstant 7 +# CHECK-DAG: <<ArgX:i\d+>> ParameterValue +# CHECK-DAG: <<ArgY:z\d+>> ParameterValue +# CHECK-DAG: <<ArgZ:z\d+>> ParameterValue +# CHECK-DAG: <<Cst0:i\d+>> IntConstant 0 +# CHECK-DAG: <<Cst1:i\d+>> IntConstant 1 +# CHECK-DAG: <<Cst7:i\d+>> IntConstant 7 # -# CHECK-DAG: [[PhiX:i\d+]] Phi [ [[ArgX]] [[Add7:i\d+]] ] loop:[[HeaderY:B\d+]] -# CHECK-DAG: [[PhiZ1:i\d+]] Phi [ [[ArgZ]] [[PhiZ1]] ] loop:[[HeaderY]] -# CHECK-DAG: If [ [[ArgY]] ] loop:[[HeaderY]] -# CHECK-DAG: [[Add7]] Add [ [[PhiX]] [[Cst7]] ] loop:[[HeaderY]] +# CHECK-DAG: <<PhiX:i\d+>> Phi [ <<ArgX>> <<Add7:i\d+>> ] loop:<<HeaderY:B\d+>> +# CHECK-DAG: <<PhiZ1:i\d+>> Phi [ <<ArgZ>> <<PhiZ1>> ] loop:<<HeaderY>> +# CHECK-DAG: If [ <<ArgY>> ] loop:<<HeaderY>> +# CHECK-DAG: <<Add7>> Add [ <<PhiX>> <<Cst7>> ] loop:<<HeaderY>> # # ### Inner loop ### -# CHECK-DAG: [[PhiZ2:i\d+]] Phi [ [[PhiZ1]] [[XorZ:i\d+]] ] loop:[[HeaderZ:B\d+]] -# CHECK-DAG: [[XorZ]] Xor [ [[PhiZ2]] [[Cst1]] ] loop:[[HeaderZ]] -# CHECK-DAG: [[CondZ:z\d+]] Equal [ [[XorZ]] [[Cst0]] ] loop:[[HeaderZ]] -# CHECK-DAG: If [ [[CondZ]] ] loop:[[HeaderZ]] +# CHECK-DAG: <<PhiZ2:i\d+>> Phi [ <<PhiZ1>> <<XorZ:i\d+>> ] loop:<<HeaderZ:B\d+>> +# CHECK-DAG: <<XorZ>> Xor [ <<PhiZ2>> <<Cst1>> ] loop:<<HeaderZ>> +# CHECK-DAG: <<CondZ:z\d+>> Equal [ <<XorZ>> <<Cst0>> ] loop:<<HeaderZ>> +# CHECK-DAG: If [ <<CondZ>> ] loop:<<HeaderZ>> # -# CHECK-DAG: Return [ [[PhiX]] ] loop:none +# CHECK-DAG: Return [ <<PhiX>> ] loop:none .method public static testInnerLoop(IZZ)I .registers 4 diff --git a/tools/checker/README b/tools/checker/README index 9b23ae9299..276394826f 100644 --- a/tools/checker/README +++ b/tools/checker/README @@ -11,7 +11,7 @@ Assertions are tested in groups which correspond to the individual compiler passes. Each group of check lines therefore must start with a 'CHECK-START' header which specifies the output group it should be tested against. The group name must exactly match one of the groups recognized in the output (they can -be listed with the '--list-groups' command-line flag). +be listed with the '--list-passes' command-line flag). Matching of check lines is carried out in the order of appearance in the source file. There are three types of check lines: @@ -38,7 +38,7 @@ enclosed in round brackets. For example, the pattern '{{foo{2}}}' will parse the invalid regex 'foo{2', but '{{(fo{2})}}' will match 'foo'. Regex patterns can be named and referenced later. A new variable is defined -with '[[name:regex]]' and can be referenced with '[[name]]'. Variables are +with '<<name:regex>>' and can be referenced with '<<name>>'. Variables are only valid within the scope of the defining group. Within a group they cannot be redefined or used undefined. @@ -46,8 +46,8 @@ Example: The following assertions can be placed in a Java source file: // CHECK-START: int MyClass.MyMethod() constant_folding (after) - // CHECK: [[ID:i\d+]] IntConstant {{11|22}} - // CHECK: Return [ [[ID]] ] + // CHECK: <<ID:i\d+>> IntConstant {{11|22}} + // CHECK: Return [ <<ID>> ] The engine will attempt to match the check lines against the output of the group named on the first line. Together they verify that the CFG after diff --git a/tools/checker/file_format/checker/struct.py b/tools/checker/file_format/checker/struct.py index 3354cb6f70..381c92bb2a 100644 --- a/tools/checker/file_format/checker/struct.py +++ b/tools/checker/file_format/checker/struct.py @@ -114,8 +114,8 @@ class RegexExpression(EqualityMixin, PrintableMixin): rRegex = r"(.+?)" rPatternStartSym = r"(\{\{)" rPatternEndSym = r"(\}\})" - rVariableStartSym = r"(\[\[)" - rVariableEndSym = r"(\]\])" + rVariableStartSym = r"(<<)" + rVariableEndSym = r"(>>)" rVariableSeparator = r"(:)" regexPattern = rPatternStartSym + rRegex + rPatternEndSym diff --git a/tools/checker/file_format/checker/test.py b/tools/checker/file_format/checker/test.py index 167c8880e9..475e8c3d07 100644 --- a/tools/checker/file_format/checker/test.py +++ b/tools/checker/file_format/checker/test.py @@ -104,10 +104,10 @@ class CheckerParser_RegexExpressionTest(unittest.TestCase): self.assertEqualsPattern("{{a?b.c}}", "a?b.c") def test_VarRefOnly(self): - self.assertEqualsVarRef("[[ABC]]", "ABC") + self.assertEqualsVarRef("<<ABC>>", "ABC") def test_VarDefOnly(self): - self.assertEqualsVarDef("[[ABC:a?b.c]]", "ABC", "a?b.c") + self.assertEqualsVarDef("<<ABC:a?b.c>>", "ABC", "a?b.c") def test_TextWithWhitespace(self): self.assertEqualsRegex("foo bar", "(foo), (bar)") @@ -117,7 +117,7 @@ class CheckerParser_RegexExpressionTest(unittest.TestCase): self.assertEqualsRegex("foo{{abc}}bar", "(foo)(abc)(bar)") def test_TextWithVar(self): - self.assertEqualsRegex("foo[[ABC:abc]]bar", "(foo)(abc)(bar)") + self.assertEqualsRegex("foo<<ABC:abc>>bar", "(foo)(abc)(bar)") def test_PlainWithRegexAndWhitespaces(self): self.assertEqualsRegex("foo {{abc}}bar", "(foo), (abc)(bar)") @@ -125,14 +125,14 @@ class CheckerParser_RegexExpressionTest(unittest.TestCase): self.assertEqualsRegex("foo {{abc}} bar", "(foo), (abc), (bar)") def test_PlainWithVarAndWhitespaces(self): - self.assertEqualsRegex("foo [[ABC:abc]]bar", "(foo), (abc)(bar)") - self.assertEqualsRegex("foo[[ABC:abc]] bar", "(foo)(abc), (bar)") - self.assertEqualsRegex("foo [[ABC:abc]] bar", "(foo), (abc), (bar)") + self.assertEqualsRegex("foo <<ABC:abc>>bar", "(foo), (abc)(bar)") + self.assertEqualsRegex("foo<<ABC:abc>> bar", "(foo)(abc), (bar)") + self.assertEqualsRegex("foo <<ABC:abc>> bar", "(foo), (abc), (bar)") def test_AllKinds(self): - self.assertEqualsRegex("foo [[ABC:abc]]{{def}}bar", "(foo), (abc)(def)(bar)") - self.assertEqualsRegex("foo[[ABC:abc]] {{def}}bar", "(foo)(abc), (def)(bar)") - self.assertEqualsRegex("foo [[ABC:abc]] {{def}} bar", "(foo), (abc), (def), (bar)") + self.assertEqualsRegex("foo <<ABC:abc>>{{def}}bar", "(foo), (abc)(def)(bar)") + self.assertEqualsRegex("foo<<ABC:abc>> {{def}}bar", "(foo)(abc), (def)(bar)") + self.assertEqualsRegex("foo <<ABC:abc>> {{def}} bar", "(foo), (abc), (def), (bar)") # # Test that variables and patterns are parsed correctly @@ -142,35 +142,35 @@ class CheckerParser_RegexExpressionTest(unittest.TestCase): self.assertEqualsPattern("{{(a{bc})}}", "(a{bc})") def test_ValidRef(self): - self.assertEqualsVarRef("[[ABC]]", "ABC") - self.assertEqualsVarRef("[[A1BC2]]", "A1BC2") + self.assertEqualsVarRef("<<ABC>>", "ABC") + self.assertEqualsVarRef("<<A1BC2>>", "A1BC2") def test_ValidDef(self): - self.assertEqualsVarDef("[[ABC:abc]]", "ABC", "abc") - self.assertEqualsVarDef("[[ABC:ab:c]]", "ABC", "ab:c") - self.assertEqualsVarDef("[[ABC:a[b]c]]", "ABC", "a[b]c") - self.assertEqualsVarDef("[[ABC:(a[bc])]]", "ABC", "(a[bc])") + self.assertEqualsVarDef("<<ABC:abc>>", "ABC", "abc") + self.assertEqualsVarDef("<<ABC:ab:c>>", "ABC", "ab:c") + self.assertEqualsVarDef("<<ABC:a[b]c>>", "ABC", "a[b]c") + self.assertEqualsVarDef("<<ABC:(a[bc])>>", "ABC", "(a[bc])") def test_Empty(self): self.assertVariantNotEqual("{{}}", RegexExpression.Variant.Pattern) - self.assertVariantNotEqual("[[]]", RegexExpression.Variant.VarRef) - self.assertVariantNotEqual("[[:]]", RegexExpression.Variant.VarDef) + self.assertVariantNotEqual("<<>>", RegexExpression.Variant.VarRef) + self.assertVariantNotEqual("<<:>>", RegexExpression.Variant.VarDef) def test_InvalidVarName(self): - self.assertVariantNotEqual("[[0ABC]]", RegexExpression.Variant.VarRef) - self.assertVariantNotEqual("[[AB=C]]", RegexExpression.Variant.VarRef) - self.assertVariantNotEqual("[[ABC=]]", RegexExpression.Variant.VarRef) - self.assertVariantNotEqual("[[0ABC:abc]]", RegexExpression.Variant.VarDef) - self.assertVariantNotEqual("[[AB=C:abc]]", RegexExpression.Variant.VarDef) - self.assertVariantNotEqual("[[ABC=:abc]]", RegexExpression.Variant.VarDef) + self.assertVariantNotEqual("<<0ABC>>", RegexExpression.Variant.VarRef) + self.assertVariantNotEqual("<<AB=C>>", RegexExpression.Variant.VarRef) + self.assertVariantNotEqual("<<ABC=>>", RegexExpression.Variant.VarRef) + self.assertVariantNotEqual("<<0ABC:abc>>", RegexExpression.Variant.VarDef) + self.assertVariantNotEqual("<<AB=C:abc>>", RegexExpression.Variant.VarDef) + self.assertVariantNotEqual("<<ABC=:abc>>", RegexExpression.Variant.VarDef) def test_BodyMatchNotGreedy(self): self.assertEqualsRegex("{{abc}}{{def}}", "(abc)(def)") - self.assertEqualsRegex("[[ABC:abc]][[DEF:def]]", "(abc)(def)") + self.assertEqualsRegex("<<ABC:abc>><<DEF:def>>", "(abc)(def)") def test_NoVarDefsInNotChecks(self): with self.assertRaises(CheckerException): - self.parseAssertion("[[ABC:abc]]", "-NOT") + self.parseAssertion("<<ABC:abc>>", "-NOT") class CheckerParser_FileLayoutTest(unittest.TestCase): diff --git a/tools/checker/match/test.py b/tools/checker/match/test.py index 62e8e000e8..bb3b1af388 100644 --- a/tools/checker/match/test.py +++ b/tools/checker/match/test.py @@ -58,40 +58,40 @@ class MatchLines_Test(unittest.TestCase): self.assertFalse(self.matches("foo{{A|B}}bar", "fooCbar")) def test_VariableReference(self): - self.assertTrue(self.matches("foo[[X]]bar", "foobar", {"X": ""})) - self.assertTrue(self.matches("foo[[X]]bar", "fooAbar", {"X": "A"})) - self.assertTrue(self.matches("foo[[X]]bar", "fooBbar", {"X": "B"})) - self.assertFalse(self.matches("foo[[X]]bar", "foobar", {"X": "A"})) - self.assertFalse(self.matches("foo[[X]]bar", "foo bar", {"X": "A"})) + self.assertTrue(self.matches("foo<<X>>bar", "foobar", {"X": ""})) + self.assertTrue(self.matches("foo<<X>>bar", "fooAbar", {"X": "A"})) + self.assertTrue(self.matches("foo<<X>>bar", "fooBbar", {"X": "B"})) + self.assertFalse(self.matches("foo<<X>>bar", "foobar", {"X": "A"})) + self.assertFalse(self.matches("foo<<X>>bar", "foo bar", {"X": "A"})) with self.assertRaises(CheckerException): - self.assertTrue(self.matches("foo[[X]]bar", "foobar", {})) + self.assertTrue(self.matches("foo<<X>>bar", "foobar", {})) def test_VariableDefinition(self): - self.assertTrue(self.matches("foo[[X:A|B]]bar", "fooAbar")) - self.assertTrue(self.matches("foo[[X:A|B]]bar", "fooBbar")) - self.assertFalse(self.matches("foo[[X:A|B]]bar", "fooCbar")) + self.assertTrue(self.matches("foo<<X:A|B>>bar", "fooAbar")) + self.assertTrue(self.matches("foo<<X:A|B>>bar", "fooBbar")) + self.assertFalse(self.matches("foo<<X:A|B>>bar", "fooCbar")) - env = self.tryMatch("foo[[X:A.*B]]bar", "fooABbar", {}) + env = self.tryMatch("foo<<X:A.*B>>bar", "fooABbar", {}) self.assertEqual(env, {"X": "AB"}) - env = self.tryMatch("foo[[X:A.*B]]bar", "fooAxxBbar", {}) + env = self.tryMatch("foo<<X:A.*B>>bar", "fooAxxBbar", {}) self.assertEqual(env, {"X": "AxxB"}) - self.assertTrue(self.matches("foo[[X:A|B]]bar[[X]]baz", "fooAbarAbaz")) - self.assertTrue(self.matches("foo[[X:A|B]]bar[[X]]baz", "fooBbarBbaz")) - self.assertFalse(self.matches("foo[[X:A|B]]bar[[X]]baz", "fooAbarBbaz")) + self.assertTrue(self.matches("foo<<X:A|B>>bar<<X>>baz", "fooAbarAbaz")) + self.assertTrue(self.matches("foo<<X:A|B>>bar<<X>>baz", "fooBbarBbaz")) + self.assertFalse(self.matches("foo<<X:A|B>>bar<<X>>baz", "fooAbarBbaz")) def test_NoVariableRedefinition(self): with self.assertRaises(CheckerException): - self.matches("[[X:...]][[X]][[X:...]][[X]]", "foofoobarbar") + self.matches("<<X:...>><<X>><<X:...>><<X>>", "foofoobarbar") def test_EnvNotChangedOnPartialMatch(self): env = {"Y": "foo"} - self.assertFalse(self.matches("[[X:A]]bar", "Abaz", env)) + self.assertFalse(self.matches("<<X:A>>bar", "Abaz", env)) self.assertFalse("X" in env.keys()) def test_VariableContentEscaped(self): - self.assertTrue(self.matches("[[X:..]]foo[[X]]", ".*foo.*")) - self.assertFalse(self.matches("[[X:..]]foo[[X]]", ".*fooAAAA")) + self.assertTrue(self.matches("<<X:..>>foo<<X>>", ".*foo.*")) + self.assertFalse(self.matches("<<X:..>>foo<<X>>", ".*fooAAAA")) class MatchFiles_Test(unittest.TestCase): @@ -133,8 +133,8 @@ class MatchFiles_Test(unittest.TestCase): def test_Variables(self): self.assertTrue(self.matches( """ - // CHECK: foo[[X:.]]bar - // CHECK: abc[[X]]def + // CHECK: foo<<X:.>>bar + // CHECK: abc<<X>>def """, """ foo bar @@ -142,9 +142,9 @@ class MatchFiles_Test(unittest.TestCase): """)) self.assertTrue(self.matches( """ - // CHECK: foo[[X:([0-9]+)]]bar - // CHECK: abc[[X]]def - // CHECK: ### [[X]] ### + // CHECK: foo<<X:([0-9]+)>>bar + // CHECK: abc<<X>>def + // CHECK: ### <<X>> ### """, """ foo1234bar @@ -153,8 +153,8 @@ class MatchFiles_Test(unittest.TestCase): """)) self.assertFalse(self.matches( """ - // CHECK: foo[[X:([0-9]+)]]bar - // CHECK: abc[[X]]def + // CHECK: foo<<X:([0-9]+)>>bar + // CHECK: abc<<X>>def """, """ foo1234bar |