From 744176959a259f36fe7ca7d101aee1cf39d707d5 Mon Sep 17 00:00:00 2001 From: Alexandre Rames Date: Thu, 9 Apr 2015 15:21:41 +0100 Subject: [PATCH] Fix checker tests in 458-checker-instruction-simplification. Change-Id: I9931e1692117360b8396c0dd8d171c822f0aba3b --- .../src/Main.java | 64 ++++++++++++++++------ 1 file changed, 48 insertions(+), 16 deletions(-) diff --git a/test/458-checker-instruction-simplification/src/Main.java b/test/458-checker-instruction-simplification/src/Main.java index ef6428ddd..1f0017e6e 100644 --- a/test/458-checker-instruction-simplification/src/Main.java +++ b/test/458-checker-instruction-simplification/src/Main.java @@ -40,8 +40,10 @@ public class Main { // CHECK-START: long Main.Add0(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Add // CHECK-DAG: Return [ [[Arg]] ] + // + // CHECK-START: long Main.Add0(long) instruction_simplifier (after) + // CHECK-NOT: Add public static long Add0(long arg) { return 0 + arg; @@ -55,9 +57,11 @@ public class Main { // CHECK-START: int Main.AndAllOnes(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-NOT: And // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: int Main.AndAllOnes(int) instruction_simplifier (after) + // CHECK-NOT: And + public static int AndAllOnes(int arg) { return arg & -1; } @@ -70,9 +74,11 @@ public class Main { // CHECK-START: long Main.Div1(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Div // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.Div1(long) instruction_simplifier (after) + // CHECK-NOT: Div + public static long Div1(long arg) { return arg / 1; } @@ -86,9 +92,11 @@ public class Main { // CHECK-START: int Main.DivN1(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-NOT: Div // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-START: int Main.DivN1(int) instruction_simplifier (after) + // CHECK-NOT: Div + public static int DivN1(int arg) { return arg / -1; } @@ -101,9 +109,11 @@ public class Main { // CHECK-START: long Main.Mul1(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Mul // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.Mul1(long) instruction_simplifier (after) + // CHECK-NOT: Mul + public static long Mul1(long arg) { return arg * 1; } @@ -117,9 +127,11 @@ public class Main { // CHECK-START: int Main.MulN1(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-NOT: Mul // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-START: int Main.MulN1(int) instruction_simplifier (after) + // CHECK-NOT: Mul + public static int MulN1(int arg) { return arg * -1; } @@ -134,9 +146,11 @@ public class Main { // CHECK-DAG: [[Arg:j\d+]] ParameterValue // CHECK-DAG: [[Const7:i\d+]] IntConstant 7 // CHECK-DAG: [[Shl:j\d+]] Shl [ [[Arg]] [[Const7]] ] - // CHECK-NOT: Mul // CHECK-DAG: Return [ [[Shl]] ] + // CHECK-START: long Main.MulPowerOfTwo128(long) instruction_simplifier (after) + // CHECK-NOT: Mul + public static long MulPowerOfTwo128(long arg) { return arg * 128; } @@ -149,9 +163,11 @@ public class Main { // CHECK-START: int Main.Or0(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-NOT: Or // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: int Main.Or0(int) instruction_simplifier (after) + // CHECK-NOT: Or + public static int Or0(int arg) { return arg | 0; } @@ -163,9 +179,11 @@ public class Main { // CHECK-START: long Main.OrSame(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Or // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.OrSame(long) instruction_simplifier (after) + // CHECK-NOT: Or + public static long OrSame(long arg) { return arg | arg; } @@ -178,9 +196,11 @@ public class Main { // CHECK-START: int Main.Shl0(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-NOT: Shl // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: int Main.Shl0(int) instruction_simplifier (after) + // CHECK-NOT: Shl + public static int Shl0(int arg) { return arg << 0; } @@ -193,9 +213,11 @@ public class Main { // CHECK-START: long Main.Shr0(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Shr // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.Shr0(long) instruction_simplifier (after) + // CHECK-NOT: Shr + public static long Shr0(long arg) { return arg >> 0; } @@ -208,9 +230,11 @@ public class Main { // CHECK-START: long Main.Sub0(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: Sub // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.Sub0(long) instruction_simplifier (after) + // CHECK-NOT: Sub + public static long Sub0(long arg) { return arg - 0; } @@ -224,9 +248,11 @@ public class Main { // CHECK-START: int Main.SubAliasNeg(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue // CHECK-DAG: [[Neg:i\d+]] Neg [ [[Arg]] ] - // CHECK-NOT: Sub // CHECK-DAG: Return [ [[Neg]] ] + // CHECK-START: int Main.SubAliasNeg(int) instruction_simplifier (after) + // CHECK-NOT: Sub + public static int SubAliasNeg(int arg) { return 0 - arg; } @@ -239,9 +265,11 @@ public class Main { // CHECK-START: long Main.UShr0(long) instruction_simplifier (after) // CHECK-DAG: [[Arg:j\d+]] ParameterValue - // CHECK-NOT: UShr // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: long Main.UShr0(long) instruction_simplifier (after) + // CHECK-NOT: UShr + public static long UShr0(long arg) { return arg >>> 0; } @@ -254,9 +282,11 @@ public class Main { // CHECK-START: int Main.Xor0(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue - // CHECK-NOT: Xor // CHECK-DAG: Return [ [[Arg]] ] + // CHECK-START: int Main.Xor0(int) instruction_simplifier (after) + // CHECK-NOT: Xor + public static int Xor0(int arg) { return arg ^ 0; } @@ -270,9 +300,11 @@ public class Main { // CHECK-START: int Main.XorAllOnes(int) instruction_simplifier (after) // CHECK-DAG: [[Arg:i\d+]] ParameterValue // CHECK-DAG: [[Not:i\d+]] Not [ [[Arg]] ] - // CHECK-NOT: Xor // CHECK-DAG: Return [ [[Not]] ] + // CHECK-START: int Main.XorAllOnes(int) instruction_simplifier (after) + // CHECK-NOT: Xor + public static int XorAllOnes(int arg) { return arg ^ -1; } -- 2.11.0