test: Fix 593-checker-shift-and-simplifier for target
Previously, the operations() method was failing when compiling with
javac/dx.
Rewrite it again as smali to retain the previous optimization
validation.
(Tested on target arm 32/64).
Test: art/test/run-test --64 --never-clean --optimizing --build-with-javac-dx 593-checker-shift-and-simplifier
Test: art/test/run-test --never-clean --optimizing --build-with-javac-dx 593-checker-shift-and-simplifier
Bug: 62950048
Bug: 36902714
Change-Id: Ia56285537a0213e94ded2690bcb39cb6f528df22
diff --git a/test/593-checker-shift-and-simplifier/expected.txt b/test/593-checker-shift-and-simplifier/expected.txt
index b0aad4d..f8d85db 100644
--- a/test/593-checker-shift-and-simplifier/expected.txt
+++ b/test/593-checker-shift-and-simplifier/expected.txt
@@ -1 +1,2 @@
passed
+passed
diff --git a/test/593-checker-shift-and-simplifier/smali/SmaliTests.smali b/test/593-checker-shift-and-simplifier/smali/SmaliTests.smali
new file mode 100644
index 0000000..6b0d683
--- /dev/null
+++ b/test/593-checker-shift-and-simplifier/smali/SmaliTests.smali
@@ -0,0 +1,58 @@
+# Copyright (C) 2017 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.
+
+.class public LSmaliTests;
+.super Ljava/lang/Object;
+
+# A very particular set of operations that caused a double removal by the
+# ARM64 simplifier doing "forward" removals (b/27851582).
+
+## CHECK-START-ARM: int SmaliTests.operations() instruction_simplifier_arm (before)
+## CHECK-DAG: <<Get:i\d+>> ArrayGet
+## CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
+## CHECK-DAG: <<Shl:i\d+>> Shl [<<Get>>,i{{\d+}}]
+## CHECK-DAG: And [<<Not>>,<<Shl>>]
+
+## CHECK-START-ARM: int SmaliTests.operations() instruction_simplifier_arm (after)
+## CHECK-DAG: <<Get:i\d+>> ArrayGet
+## CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
+## CHECK-DAG: DataProcWithShifterOp [<<Not>>,<<Get>>] kind:And+LSL shift:2
+
+## CHECK-START-ARM64: int SmaliTests.operations() instruction_simplifier_arm64 (before)
+## CHECK-DAG: <<Get:i\d+>> ArrayGet
+## CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
+## CHECK-DAG: <<Shl:i\d+>> Shl [<<Get>>,i{{\d+}}]
+## CHECK-DAG: And [<<Not>>,<<Shl>>]
+
+## CHECK-START-ARM64: int SmaliTests.operations() instruction_simplifier_arm64 (after)
+## CHECK-DAG: <<Get:i\d+>> ArrayGet
+## CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
+## CHECK-DAG: DataProcWithShifterOp [<<Not>>,<<Get>>] kind:And+LSL shift:2
+.method public static operations()I
+ .registers 6
+ .prologue
+
+ # int r = a[0];
+ sget-object v4, LMain;->a:[I
+ const/4 v5, 0x0
+ aget v2, v4, v5
+ # int n = ~r;
+ not-int v1, v2
+ # int s = r << 2;
+ shl-int/lit8 v3, v2, 0x2
+ # int a = s & n;
+ and-int v0, v3, v1
+ # return a
+ return v0
+.end method
diff --git a/test/593-checker-shift-and-simplifier/src/Main.java b/test/593-checker-shift-and-simplifier/src/Main.java
index c9826bc..f0ef0e6 100644
--- a/test/593-checker-shift-and-simplifier/src/Main.java
+++ b/test/593-checker-shift-and-simplifier/src/Main.java
@@ -14,30 +14,20 @@
* limitations under the License.
*/
+import java.lang.reflect.Method;
+
public class Main {
- private static int[] a = { 10 };
+ static int[] a = { 10 };
// A very particular set of operations that caused a double removal by the
// ARM64 simplifier doing "forward" removals (b/27851582).
- /// CHECK-START-ARM: int Main.operations() instruction_simplifier_arm (before)
- /// CHECK-DAG: <<Get:i\d+>> ArrayGet
- /// CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
- /// CHECK-DAG: <<Shl:i\d+>> Shl [<<Get>>,i{{\d+}}]
- /// CHECK-DAG: And [<<Not>>,<<Shl>>]
- //
/// CHECK-START-ARM: int Main.operations() instruction_simplifier_arm (after)
/// CHECK-DAG: <<Get:i\d+>> ArrayGet
/// CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
/// CHECK-DAG: DataProcWithShifterOp [<<Not>>,<<Get>>] kind:And+LSL shift:2
- /// CHECK-START-ARM64: int Main.operations() instruction_simplifier_arm64 (before)
- /// CHECK-DAG: <<Get:i\d+>> ArrayGet
- /// CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
- /// CHECK-DAG: <<Shl:i\d+>> Shl [<<Get>>,i{{\d+}}]
- /// CHECK-DAG: And [<<Not>>,<<Shl>>]
- //
/// CHECK-START-ARM64: int Main.operations() instruction_simplifier_arm64 (after)
/// CHECK-DAG: <<Get:i\d+>> ArrayGet
/// CHECK-DAG: <<Not:i\d+>> Not [<<Get>>]
@@ -56,5 +46,21 @@
} else {
System.out.println("passed");
}
+
+ if ($noinline$runSmaliTest("operations") != 32) {
+ System.out.println("failed");
+ } else {
+ System.out.println("passed");
+ }
+ }
+
+ public static int $noinline$runSmaliTest(String name) {
+ try {
+ Class<?> c = Class.forName("SmaliTests");
+ Method m = c.getMethod(name);
+ return (Integer) m.invoke(null);
+ } catch (Exception ex) {
+ throw new Error(ex);
+ }
}
}