From 9dbf60065bbc841d1eea360719c6c666f39d35d3 Mon Sep 17 00:00:00 2001
Date: Fri, 22 Jan 2021 11:29:27 +0800
Subject: disable UseLSE on ARMv8.1 by default

Summary: <UseLSE>: disable UseLSE by default and set UseLSE to
experimental
LLT: java -XX:+UnlockExperimentalVMOptions -XX:+PrintFlagsFinal
Bug url: NA
---
 hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp    | 2 +-
 hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp
index 8cdd5c498..e0749ff80 100644
--- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp
@@ -87,7 +87,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use Neon for CRC32 computation")                             \
   product(bool, UseCRC32, false,                                        \
           "Use CRC32 instructions for CRC32 computation")               \
-  product(bool, UseLSE, false,                                          \
+  experimental(bool, UseLSE, false,                                     \
           "Use LSE instructions")                                       \
   product(bool, UseSIMDForMemoryOps, false,                            \
           "Use SIMD instructions in generated memory move code")        \
diff --git a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
index 0bd2e0a54..78e6f1144 100644
--- a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp
@@ -202,10 +202,11 @@ void VM_Version::get_processor_features() {
 
   if (auxv & HWCAP_ATOMICS) {
     if (FLAG_IS_DEFAULT(UseLSE))
-      FLAG_SET_DEFAULT(UseLSE, true);
+      FLAG_SET_DEFAULT(UseLSE, false);
   } else {
     if (UseLSE) {
       warning("UseLSE specified, but not supported on this CPU");
+      FLAG_SET_DEFAULT(UseLSE, false);
     }
   }
 
-- 
2.19.0