[AArch64][SME] Implement inline-asm clobbers for za/zt0 #79276

MDevereau · 2024-01-24T11:27:22Z

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here:
ARM-software/acle#276

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here: ARM-software/acle#276

github-actions · 2024-01-24T11:29:58Z

✅ With the latest revision this PR passed the C/C++ code formatter.

sdesmalen-arm · 2024-02-01T08:31:01Z

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

@@ -10702,6 +10702,14 @@ AArch64TargetLowering::getRegForInlineAsmConstraint(
      parseConstraintCode(Constraint) != AArch64CC::Invalid)
    return std::make_pair(unsigned(AArch64::NZCV), &AArch64::CCRRegClass);

+  if (StringRef("{za}").equals_insensitive(Constraint)) {


Suggested change

if (StringRef("{za}").equals_insensitive(Constraint)) {

if (Constraint == "{za}") {

?

sdesmalen-arm · 2024-02-01T08:31:50Z

llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp

@@ -507,6 +507,10 @@ bool AArch64RegisterInfo::isAsmClobberable(const MachineFunction &MF,
        MCRegisterInfo::regsOverlap(PhysReg, AArch64::X16))
    return true;

+  // ZA/ZT0 registers are reserved but may be permitted in the clobber list.
+  if (PhysReg.id() == AArch64::ZA || PhysReg.id() == AArch64::ZT0)


Suggested change

if (PhysReg.id() == AArch64::ZA || PhysReg.id() == AArch64::ZT0)

if (PhysReg == AArch64::ZA || PhysReg == AArch64::ZT0)

sdesmalen-arm · 2024-02-01T08:32:48Z

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

+    return std::make_pair(unsigned(AArch64::ZA), &AArch64::MPRRegClass);
+  }
+
+  if (StringRef("{zt0}").equals_insensitive(Constraint)) {


Suggested change

if (StringRef("{zt0}").equals_insensitive(Constraint)) {

if (Constraint == "{zt0}") {

?

sdesmalen-arm

LGTM!

llvmbot · 2024-02-01T11:06:52Z

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-backend-aarch64

Author: Matthew Devereau (MDevereau)

Changes

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here:
ARM-software/acle#276

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

5 Files Affected:

(modified) clang/lib/Basic/Targets/AArch64.cpp (+8-1)
(modified) clang/test/CodeGen/aarch64-inline-asm.c (+8)
(modified) llvm/lib/Target/AArch64/AArch64ISelLowering.cpp (+8)
(modified) llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp (+4)
(added) llvm/test/CodeGen/AArch64/aarch64-za-clobber.ll (+16)

diff --git a/clang/lib/Basic/Targets/AArch64.cpp b/clang/lib/Basic/Targets/AArch64.cpp
index d47181bfca4fc..dbf0fdad15dc8 100644
--- a/clang/lib/Basic/Targets/AArch64.cpp
+++ b/clang/lib/Basic/Targets/AArch64.cpp
@@ -1164,6 +1164,8 @@ TargetInfo::BuiltinVaListKind AArch64TargetInfo::getBuiltinVaListKind() const {
 }
 
 const char *const AArch64TargetInfo::GCCRegNames[] = {
+    // clang-format off
+
     // 32-bit Integer registers
     "w0", "w1", "w2", "w3", "w4", "w5", "w6", "w7", "w8", "w9", "w10", "w11",
     "w12", "w13", "w14", "w15", "w16", "w17", "w18", "w19", "w20", "w21", "w22",
@@ -1200,7 +1202,12 @@ const char *const AArch64TargetInfo::GCCRegNames[] = {
 
     // SVE predicate-as-counter registers
     "pn0",  "pn1",  "pn2",  "pn3",  "pn4",  "pn5",  "pn6",  "pn7",  "pn8",
-    "pn9",  "pn10", "pn11", "pn12", "pn13", "pn14", "pn15"
+    "pn9",  "pn10", "pn11", "pn12", "pn13", "pn14", "pn15",
+
+    // SME registers
+    "za", "zt0",
+
+    // clang-format on
 };
 
 ArrayRef<const char *> AArch64TargetInfo::getGCCRegNames() const {
diff --git a/clang/test/CodeGen/aarch64-inline-asm.c b/clang/test/CodeGen/aarch64-inline-asm.c
index 75e9a8c46b876..8ddee560b11da 100644
--- a/clang/test/CodeGen/aarch64-inline-asm.c
+++ b/clang/test/CodeGen/aarch64-inline-asm.c
@@ -95,3 +95,11 @@ void test_reduced_gpr_constraints(int var32, long var64) {
 // CHECK: [[ARG2:%.+]] = load i64, ptr
 // CHECK: call void asm sideeffect "add x0, x0, $0", "@3Ucj,~{x0}"(i64 [[ARG2]])
 }
+
+void test_sme_constraints(){
+  asm("movt zt0[3, mul vl], z0" : : : "za");
+// CHECK: call void asm sideeffect "movt zt0[3, mul vl], z0", "~{za}"()
+
+  asm("movt zt0[3, mul vl], z0" : : : "zt0");
+// CHECK: call void asm sideeffect "movt zt0[3, mul vl], z0", "~{zt0}"()
+}
\ No newline at end of file
diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
index 332fb37655288..bd757343e1007 100644
--- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -10702,6 +10702,14 @@ AArch64TargetLowering::getRegForInlineAsmConstraint(
       parseConstraintCode(Constraint) != AArch64CC::Invalid)
     return std::make_pair(unsigned(AArch64::NZCV), &AArch64::CCRRegClass);
 
+  if (Constraint == "{za}") {
+    return std::make_pair(unsigned(AArch64::ZA), &AArch64::MPRRegClass);
+  }
+
+  if (Constraint == "{zt0}") {
+    return std::make_pair(unsigned(AArch64::ZT0), &AArch64::ZTRRegClass);
+  }
+
   // Use the default implementation in TargetLowering to convert the register
   // constraint into a member of a register class.
   std::pair<unsigned, const TargetRegisterClass *> Res;
diff --git a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
index ea9882160d6fb..cbb21cd60335e 100644
--- a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
+++ b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
@@ -507,6 +507,10 @@ bool AArch64RegisterInfo::isAsmClobberable(const MachineFunction &MF,
         MCRegisterInfo::regsOverlap(PhysReg, AArch64::X16))
     return true;
 
+  // ZA/ZT0 registers are reserved but may be permitted in the clobber list.
+  if (PhysReg == AArch64::ZA || PhysReg == AArch64::ZT0)
+    return true;
+
   return !isReservedReg(MF, PhysReg);
 }
 
diff --git a/llvm/test/CodeGen/AArch64/aarch64-za-clobber.ll b/llvm/test/CodeGen/AArch64/aarch64-za-clobber.ll
new file mode 100644
index 0000000000000..a8cba7dc9a91e
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/aarch64-za-clobber.ll
@@ -0,0 +1,16 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=aarch64-none-linux-gnu -stop-after=aarch64-isel < %s -o - | FileCheck %s
+
+define void @alpha(<vscale x 4 x i32> %x) local_unnamed_addr {
+entry:
+; CHECK: INLINEASM &"movt zt0[3, mul vl], z0", 1 /* sideeffect attdialect */, 12 /* clobber */, implicit-def early-clobber $za
+  tail call void asm sideeffect "movt zt0[3, mul vl], z0", "~{za}"()
+  ret void
+}
+
+define void @beta(<vscale x 4 x i32> %x) local_unnamed_addr {
+entry:
+; CHECK: INLINEASM &"movt zt0[3, mul vl], z0", 1 /* sideeffect attdialect */, 12 /* clobber */, implicit-def early-clobber $zt0
+  tail call void asm sideeffect "movt zt0[3, mul vl], z0", "~{zt0}"()
+  ret void
+}

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here: ARM-software/acle#276

MDevereau · 2024-02-13T10:54:28Z

/cherry-pick d9c20e4

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here: ARM-software/acle#276 (cherry picked from commit d9c20e4)

llvmbot · 2024-02-13T11:00:22Z

/pull-request #81593

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here: ARM-software/acle#276 (cherry picked from commit d9c20e4)

[AArch64][SME] Implement inline-asm clobbers for za/zt0

e98987e

This enables specifing "za" or "zt0" to the clobber list for inline asm. This complies with the acle SME addition to the asm extension here: ARM-software/acle#276

run clang-format

6391def

MDevereau requested review from sdesmalen-arm, kmclaughlin-arm, SamTebbs33 and dtemirbulatov January 29, 2024 13:24

Disable clang-format for GCCRegNames contents

4beffbf

sdesmalen-arm reviewed Feb 1, 2024

View reviewed changes

Add syntax improvements

9775993

sdesmalen-arm approved these changes Feb 1, 2024

View reviewed changes

MDevereau marked this pull request as ready for review February 1, 2024 11:06

llvmbot added clang Clang issues not falling into any other category backend:AArch64 clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Feb 1, 2024

MDevereau merged commit d9c20e4 into llvm:main Feb 2, 2024
8 of 9 checks passed

MDevereau deleted the za-zt0-constraint branch February 2, 2024 08:12

MDevereau added this to the LLVM 18.X Release milestone Feb 13, 2024

MDevereau added release:backport and removed release:backport labels Feb 13, 2024

MDevereau mentioned this pull request Feb 13, 2024

Backport d9c20e437fe110fb79b5ca73a52762e5b930b361 to release/18.x #81594

Closed

pointhex mentioned this pull request May 7, 2024

getStyleDiagHandler #91314

Closed

aemerson mentioned this pull request May 9, 2024

release/18.x: [AArc64][GlobalISel] Fix legalizer assert for G_INSERT_VECTOR_ELT - manual merge #91672

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AArch64][SME] Implement inline-asm clobbers for za/zt0 #79276

[AArch64][SME] Implement inline-asm clobbers for za/zt0 #79276

MDevereau commented Jan 24, 2024

github-actions bot commented Jan 24, 2024 •

edited

Loading

sdesmalen-arm Feb 1, 2024 •

edited

Loading

MDevereau Feb 1, 2024

sdesmalen-arm Feb 1, 2024

MDevereau Feb 1, 2024

sdesmalen-arm Feb 1, 2024 •

edited

Loading

MDevereau Feb 1, 2024

sdesmalen-arm left a comment

llvmbot commented Feb 1, 2024 •

edited

Loading

MDevereau commented Feb 13, 2024

llvmbot commented Feb 13, 2024

	if (StringRef("{za}").equals_insensitive(Constraint)) {
	if (Constraint == "{za}") {

	if (PhysReg.id() == AArch64::ZA \|\| PhysReg.id() == AArch64::ZT0)
	if (PhysReg == AArch64::ZA \|\| PhysReg == AArch64::ZT0)

	if (StringRef("{zt0}").equals_insensitive(Constraint)) {
	if (Constraint == "{zt0}") {

[AArch64][SME] Implement inline-asm clobbers for za/zt0 #79276

[AArch64][SME] Implement inline-asm clobbers for za/zt0 #79276

Conversation

MDevereau commented Jan 24, 2024

github-actions bot commented Jan 24, 2024 • edited Loading

sdesmalen-arm Feb 1, 2024 • edited Loading

Choose a reason for hiding this comment

MDevereau Feb 1, 2024

Choose a reason for hiding this comment

sdesmalen-arm Feb 1, 2024

Choose a reason for hiding this comment

MDevereau Feb 1, 2024

Choose a reason for hiding this comment

sdesmalen-arm Feb 1, 2024 • edited Loading

Choose a reason for hiding this comment

MDevereau Feb 1, 2024

Choose a reason for hiding this comment

sdesmalen-arm left a comment

Choose a reason for hiding this comment

llvmbot commented Feb 1, 2024 • edited Loading

MDevereau commented Feb 13, 2024

llvmbot commented Feb 13, 2024

github-actions bot commented Jan 24, 2024 •

edited

Loading

sdesmalen-arm Feb 1, 2024 •

edited

Loading

sdesmalen-arm Feb 1, 2024 •

edited

Loading

llvmbot commented Feb 1, 2024 •

edited

Loading