Add JVMCI support for APX EGPRs

Author: mur47x111

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java

@@ -24,12 +24,12 @@
 
 import java.nio.ByteOrder;
 import java.util.EnumSet;
+import java.util.List;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CPUFeatureName;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -92,7 +92,7 @@ public class AArch64 extends Architecture {
     public static final Register rscratch2 = r9;
 
     // @formatter:off
-    public static final RegisterArray cpuRegisters = new RegisterArray(
+    public static final List<Register> cpuRegisters = List.of(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
@@ -138,7 +138,7 @@ public class AArch64 extends Architecture {
     public static final Register v31 = new Register(65, 31, "v31", SIMD);
 
     // @formatter:off
-    public static final RegisterArray simdRegisters = new RegisterArray(
+    public static final List<Register> simdRegisters = List.of(
         v0,  v1,  v2,  v3,  v4,  v5,  v6,  v7,
         v8,  v9,  v10, v11, v12, v13, v14, v15,
         v16, v17, v18, v19, v20, v21, v22, v23,
@@ -147,7 +147,7 @@ public class AArch64 extends Architecture {
     // @formatter:on
 
     // @formatter:off
-    public static final RegisterArray allRegisters = new RegisterArray(
+    public static final List<Register> allRegisters = List.of(
         r0,  r1,  r2,  r3,  r4,  r5,  r6,  r7,
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
@@ -189,34 +189,16 @@ public enum CPUFeature implements CPUFeatureName {
 
     private final EnumSet<CPUFeature> features;
 
-    /**
-     * Set of flags to control code emission.
-     */
-    public enum Flag {
-        UseCRC32,
-        UseSIMDForMemoryOps,
-        AvoidUnalignedAccesses,
-        UseLSE,
-        UseBlockZeroing
-    }
-
-    private final EnumSet<Flag> flags;
-
-    public AArch64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
+    public AArch64(EnumSet<CPUFeature> features) {
         super("aarch64", AArch64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, 0, 0, 0);
         this.features = features;
-        this.flags = flags;
     }
 
     @Override
     public EnumSet<CPUFeature> getFeatures() {
         return features;
     }
 
-    public EnumSet<Flag> getFlags() {
-        return flags;
-    }
-
     @Override
     public PlatformKind getPlatformKind(JavaKind javaKind) {
         switch (javaKind) {

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java

@@ -29,12 +29,12 @@
 
 import java.nio.ByteOrder;
 import java.util.EnumSet;
+import java.util.List;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CPUFeatureName;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.Register.RegisterCategory;
-import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PlatformKind;
 
@@ -91,6 +91,13 @@ public class AMD64 extends Architecture {
         r8, r9, r10, r11, r12, r13, r14, r15
     };
 
+    public static final Register[] cpuRegistersAPX = {
+        rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi,
+         r8,  r9, r10, r11, r12, r13, r14, r15,
+        r16, r17, r18, r19, r20, r21, r22, r23,
+        r24, r25, r26, r27, r28, r29, r30, r31
+    };
+
     public static final RegisterCategory XMM = new RegisterCategory("XMM");
 
     // XMM registers
@@ -153,16 +160,37 @@ public class AMD64 extends Architecture {
     public static final Register k6 = new Register(70, 6, "k6", MASK);
     public static final Register k7 = new Register(71, 7, "k7", MASK);
 
-    public static final RegisterArray valueRegistersSSE = new RegisterArray(
+    public static final List<Register> valueRegistersSSE = List.of(
+        rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
+        r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
+        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
+    );
+
+    public static final List<Register> valueRegistersAVX512 = List.of(
+        rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
+        r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
+        xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
+        xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23,
+        xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31,
+        k0, k1, k2, k3, k4, k5, k6, k7
+    );
+
+    public static final List<Register> valueRegistersSSEAndAPX = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
+        r24,  r25,  r26,   r27,   r28,   r29,   r30,   r31,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15
     );
 
-    public static final RegisterArray valueRegistersAVX512 = new RegisterArray(
+    public static final List<Register> valueRegistersAVX512AndAPX = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
+        r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
+        r24,  r25,  r26,   r27,   r28,   r29,   r30,   r31,
         xmm0, xmm1, xmm2,  xmm3,  xmm4,  xmm5,  xmm6,  xmm7,
         xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15,
         xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23,
@@ -175,7 +203,7 @@ public class AMD64 extends Architecture {
      */
     public static final Register rip = new Register(72, -1, "rip", SPECIAL);
 
-    public static final RegisterArray allRegisters = new RegisterArray(
+    public static final List<Register> allRegisters = List.of(
         rax,  rcx,  rdx,   rbx,   rsp,   rbp,   rsi,   rdi,
         r8,   r9,   r10,   r11,   r12,   r13,   r14,   r15,
         r16,  r17,  r18,   r19,   r20,   r21,   r22,   r23,
@@ -264,24 +292,13 @@ public enum CPUFeature implements CPUFeatureName {
 
     private final EnumSet<CPUFeature> features;
 
-    /**
-     * Set of flags to control code emission.
-     */
-    public enum Flag {
-        UseCountLeadingZerosInstruction,
-        UseCountTrailingZerosInstruction
-    }
-
-    private final EnumSet<Flag> flags;
-
     private final AMD64Kind largestKind;
 
     private final AMD64Kind largestMaskKind;
 
-    public AMD64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) {
+    public AMD64(EnumSet<CPUFeature> features) {
         super("AMD64", AMD64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, LOAD_LOAD | LOAD_STORE | STORE_STORE, 1, 8);
         this.features = features;
-        this.flags = flags;
         assert features.contains(CPUFeature.SSE2) : "minimum config for x64";
 
         if (features.contains(CPUFeature.AVX512F)) {
@@ -305,13 +322,15 @@ public EnumSet<CPUFeature> getFeatures() {
         return features;
     }
 
-    public EnumSet<Flag> getFlags() {
-        return flags;
-    }
-
     @Override
-    public RegisterArray getAvailableValueRegisters() {
-        if (features.contains(CPUFeature.AVX512F)) {
+    public List<Register> getAvailableValueRegisters() {
+        if (features.contains(CPUFeature.APX_F)) {
+            if (features.contains(CPUFeature.AVX512F)) {
+                return valueRegistersAVX512AndAPX;
+            } else {
+                return valueRegistersSSEAndAPX;
+            }
+        } else if (features.contains(CPUFeature.AVX512F)) {
             return valueRegistersAVX512;
         } else {
             return valueRegistersSSE;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 package jdk.vm.ci.code;
 
 import java.nio.ByteOrder;
+import java.util.List;
 import java.util.Set;
 
 import jdk.vm.ci.code.Register.RegisterCategory;
@@ -50,7 +51,7 @@ public abstract class Architecture {
      * List of all available registers on this architecture. The index of each register in this list
      * is equal to its {@linkplain Register#number number}.
      */
-    private final RegisterArray registers;
+    private final List<Register> registers;
 
     /**
      * The byte ordering can be either little or big endian.
@@ -79,7 +80,7 @@ public abstract class Architecture {
      */
     private final int returnAddressSize;
 
-    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, RegisterArray registers, int implicitMemoryBarriers,
+    protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder, boolean unalignedMemoryAccess, List<Register> registers, int implicitMemoryBarriers,
                     int nativeCallDisplacementOffset,
                     int returnAddressSize) {
         // registers is expected to mention all registers in order of their encoding.
@@ -144,15 +145,15 @@ public String getName() {
      * this particular architecture instance. The index of each register in this list is equal to
      * its {@linkplain Register#number number}.
      */
-    public RegisterArray getRegisters() {
+    public List<Register> getRegisters() {
         return registers;
     }
 
     /**
      * Gets a list of all registers available for storing values on this architecture. This may be a
      * subset of {@link #getRegisters()}, depending on the capabilities of this particular CPU.
      */
-    public RegisterArray getAvailableValueRegisters() {
+    public List<Register> getAvailableValueRegisters() {
         return getRegisters();
     }
 

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/RegisterArray.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,11 +55,11 @@ public RegisterAttributes(boolean isCallerSave, boolean isCalleeSave, boolean is
      * @return an array whose length is the max register number in {@code registers} plus 1. An
      *         element at index i holds the attributes of the register whose number is i.
      */
-    public static RegisterAttributes[] createMap(RegisterConfig registerConfig, RegisterArray registers) {
+    public static RegisterAttributes[] createMap(RegisterConfig registerConfig, List<Register> registers) {
         RegisterAttributes[] map = new RegisterAttributes[registers.size()];
-        List<Register> callerSaveRegisters = registerConfig.getCallerSaveRegisters().asList();
-        List<Register> calleeSaveRegisters = registerConfig.getCalleeSaveRegisters() == null ? Collections.emptyList() : registerConfig.getCalleeSaveRegisters().asList();
-        List<Register> allocatableRegisters = registerConfig.getAllocatableRegisters().asList();
+        List<Register> callerSaveRegisters = registerConfig.getCallerSaveRegisters();
+        List<Register> calleeSaveRegisters = registerConfig.getCalleeSaveRegisters() == null ? Collections.emptyList() : registerConfig.getCalleeSaveRegisters();
+        List<Register> allocatableRegisters = registerConfig.getAllocatableRegisters();
         for (Register reg : registers) {
             if (reg != null) {
                 RegisterAttributes attr = new RegisterAttributes(callerSaveRegisters.contains(reg), calleeSaveRegisters.contains(reg), allocatableRegisters.contains(reg));