Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8080600: AARCH64: testlibrary does not support AArch64
authoraph
Wed, 20 May 2015 10:21:02 +0100
changeset 30761 ce08cd63451f
parent 30759 0bd5569bbfe6
child 30762 f169e79dc011
8080600: AARCH64: testlibrary does not support AArch64 Summary: Add Platform.isAArch64(). Use it in mathexact intrinsic tests. Reviewed-by: kvn, roland
hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java file | annotate | diff | comparison | revisions
hotspot/test/testlibrary/jdk/test/lib/Platform.java file | annotate | diff | comparison | revisions
hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java file | annotate | diff | comparison | revisions 
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java	Tue May 19 16:05:12 2015 +0200
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java	Wed May 20 10:21:02 2015 +0100
@@ -129,7 +129,8 @@
 
         @Override
         protected boolean isIntrinsicSupported() {
-            return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) && (Platform.isX86() || Platform.isX64());
+            return isServerVM() && Boolean.valueOf(useMathExactIntrinsics)
+                && (Platform.isX86() || Platform.isX64() || Platform.isAArch64());
         }
 
         @Override
@@ -146,7 +147,7 @@
         @Override
         protected boolean isIntrinsicSupported() {
             return isServerVM() && Boolean.valueOf(useMathExactIntrinsics) &&
-                (Platform.isX64() || Platform.isPPC());
+                (Platform.isX64() || Platform.isPPC() || Platform.isAArch64());
         }
 
         @Override
--- a/hotspot/test/testlibrary/jdk/test/lib/Platform.java	Tue May 19 16:05:12 2015 +0200
+++ b/hotspot/test/testlibrary/jdk/test/lib/Platform.java	Wed May 20 10:21:02 2015 +0100
@@ -132,6 +132,10 @@
         return isArch("(amd64)|(x86_64)");
     }
 
+    public static boolean isAArch64() {
+        return isArch("aarch64");
+    }
+
     private static boolean isArch(String archnameRE) {
         return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
                 .matcher(osArch)
--- a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Tue May 19 16:05:12 2015 +0200
+++ b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java	Wed May 20 10:21:02 2015 +0100
@@ -45,7 +45,7 @@
  */
 public class TestMutuallyExclusivePlatformPredicates {
     private static enum MethodGroup {
-        ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64"),
+        ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64", "isAArch64"),
         BITNESS("is32bit", "is64bit"),
         OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"),
         VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero"),
jdk-sandbox