[GR-20608] Set UseBranchesWithin32ByteBoundary accordingly.

PullRequest: graal/5273

Author: mur47x111

compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java

@@ -107,7 +107,8 @@ public class AMD64Assembler extends AMD64BaseAssembler {
     public static class Options {
         // @formatter:off
         @Option(help = "Force branch instructions to align with 32-bytes boundary, to mitigate the jcc erratum. " +
-                "See https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf for more details.", type = OptionType.User)
+                "See https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf for more details. " +
+                "If not set explicitly, the default value will be determined according to the CPU model.", type = OptionType.User)
         public static final OptionKey<Boolean> UseBranchesWithin32ByteBoundary = new OptionKey<>(false);
         // @formatter:on
     }
@@ -120,19 +121,28 @@ public interface CodePatchShifter {
 
     protected CodePatchShifter codePatchShifter = null;
 
+    /**
+     * Constructs an assembler for the AMD64 architecture.
+     */
     public AMD64Assembler(TargetDescription target) {
         super(target);
         useBranchesWithin32ByteBoundary = false;
     }
 
-    /**
-     * Constructs an assembler for the AMD64 architecture.
-     */
     public AMD64Assembler(TargetDescription target, OptionValues optionValues) {
         super(target);
         useBranchesWithin32ByteBoundary = Options.UseBranchesWithin32ByteBoundary.getValue(optionValues);
     }
 
+    public AMD64Assembler(TargetDescription target, OptionValues optionValues, boolean hasIntelJccErratum) {
+        super(target);
+        if (Options.UseBranchesWithin32ByteBoundary.hasBeenSet(optionValues)) {
+            useBranchesWithin32ByteBoundary = Options.UseBranchesWithin32ByteBoundary.getValue(optionValues);
+        } else {
+            useBranchesWithin32ByteBoundary = hasIntelJccErratum;
+        }
+    }
+
     public void setCodePatchShifter(CodePatchShifter codePatchShifter) {
         assert this.codePatchShifter == null : "overwriting existing value";
         this.codePatchShifter = codePatchShifter;

compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java

@@ -63,6 +63,10 @@ public AMD64MacroAssembler(TargetDescription target, OptionValues optionValues)
         super(target, optionValues);
     }
 
+    public AMD64MacroAssembler(TargetDescription target, OptionValues optionValues, boolean hasIntelJccErratum) {
+        super(target, optionValues, hasIntelJccErratum);
+    }
+
     public final void decrementq(Register reg, int value) {
         if (value == Integer.MIN_VALUE) {
             subq(reg, value);

compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java

@@ -217,7 +217,7 @@ public CompilationResultBuilder newCompilationResultBuilder(LIRGenerationResult
                         !((AMD64FrameMap) frameMap).useStandardFrameProlog();
 
         Stub stub = gen.getStub();
-        AMD64MacroAssembler masm = new AMD64MacroAssembler(getTarget(), options);
+        AMD64MacroAssembler masm = new AMD64MacroAssembler(getTarget(), options, config.CPU_HAS_INTEL_JCC_ERRATUM);
         masm.setCodePatchShifter(compilationResult::shiftCodePatch);
         HotSpotFrameContext frameContext = new HotSpotFrameContext(stub != null, omitFrame, config.preserveFramePointer);
         DataBuilder dataBuilder = new HotSpotDataBuilder(getCodeCache().getTarget());

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java

@@ -897,6 +897,9 @@ private boolean checkNullAllocationStubs() {
     public final int MARKID_CARD_TABLE_ADDRESS = getConstant("CodeInstaller::CARD_TABLE_ADDRESS", Integer.class);
     public final int MARKID_INVOKE_INVALID = getConstant("CodeInstaller::INVOKE_INVALID", Integer.class);
 
+    public final boolean CPU_HAS_INTEL_JCC_ERRATUM = getFieldValue("VM_Version::_has_intel_jcc_erratum", Boolean.class, "bool",
+                    true, "amd64".equals(osArch) && (JVMCI ? jvmciGE(JVMCI_20_1_b01) : JDK >= 15));
+
     /**
      * The following constants are given default values here since they are missing in the native
      * JVMCI-8 code but are still required for {@link GraalHotSpotVMConfigNode#canonical} to work in