[llvm] [AArch64] Reserve `W30_HI` and `[BHSDQ]31_HI` (PR #202929)
Nathan Corbyn via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 15 03:47:10 PDT 2026
https://github.com/cofibrant updated https://github.com/llvm/llvm-project/pull/202929
>From 2d0acd362c412733950c46fb5f0a07fd901298c2 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <n_corbyn at apple.com>
Date: Wed, 10 Jun 2026 11:55:58 +0100
Subject: [PATCH 1/3] [AArch64] Reserve W30_HI and [BHSDQ]31_HI
---
.../Target/AArch64/AArch64RegisterInfo.cpp | 12 +++----
.../AArch64/AArch64RegisterInfoTest.cpp | 32 +++++++++++++++++++
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
index 106676c67c94b..9e55b29426dd2 100644
--- a/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
+++ b/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
@@ -499,22 +499,22 @@ AArch64RegisterInfo::getStrictlyReservedRegs(const MachineFunction &MF) const {
Reserved.set(AArch64::WZR_HI);
static_assert(AArch64::W30_HI - AArch64::W0_HI == 30,
"Unexpected order of registers");
- Reserved.set(AArch64::W0_HI, AArch64::W30_HI);
+ Reserved.set(AArch64::W0_HI, AArch64::W30_HI + 1);
static_assert(AArch64::B31_HI - AArch64::B0_HI == 31,
"Unexpected order of registers");
- Reserved.set(AArch64::B0_HI, AArch64::B31_HI);
+ Reserved.set(AArch64::B0_HI, AArch64::B31_HI + 1);
static_assert(AArch64::H31_HI - AArch64::H0_HI == 31,
"Unexpected order of registers");
- Reserved.set(AArch64::H0_HI, AArch64::H31_HI);
+ Reserved.set(AArch64::H0_HI, AArch64::H31_HI + 1);
static_assert(AArch64::S31_HI - AArch64::S0_HI == 31,
"Unexpected order of registers");
- Reserved.set(AArch64::S0_HI, AArch64::S31_HI);
+ Reserved.set(AArch64::S0_HI, AArch64::S31_HI + 1);
static_assert(AArch64::D31_HI - AArch64::D0_HI == 31,
"Unexpected order of registers");
- Reserved.set(AArch64::D0_HI, AArch64::D31_HI);
+ Reserved.set(AArch64::D0_HI, AArch64::D31_HI + 1);
static_assert(AArch64::Q31_HI - AArch64::Q0_HI == 31,
"Unexpected order of registers");
- Reserved.set(AArch64::Q0_HI, AArch64::Q31_HI);
+ Reserved.set(AArch64::Q0_HI, AArch64::Q31_HI + 1);
return Reserved;
}
diff --git a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
index 9efe97567331b..8b58098436375 100644
--- a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
+++ b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
@@ -149,4 +149,36 @@ TEST(AArch64LaneBitmasks, SubRegs) {
AArch64::W1);
}
+TEST(AArch64ReservedRegs, ArtificialHIRegistersAreReserved) {
+ std::unique_ptr<TargetMachine> TM = createTargetMachine("");
+ ASSERT_TRUE(TM);
+
+ std::unique_ptr<AArch64InstrInfo> II = createInstrInfo(TM.get());
+ ASSERT_TRUE(II);
+
+ const AArch64RegisterInfo &TRI = II->getRegisterInfo();
+
+ // Create an empty machine function
+ LLVMContext Context;
+ Module M("", Context);
+ M.setDataLayout(TM->createDataLayout());
+ Function *F = Function::Create(
+ FunctionType::get(Type::getVoidTy(Context), /*isVarArg=*/false),
+ GlobalValue::ExternalLinkage, "f", &M);
+
+ MachineModuleInfo MMI(TM.get());
+ const TargetSubtargetInfo *STI = TM->getSubtargetImpl(*F);
+ MachineFunction MF(*F, *TM, *STI, MMI.getContext(), /*FunctionNum=*/0);
+ MF.initTargetMachineFunctionInfo(*STI);
+
+ BitVector Reserved = TRI.getReservedRegs(MF);
+
+ EXPECT_TRUE(Reserved.test(AArch64::W30_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::B31_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::H31_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::S31_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::D31_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::Q31_HI));
+}
+
} // namespace
>From e2cac9889244baaedbb001cee2e9da1b8d062f38 Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <n_corbyn at apple.com>
Date: Wed, 10 Jun 2026 13:24:23 +0100
Subject: [PATCH 2/3] Add missing includes
---
llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
index 8b58098436375..1ec4b9ddd8f92 100644
--- a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
+++ b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
@@ -2,6 +2,10 @@
#include "AArch64InstrInfo.h"
#include "AArch64Subtarget.h"
#include "AArch64TargetMachine.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineModuleInfo.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Module.h"
#include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
>From feb6f76487ba4d1dcb6da4b58fb1fa9556a6a39c Mon Sep 17 00:00:00 2001
From: Nathan Corbyn <n_corbyn at apple.com>
Date: Mon, 15 Jun 2026 11:05:41 +0100
Subject: [PATCH 3/3] Add tests for `WSP_HI` and `WZR_HI`
---
llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
index 1ec4b9ddd8f92..0906219ce0a4f 100644
--- a/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
+++ b/llvm/unittests/Target/AArch64/AArch64RegisterInfoTest.cpp
@@ -178,6 +178,8 @@ TEST(AArch64ReservedRegs, ArtificialHIRegistersAreReserved) {
BitVector Reserved = TRI.getReservedRegs(MF);
EXPECT_TRUE(Reserved.test(AArch64::W30_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::WSP_HI));
+ EXPECT_TRUE(Reserved.test(AArch64::WZR_HI));
EXPECT_TRUE(Reserved.test(AArch64::B31_HI));
EXPECT_TRUE(Reserved.test(AArch64::H31_HI));
EXPECT_TRUE(Reserved.test(AArch64::S31_HI));
More information about the llvm-commits
mailing list