Merge "Add complementary test for not simplifier optimization" into ub-jack-brest

7 files changed, 327 insertions, 7 deletions

diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithComparisonOperator.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithComparisonOperator.java
new file mode 100644
index 00000000..15a4f39b
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithComparisonOperator.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public interface NotWithComparisonOperator {
+
+  public boolean testWithDouble(double n);
+
+  public boolean testWithFloat(float n);
+
+  public boolean testWithLong(long n);
+
+  public boolean testWithInt(int n);
+
+  public boolean testWithShort(short n);
+
+  public boolean testWithByte(byte n);
+
+  public boolean testWithChar(char n);
+}
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithEQ.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithEQ.java
new file mode 100644
index 00000000..ff1c16bc
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithEQ.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public class NotWithEQ implements NotWithComparisonOperator {
+
+  @Override
+  public boolean testWithDouble(double n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithFloat(float n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithLong(long n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithInt(int n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithByte(byte n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n == 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
+    return !(n == 0);
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotSimplifier.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithGT.java
index bdd78444..4d6404d9 100644
--- a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotSimplifier.java
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithGT.java
@@ -16,29 +16,40 @@
 
 package com.android.jack.optimizations.notsimplifier.test002.jack;
 
-public class NotSimplifier {
+public class NotWithGT implements NotWithComparisonOperator {
 
-  public static boolean smallerOrEqualTo0(double n) {
+  @Override
+  public boolean testWithDouble(double n) {
     return !(n > 0);
   }
 
-  public static boolean smallerOrEqualTo0(float n) {
+  @Override
+  public boolean testWithFloat(float n) {
     return !(n > 0);
   }
 
-  public static boolean smallerOrEqualTo0(long n) {
+  @Override
+  public boolean testWithLong(long n) {
     return !(n > 0);
   }
 
-  public static boolean smallerOrEqualTo0(int n) {
+  @Override
+  public boolean testWithInt(int n) {
     return !(n > 0);
   }
 
-  public static boolean smallerOrEqualTo0(byte n) {
+  @Override
+  public boolean testWithByte(byte n) {
     return !(n > 0);
   }
 
-  public static boolean smallerOrEqualTo0(char n) {
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n > 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
     return !(n > 0);
   }
 }
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithGTE.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithGTE.java
new file mode 100644
index 00000000..6d9e64c1
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithGTE.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public class NotWithGTE implements NotWithComparisonOperator {
+
+  @Override
+  public boolean testWithDouble(double n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithFloat(float n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithLong(long n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithInt(int n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithByte(byte n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n >= 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
+    return !(n >= 0);
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLT.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLT.java
new file mode 100644
index 00000000..4c6fbe51
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLT.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public class NotWithLT implements NotWithComparisonOperator {
+
+  @Override
+  public boolean testWithDouble(double n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithFloat(float n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithLong(long n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithInt(int n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithByte(byte n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n < 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
+    return !(n < 0);
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLTE.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLTE.java
new file mode 100644
index 00000000..4ba0951e
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithLTE.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public class NotWithLTE implements NotWithComparisonOperator {
+
+  @Override
+  public boolean testWithDouble(double n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithFloat(float n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithLong(long n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithInt(int n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithByte(byte n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n <= 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
+    return !(n <= 0);
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithNEQ.java b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithNEQ.java
new file mode 100644
index 00000000..fcca9f1a
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/optimizations/notsimplifier/test002/jack/NotWithNEQ.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.optimizations.notsimplifier.test002.jack;
+
+public class NotWithNEQ implements NotWithComparisonOperator {
+
+  @Override
+  public boolean testWithDouble(double n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithFloat(float n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithLong(long n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithInt(int n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithByte(byte n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithChar(char n) {
+    return !(n != 0);
+  }
+
+  @Override
+  public boolean testWithShort(short n) {
+    return !(n != 0);
+  }
+}