Backport 89ee1a5517ea1e3915f4362ada3d2086b63c107e

duke · duke · commit 95af7c83e53f · 2025-02-12T02:56:20.000Z
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -158,6 +158,10 @@ void VM_Version::initialize() {
     if (FLAG_IS_DEFAULT(OnSpinWaitInstCount)) {
       FLAG_SET_DEFAULT(OnSpinWaitInstCount, 2);
     }
+    if (FLAG_IS_DEFAULT(CodeEntryAlignment) &&
+        (_model == CPU_MODEL_AMPERE_1A || _model == CPU_MODEL_AMPERE_1B)) {
+      FLAG_SET_DEFAULT(CodeEntryAlignment, 32);
+    }
   }
 
   // ThunderX

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,10 @@ void VM_Version::initialize() {`
`158`	`158`	`if (FLAG_IS_DEFAULT(OnSpinWaitInstCount)) {`
`159`	`159`	`FLAG_SET_DEFAULT(OnSpinWaitInstCount, 2);`
`160`	`160`	`}`
	`161`	`+ if (FLAG_IS_DEFAULT(CodeEntryAlignment) &&`
	`162`	`+ (_model == CPU_MODEL_AMPERE_1A \|\| _model == CPU_MODEL_AMPERE_1B)) {`
	`163`	`+ FLAG_SET_DEFAULT(CodeEntryAlignment, 32);`
	`164`	`+ }`
`161`	`165`	`}`
`162`	`166`
`163`	`167`	`// ThunderX`