From 66d126ea06ce3f507d86ca5f0d1f752170ac9be1 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Fri, 3 Apr 2015 16:02:44 +0100 Subject: ART: Implement HBooleanNot instruction Optimizations simplifying operations on boolean values (boolean simplifier, instruction simplifier) can benefit from having a special HInstruction for negating booleans in order to perform more transforms and produce faster machine code. This patch implements HBooleanNot as 'x xor 1', assuming that booleans are 1-bit integers and allowing for a single-instruction negation on all supported platforms. Change-Id: I33a2649c1821255b18a86ca68ed16416063c739f --- .../expected.txt | 0 .../info.txt | 2 + .../smali/TestCase.smali | 32 ++++++++++++++ .../src/Main.java | 51 ++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 test/468-checker-bool-simplifier-regression/expected.txt create mode 100644 test/468-checker-bool-simplifier-regression/info.txt create mode 100644 test/468-checker-bool-simplifier-regression/smali/TestCase.smali create mode 100644 test/468-checker-bool-simplifier-regression/src/Main.java (limited to 'test/468-checker-bool-simplifier-regression') diff --git a/test/468-checker-bool-simplifier-regression/expected.txt b/test/468-checker-bool-simplifier-regression/expected.txt new file mode 100644 index 0000000..e69de29 diff --git a/test/468-checker-bool-simplifier-regression/info.txt b/test/468-checker-bool-simplifier-regression/info.txt new file mode 100644 index 0000000..0a46584 --- /dev/null +++ b/test/468-checker-bool-simplifier-regression/info.txt @@ -0,0 +1,2 @@ +Regression test for optimizing's boolean simplifier +that used to trip when a boolean value was the input of an If. diff --git a/test/468-checker-bool-simplifier-regression/smali/TestCase.smali b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali new file mode 100644 index 0000000..f36304d --- /dev/null +++ b/test/468-checker-bool-simplifier-regression/smali/TestCase.smali @@ -0,0 +1,32 @@ +# 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. + +.class public LTestCase; + +.super Ljava/lang/Object; + +.field public static value:Z + +.method public static testCase()Z + .registers 2 + sget-boolean v0, LTestCase;->value:Z + const/4 v1, 1 + if-eq v0, v1, :label1 + const/4 v1, 1 + goto :label2 + :label1 + const/4 v1, 0 + :label2 + return v1 +.end method diff --git a/test/468-checker-bool-simplifier-regression/src/Main.java b/test/468-checker-bool-simplifier-regression/src/Main.java new file mode 100644 index 0000000..65f20b3 --- /dev/null +++ b/test/468-checker-bool-simplifier-regression/src/Main.java @@ -0,0 +1,51 @@ +/* + * 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. + */ + +import java.lang.reflect.*; + +public class Main { + + // 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-START: boolean TestCase.testCase() boolean_simplifier (after) + // CHECK-DAG: [[Value:z\d+]] StaticFieldGet + // CHECK-DAG: [[Not:z\d+]] BooleanNot [ [[Value]] ] + // CHECK-DAG: Return [ [[Not]] ] + + public static boolean runTest(boolean input) throws Exception { + Class c = Class.forName("TestCase"); + Method m = c.getMethod("testCase"); + Field f = c.getField("value"); + f.set(null, (Boolean) input); + return (Boolean) m.invoke(null); + } + + public static void main(String[] args) throws Exception { + if (runTest(true) != false) { + throw new Error("Expected false, got true"); + } + + if (runTest(false) != true) { + throw new Error("Expected true, got false"); + } + } +} -- cgit v1.1