[ARM] add Armv9 build attribute

[stuij]

Summary

The build attribute number can be found in the Arm ABI addenda32 document:
https://github.com/ARM-software/abi-aa/blob/main/addenda32/addenda32.rst#335target-related-attributes

[tmatheson]

llvm/lib/Support/ARMAttributeParser.cpp

90

Should this be ARM v9a?

Starting with architecture versions v8-A, v8-R and v8-M, the profile is represented by Tag_CPU_arch. For these architecture versions and any later versions, a value of 0 should be used for Tag_CPU_arch_profile.

[stuij]

addressing review comment

[stuij]

llvm/lib/Support/ARMAttributeParser.cpp

90

thanks! fixed.

llvm/include/llvm/Support/ARMBuildAttributes.h

enum AttrType : unsigned {
   ABI_align8_preserved = 25, // renamed to ABI_align_preserved (ABI r2.09)
   nodefaults = 64,           // deprecated (ABI r2.09)
   T2EE_use = 66,             // deprecated (ABI r2.09)
   MPextension_use_old = 70   // recoded to MPextension_use (ABI r2.08)
 };
 
 // Legal Values for CPU_arch, (=6), uleb128
 enum CPUArch {
-  Pre_v4   = 0,
-  v4       = 1,   // e.g. SA110
-  v4T      = 2,   // e.g. ARM7TDMI
-  v5T      = 3,   // e.g. ARM9TDMI
-  v5TE     = 4,   // e.g. ARM946E_S
-  v5TEJ    = 5,   // e.g. ARM926EJ_S
-  v6       = 6,   // e.g. ARM1136J_S
-  v6KZ     = 7,   // e.g. ARM1176JZ_S
-  v6T2     = 8,   // e.g. ARM1156T2_S
-  v6K      = 9,   // e.g. ARM1176JZ_S
-  v7       = 10,  // e.g. Cortex A8, Cortex M3
-  v6_M     = 11,  // e.g. Cortex M1
-  v6S_M    = 12,  // v6_M with the System extensions
-  v7E_M    = 13,  // v7_M with DSP extensions
-  v8_A     = 14,  // v8_A AArch32
-  v8_R     = 15,  // e.g. Cortex R52
-  v8_M_Base= 16,  // v8_M_Base AArch32
-  v8_M_Main= 17,  // v8_M_Main AArch32
-  v8_1_M_Main=21, // v8_1_M_Main AArch32
+  Pre_v4 = 0,
+  v4 = 1,           // e.g. SA110
+  v4T = 2,          // e.g. ARM7TDMI
+  v5T = 3,          // e.g. ARM9TDMI
+  v5TE = 4,         // e.g. ARM946E_S
+  v5TEJ = 5,        // e.g. ARM926EJ_S
+  v6 = 6,           // e.g. ARM1136J_S
+  v6KZ = 7,         // e.g. ARM1176JZ_S
+  v6T2 = 8,         // e.g. ARM1156T2_S
+  v6K = 9,          // e.g. ARM1176JZ_S
+  v7 = 10,          // e.g. Cortex A8, Cortex M3
+  v6_M = 11,        // e.g. Cortex M1
+  v6S_M = 12,       // v6_M with the System extensions
+  v7E_M = 13,       // v7_M with DSP extensions
+  v8_A = 14,        // v8_A AArch32
+  v8_R = 15,        // e.g. Cortex R52
+  v8_M_Base = 16,   // v8_M_Base AArch32
+  v8_M_Main = 17,   // v8_M_Main AArch32
+  v8_1_M_Main = 21, // v8_1_M_Main AArch32
+  v9_A = 22,        // v9_A AArch32
 };
 
 enum CPUArchProfile {               // (=7), uleb128
   Not_Applicable          = 0,      // pre v7, or cross-profile code
   ApplicationProfile      = (0x41), // 'A' (e.g. for Cortex A8)
   RealTimeProfile         = (0x52), // 'R' (e.g. for Cortex R4)
   MicroControllerProfile  = (0x4D), // 'M' (e.g. for Cortex M3)
   SystemProfile           = (0x53)  // 'S' Application or real-time profile

llvm/include/llvm/Support/ARMTargetParser.def

ARM_ARCH("armv8.7-a", ARMV8_7A, "8.7-A", "v8.7a",
           ARM::AEK_DOTPROD    | ARM::AEK_BF16 | ARM::AEK_I8MM))
 ARM_ARCH("armv8.8-a", ARMV8_8A, "8.8-A", "v8.8a",
          ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
          (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
           ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
           ARM::AEK_DOTPROD | ARM::AEK_BF16 | ARM::AEK_SHA2 | ARM::AEK_AES |
           ARM::AEK_I8MM))
 ARM_ARCH("armv9-a", ARMV9A, "9-A", "v9a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_NEON_FP_ARMV8,
+         ARMBuildAttrs::CPUArch::v9_A, FK_NEON_FP_ARMV8,
          (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
           ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
           ARM::AEK_DOTPROD))
 ARM_ARCH("armv9.1-a", ARMV9_1A, "9.1-A", "v9.1a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_NEON_FP_ARMV8,
+         ARMBuildAttrs::CPUArch::v9_A, FK_NEON_FP_ARMV8,
          (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
           ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
           ARM::AEK_DOTPROD | ARM::AEK_BF16 | ARM::AEK_I8MM))
 ARM_ARCH("armv9.2-a", ARMV9_2A, "9.2-A", "v9.2a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_NEON_FP_ARMV8,
+         ARMBuildAttrs::CPUArch::v9_A, FK_NEON_FP_ARMV8,
          (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
           ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
           ARM::AEK_DOTPROD | ARM::AEK_BF16 | ARM::AEK_I8MM))
 ARM_ARCH("armv9.3-a", ARMV9_3A, "9.3-A", "v9.3a",
-         ARMBuildAttrs::CPUArch::v8_A, FK_CRYPTO_NEON_FP_ARMV8,
+         ARMBuildAttrs::CPUArch::v9_A, FK_CRYPTO_NEON_FP_ARMV8,
          (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM |
           ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP | ARM::AEK_CRC | ARM::AEK_RAS |
           ARM::AEK_DOTPROD | ARM::AEK_BF16 | ARM::AEK_I8MM))
 ARM_ARCH("armv8-r", ARMV8R, "8-R", "v8r", ARMBuildAttrs::CPUArch::v8_R,
           FK_NEON_FP_ARMV8,
           (ARM::AEK_MP | ARM::AEK_VIRT | ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB |
            ARM::AEK_DSP | ARM::AEK_CRC))
 ARM_ARCH("armv8-m.base", ARMV8MBaseline, "8-M.Baseline", "v8m.base",

llvm/lib/Object/ELFObjectFile.cpp

case ARMBuildAttrs::v8_M_Base:
       Triple += "v8m.base";
       break;
     case ARMBuildAttrs::v8_M_Main:
       Triple += "v8m.main";
       break;
     case ARMBuildAttrs::v8_1_M_Main:
       Triple += "v8.1m.main";
       break;
+    case ARMBuildAttrs::v9_A:
+      Triple += "v9a";
+      break;
     }
   }
   if (!isLittleEndian())
     Triple += "eb";
 
   TheTriple.setArchName(Triple);
 }
 

llvm/lib/Support/ARMAttributeParser.cpp

 }
 
 Error ARMAttributeParser::CPU_arch(AttrType tag) {
   static const char *strings[] = {
     "Pre-v4", "ARM v4", "ARM v4T", "ARM v5T", "ARM v5TE", "ARM v5TEJ", "ARM v6",
     "ARM v6KZ", "ARM v6T2", "ARM v6K", "ARM v7", "ARM v6-M", "ARM v6S-M",
     "ARM v7E-M", "ARM v8", nullptr,
     "ARM v8-M Baseline", "ARM v8-M Mainline", nullptr, nullptr, nullptr,
-    "ARM v8.1-M Mainline"
+    "ARM v8.1-M Mainline", "ARM v9"
   };
   return parseStringAttribute("CPU_arch", tag, makeArrayRef(strings));
 }
 
 Error ARMAttributeParser::CPU_arch_profile(AttrType tag) {
   uint64_t value = de.getULEB128(cursor);
 
   StringRef profile;

llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp

 void
 ARMTargetStreamer::AnnotateTLSDescriptorSequence(const MCSymbolRefExpr *SRE) {}
 void ARMTargetStreamer::emitThumbSet(MCSymbol *Symbol, const MCExpr *Value) {}
 
 static ARMBuildAttrs::CPUArch getArchForCPU(const MCSubtargetInfo &STI) {
   if (STI.getCPU() == "xscale")
     return ARMBuildAttrs::v5TEJ;
 
-  if (STI.hasFeature(ARM::HasV8Ops)) {
+  if (STI.hasFeature(ARM::HasV9_0aOps))
+    return ARMBuildAttrs::v9_A;
+  else if (STI.hasFeature(ARM::HasV8Ops)) {
     if (STI.hasFeature(ARM::FeatureRClass))
       return ARMBuildAttrs::v8_R;
     return ARMBuildAttrs::v8_A;
   } else if (STI.hasFeature(ARM::HasV8_1MMainlineOps))
     return ARMBuildAttrs::v8_1_M_Main;
   else if (STI.hasFeature(ARM::HasV8MMainlineOps))
     return ARMBuildAttrs::v8_M_Main;
   else if (STI.hasFeature(ARM::HasV7Ops)) {

llvm/unittests/Support/ARMAttributeParser.cpp

 
 bool testTagString(unsigned Tag, const char *name) {
   return ELFAttrs::attrTypeAsString(Tag, ARMBuildAttrs::getARMAttributeTags())
              .str() == name;
 }
 
 TEST(ARMAttributeParser, UnknownCPU_arch) {
   static const uint8_t bytes[] = {'A', 15, 0, 0, 0, 'a', 'e', 'a', 'b',
-                                  'i', 0,  1, 7, 0, 0,   0,   6,   22};
-  testParseError(bytes, "unknown CPU_arch value: 22");
+                                  'i', 0,  1, 7, 0, 0,   0,   6,   23};
+  testParseError(bytes, "unknown CPU_arch value: 23");
 }
 
 TEST(CPUArchBuildAttr, testBuildAttr) {
   EXPECT_TRUE(testTagString(6, "Tag_CPU_arch"));
 
   EXPECT_TRUE(testBuildAttr(6, 0, ARMBuildAttrs::CPU_arch,
                             ARMBuildAttrs::Pre_v4));
   EXPECT_TRUE(testBuildAttr(6, 1, ARMBuildAttrs::CPU_arch,
TEST(CPUArchBuildAttr, testBuildAttr) {
   EXPECT_TRUE(testBuildAttr(6, 15, ARMBuildAttrs::CPU_arch,
                                ARMBuildAttrs::v8_R));
   EXPECT_TRUE(testBuildAttr(6, 16, ARMBuildAttrs::CPU_arch,
                                ARMBuildAttrs::v8_M_Base));
   EXPECT_TRUE(testBuildAttr(6, 17, ARMBuildAttrs::CPU_arch,
                                ARMBuildAttrs::v8_M_Main));
   EXPECT_TRUE(testBuildAttr(6, 21, ARMBuildAttrs::CPU_arch,
                                ARMBuildAttrs::v8_1_M_Main));
+  EXPECT_TRUE(testBuildAttr(6, 22, ARMBuildAttrs::CPU_arch,
+                               ARMBuildAttrs::v9_A));
+
 }
 
 TEST(CPUArchProfileBuildAttr, testBuildAttr) {
   EXPECT_TRUE(testTagString(7, "Tag_CPU_arch_profile"));
   EXPECT_TRUE(testBuildAttr(7, 'A', ARMBuildAttrs::CPU_arch_profile,
                                ARMBuildAttrs::ApplicationProfile));
   EXPECT_TRUE(testBuildAttr(7, 'R', ARMBuildAttrs::CPU_arch_profile,
                                ARMBuildAttrs::RealTimeProfile));

llvm/unittests/Support/TargetParserTest.cpp

EXPECT_TRUE(
                           ARMBuildAttrs::CPUArch::v8_A));
   EXPECT_TRUE(
       testARMArch("armv8.7-a", "generic", "v8.7a",
                           ARMBuildAttrs::CPUArch::v8_A));
   EXPECT_TRUE(testARMArch("armv8.8-a", "generic", "v8.8a",
                           ARMBuildAttrs::CPUArch::v8_A));
   EXPECT_TRUE(
       testARMArch("armv9-a", "generic", "v9a",
-                          ARMBuildAttrs::CPUArch::v8_A));
+                          ARMBuildAttrs::CPUArch::v9_A));
   EXPECT_TRUE(
       testARMArch("armv9.1-a", "generic", "v9.1a",
-                          ARMBuildAttrs::CPUArch::v8_A));
+                          ARMBuildAttrs::CPUArch::v9_A));
   EXPECT_TRUE(
       testARMArch("armv9.2-a", "generic", "v9.2a",
-                          ARMBuildAttrs::CPUArch::v8_A));
+                          ARMBuildAttrs::CPUArch::v9_A));
+  EXPECT_TRUE(
+      testARMArch("armv9.3-a", "generic", "v9.3a",
+                          ARMBuildAttrs::CPUArch::v9_A));
   EXPECT_TRUE(
       testARMArch("armv8-r", "cortex-r52", "v8r",
                           ARMBuildAttrs::CPUArch::v8_R));
   EXPECT_TRUE(
       testARMArch("armv8-m.base", "generic", "v8m.base",
                           ARMBuildAttrs::CPUArch::v8_M_Base));
   EXPECT_TRUE(
       testARMArch("armv8-m.main", "generic", "v8m.main",