[llvm] [ARM][MC] Add support for Armv8.1-M Mainline to '.arch' asm directive (PR #135184)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-arm

Author: None (bizetthost)

<details>
<summary>Changes</summary>

Armv8.1-M Mainline architecture is supported by Clang's driver & LLVM's ARM backend, but MC would report an 'Unknown Arch: armv8.1-m.main' error when processing '.arch armv8.1-m.main' assembler directives.

---
Full diff: https://github.com/llvm/llvm-project/pull/135184.diff


3 Files Affected:

- (modified) llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp (+1) 
- (added) llvm/test/MC/ARM/directive-arch-armv8.1-m.s (+33) 
- (added) llvm/test/MC/ARM/directive-arch-armv8.1m.s (+33) 


``````````diff
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
index 85c5442fb7d91..3d45ecf72cc73 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
@@ -911,6 +911,7 @@ void ARMTargetELFStreamer::emitArchDefaultAttributes() {
 
   case ARM::ArchKind::ARMV8MBaseline:
   case ARM::ArchKind::ARMV8MMainline:
+  case ARM::ArchKind::ARMV8_1MMainline:
     S.setAttributeItem(THUMB_ISA_use, AllowThumbDerived, false);
     S.setAttributeItem(CPU_arch_profile, MicroControllerProfile, false);
     break;
diff --git a/llvm/test/MC/ARM/directive-arch-armv8.1-m.s b/llvm/test/MC/ARM/directive-arch-armv8.1-m.s
new file mode 100644
index 0000000000000..0718d76b562c7
--- /dev/null
+++ b/llvm/test/MC/ARM/directive-arch-armv8.1-m.s
@@ -0,0 +1,33 @@
+@ Test the .arch directive for armv8.1-m.main
+
+@ This test case will check the default .ARM.attributes value for the
+@ armv8.1-m.main architecture.
+
+@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
+@ RUN:   | FileCheck %s -check-prefix CHECK-ASM
+@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s -check-prefix CHECK-ATTR
+
+	.syntax	unified
+	.arch	armv8.1-m.main
+
+@ CHECK-ASM: 	.arch	armv8.1-m.main
+
+@ CHECK-ATTR: FileAttributes {
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_name
+@ CHECK-ATTR:     Value: 8.1-M.Mainline
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_arch
+@ CHECK-ATTR:     Description: ARM v8.1-M Mainline
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_arch_profile
+@ CHECK-ATTR:     Description: Microcontroller
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: THUMB_ISA_use
+@ CHECK-ATTR:     Description: Permitted
+@ CHECK-ATTR:   }
+@ CHECK-ATTR: }
diff --git a/llvm/test/MC/ARM/directive-arch-armv8.1m.s b/llvm/test/MC/ARM/directive-arch-armv8.1m.s
new file mode 100644
index 0000000000000..c63ee0b585ac7
--- /dev/null
+++ b/llvm/test/MC/ARM/directive-arch-armv8.1m.s
@@ -0,0 +1,33 @@
+@ Test the .arch directive for armv8.1-m.main
+
+@ This test case will check the default .ARM.attributes value for the
+@ armv8.1-m.main architecture when using the armv8.1m.main alias.
+
+@ RUN: llvm-mc -triple arm-eabi -filetype asm %s \
+@ RUN:   | FileCheck %s -check-prefix CHECK-ASM
+@ RUN: llvm-mc -triple arm-eabi -filetype obj %s \
+@ RUN:   | llvm-readobj --arch-specific - | FileCheck %s -check-prefix CHECK-ATTR
+
+	.syntax	unified
+	.arch	armv8.1m.main
+
+@ CHECK-ASM: 	.arch	armv8.1-m.main
+
+@ CHECK-ATTR: FileAttributes {
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_name
+@ CHECK-ATTR:     Value: 8.1-M.Mainline
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_arch
+@ CHECK-ATTR:     Description: ARM v8.1-M Mainline
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: CPU_arch_profile
+@ CHECK-ATTR:     Description: Microcontroller
+@ CHECK-ATTR:   }
+@ CHECK-ATTR:   Attribute {
+@ CHECK-ATTR:     TagName: THUMB_ISA_use
+@ CHECK-ATTR:     Description: Permitted
+@ CHECK-ATTR:   }
+@ CHECK-ATTR: }

``````````

</details>


https://github.com/llvm/llvm-project/pull/135184