From 232ade0b9401404ad4b61b1003551b58b96195a8 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Mon, 20 Apr 2015 15:14:36 +0100 Subject: Revert "Revert "Optimizing: Fix long-to-fp conversion on x86."" This reverts commit 386ce406f150645158d6067c4e0a36565aefc44f. Bug: 20413424 Change-Id: I6e93ff132907f2653f1ae12d6676ff2298f62ca1 --- .../expected.txt | 0 .../info.txt | 1 + .../src/Main.java | 41 ++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 test/477-long-to-float-conversion-precision/expected.txt create mode 100644 test/477-long-to-float-conversion-precision/info.txt create mode 100644 test/477-long-to-float-conversion-precision/src/Main.java (limited to 'test/477-long-to-float-conversion-precision') diff --git a/test/477-long-to-float-conversion-precision/expected.txt b/test/477-long-to-float-conversion-precision/expected.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/477-long-to-float-conversion-precision/info.txt b/test/477-long-to-float-conversion-precision/info.txt new file mode 100644 index 0000000000..d9d41d70ba --- /dev/null +++ b/test/477-long-to-float-conversion-precision/info.txt @@ -0,0 +1 @@ +Tests for type conversions precision. diff --git a/test/477-long-to-float-conversion-precision/src/Main.java b/test/477-long-to-float-conversion-precision/src/Main.java new file mode 100644 index 0000000000..bc17053e20 --- /dev/null +++ b/test/477-long-to-float-conversion-precision/src/Main.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2014 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. + */ + +// Note that $opt$ is a marker for the optimizing compiler to ensure +// it does compile the method. +public class Main { + + public static void assertFloatEquals(float expected, float result) { + if (expected != result) { + throw new Error("Expected: " + expected + ", found: " + result); + } + } + + public static void main(String[] args) { + // Generate, compile and check long-to-float Dex instructions. + longToFloat(); + } + + private static void longToFloat() { + // The result for this test case is slightly less accurate on ARM, + // due to the implementation of long-to-float type conversions for + // this architecture (both in Quick and Optimizing). + assertFloatEquals(Float.intBitsToFloat(-555858671), $opt$LongToFloat(-8008112895877447681L)); + } + + // This method produces a long-to-float Dex instruction. + static float $opt$LongToFloat(long a) { return (float)a; } +} -- cgit v1.2.3