changeset 52590:c6b63df2765f

8213794: ARM32: disable TypeProfiling, CriticalJNINatives, Serviceablity tests for ARM32 Reviewed-by: dholmes
author bulasevich
date Fri, 16 Nov 2018 19:29:40 +0300
parents bd96a1bd01ca
children 82d1cc4ac90c
files src/hotspot/cpu/arm/vm_version_arm_32.cpp test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java test/lib/jdk/test/lib/Platform.java
diffstat 5 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp	Fri Nov 16 19:29:20 2018 +0300
+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp	Fri Nov 16 19:29:40 2018 +0300
@@ -294,6 +294,9 @@
     Tier3MinInvocationThreshold = 500;
   }
 
+  UNSUPPORTED_OPTION(TypeProfileLevel);
+  UNSUPPORTED_OPTION(CriticalJNINatives);
+
   FLAG_SET_DEFAULT(TypeProfileLevel, 0); // unsupported
 
   // This machine does not allow unaligned memory accesses
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java	Fri Nov 16 19:29:20 2018 +0300
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java	Fri Nov 16 19:29:40 2018 +0300
@@ -25,6 +25,7 @@
   * @test
   * @bug 8189439
   * @summary Parameters type profiling is not performed from aarch64 interpreter
+  * @requires os.arch != "arm"
   * @requires vm.flavor == "server" & vm.compMode == "Xmixed" & !vm.emulatedClient & !vm.graal.enabled
   * @library /test/lib /
   * @build sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java	Fri Nov 16 19:29:20 2018 +0300
+++ b/test/hotspot/jtreg/compiler/runtime/criticalnatives/argumentcorruption/CheckLongArgs.java	Fri Nov 16 19:29:40 2018 +0300
@@ -24,7 +24,7 @@
 
 /* @test
  * @bug 8167409
- * @requires os.arch != "aarch64"
+ * @requires (os.arch != "aarch64") & (os.arch != "arm")
  * @run main/othervm/native -Xcomp -XX:+CriticalJNINatives compiler.runtime.criticalnatives.argumentcorruption.CheckLongArgs
  */
 package compiler.runtime.criticalnatives.argumentcorruption;
--- a/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java	Fri Nov 16 19:29:20 2018 +0300
+++ b/test/hotspot/jtreg/compiler/runtime/criticalnatives/lookup/LookUp.java	Fri Nov 16 19:29:40 2018 +0300
@@ -24,7 +24,7 @@
 
 /* @test
  * @bug 8167408
- * @requires os.arch != "aarch64"
+ * @requires (os.arch != "aarch64") & (os.arch != "arm")
  * @run main/othervm/native -Xcomp -XX:+CriticalJNINatives compiler.runtime.criticalnatives.lookup.LookUp
  */
 package compiler.runtime.criticalnatives.lookup;
--- a/test/lib/jdk/test/lib/Platform.java	Fri Nov 16 19:29:20 2018 +0300
+++ b/test/lib/jdk/test/lib/Platform.java	Fri Nov 16 19:29:40 2018 +0300
@@ -224,7 +224,7 @@
         if (isAix()) {
             return false; // SA not implemented.
         } else if (isLinux()) {
-            if (isS390x()) {
+            if (isS390x() || isARM()) {
                 return false; // SA not implemented.
             }
         }