Skip to content

Commit 5764311

Browse files
MacDueMacDue
committed
[Codegen] Add a separate stack ID for scalable predicates
This splits out "ScalablePredVector" from the "ScalableVector" StackID this is primarily to allow easy differentiation between vectors and predicates (without inspecting instructions). This new stack ID is not used in many places yet, but will be used in a later patch to mark stack slots that are known to contain predicates.
1 parent 22d271b commit 5764311

14 files changed

+66
-53
lines changed

‎llvm/include/llvm/CodeGen/MIRYamlMapping.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ struct ScalarEnumerationTraits<TargetStackID::Value> {
378378
IO.enumCase(ID, "default", TargetStackID::Default);
379379
IO.enumCase(ID, "sgpr-spill", TargetStackID::SGPRSpill);
380380
IO.enumCase(ID, "scalable-vector", TargetStackID::ScalableVector);
381+
IO.enumCase(ID, "scalable-pred-vector", TargetStackID::ScalablePredVector);
381382
IO.enumCase(ID, "wasm-local", TargetStackID::WasmLocal);
382383
IO.enumCase(ID, "noalloc", TargetStackID::NoAlloc);
383384
}

‎llvm/include/llvm/CodeGen/MachineFrameInfo.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,14 @@ class MachineFrameInfo {
494494
/// Should this stack ID be considered in MaxAlignment.
495495
bool contributesToMaxAlignment(uint8_t StackID) {
496496
return StackID == TargetStackID::Default ||
497-
StackID == TargetStackID::ScalableVector;
497+
StackID == TargetStackID::ScalableVector ||
498+
StackID == TargetStackID::ScalablePredVector;
499+
}
500+
501+
bool isScalableStackID(int ObjectIdx) const {
502+
uint8_t StackID = getStackID(ObjectIdx);
503+
return StackID == TargetStackID::ScalableVector ||
504+
StackID == TargetStackID::ScalablePredVector;
498505
}
499506

500507
/// setObjectAlignment - Change the alignment of the specified stack object.

‎llvm/include/llvm/CodeGen/TargetFrameLowering.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ enum Value {
3232
SGPRSpill = 1,
3333
ScalableVector = 2,
3434
WasmLocal = 3,
35+
ScalablePredVector = 4,
3536
NoAlloc = 255
3637
};
3738
}

‎llvm/lib/CodeGen/StackFrameLayoutAnalysisPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct StackFrameLayoutAnalysis {
7272
: Slot(Idx), Size(MFI.getObjectSize(Idx)),
7373
Align(MFI.getObjectAlign(Idx).value()), Offset(Offset),
7474
SlotTy(Invalid), Scalable(false) {
75-
Scalable = MFI.getStackID(Idx) == TargetStackID::ScalableVector;
75+
Scalable = MFI.isScalableStackID(Idx);
7676
if (MFI.isSpillSlotObjectIndex(Idx))
7777
SlotTy = SlotType::Spill;
7878
else if (MFI.isFixedObjectIndex(Idx))

‎llvm/lib/Target/AArch64/AArch64FrameLowering.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ void AArch64FrameLowering::emitCalleeSavedGPRLocations(
606606
CFIInstBuilder CFIBuilder(MBB, MBBI, MachineInstr::FrameSetup);
607607
for (const auto &Info : CSI) {
608608
unsigned FrameIdx = Info.getFrameIdx();
609-
if (MFI.getStackID(FrameIdx) == TargetStackID::ScalableVector)
609+
if (MFI.isScalableStackID(FrameIdx))
610610
continue;
611611

612612
assert(!Info.isSpilledToReg() && "Spilling to registers not implemented");
@@ -639,7 +639,7 @@ void AArch64FrameLowering::emitCalleeSavedSVELocations(
639639
CFIInstBuilder CFIBuilder(MBB, MBBI, MachineInstr::FrameSetup);
640640

641641
for (const auto &Info : CSI) {
642-
if (!(MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector))
642+
if (!MFI.isScalableStackID(Info.getFrameIdx()))
643643
continue;
644644

645645
// Not all unwinders may know about SVE registers, so assume the lowest
@@ -706,8 +706,7 @@ static void emitCalleeSavedRestores(MachineBasicBlock &MBB,
706706
CFIInstBuilder CFIBuilder(MBB, MBBI, MachineInstr::FrameDestroy);
707707

708708
for (const auto &Info : CSI) {
709-
if (SVE !=
710-
(MFI.getStackID(Info.getFrameIdx()) == TargetStackID::ScalableVector))
709+
if (SVE != MFI.isScalableStackID(Info.getFrameIdx()))
711710
continue;
712711

713712
MCRegister Reg = Info.getReg();
@@ -2587,10 +2586,9 @@ AArch64FrameLowering::getFrameIndexReferenceFromSP(const MachineFunction &MF,
25872586
return StackOffset::getFixed(ObjectOffset - getOffsetOfLocalArea());
25882587

25892588
const auto *AFI = MF.getInfo<AArch64FunctionInfo>();
2590-
if (MFI.getStackID(FI) == TargetStackID::ScalableVector) {
2589+
if (MFI.isScalableStackID(FI))
25912590
return StackOffset::get(-((int64_t)AFI->getCalleeSavedStackSize()),
25922591
ObjectOffset);
2593-
}
25942592

25952593
bool IsFixed = MFI.isFixedObjectIndex(FI);
25962594
bool IsCSR =
@@ -2646,7 +2644,7 @@ StackOffset AArch64FrameLowering::resolveFrameIndexReference(
26462644
const auto &MFI = MF.getFrameInfo();
26472645
int64_t ObjectOffset = MFI.getObjectOffset(FI);
26482646
bool isFixed = MFI.isFixedObjectIndex(FI);
2649-
bool isSVE = MFI.getStackID(FI) == TargetStackID::ScalableVector;
2647+
bool isSVE = MFI.isScalableStackID(FI);
26502648
return resolveFrameOffsetReference(MF, ObjectOffset, isFixed, isSVE, FrameReg,
26512649
PreferFP, ForSimm);
26522650
}
@@ -3348,10 +3346,14 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters(
33483346
}
33493347
// Update the StackIDs of the SVE stack slots.
33503348
MachineFrameInfo &MFI = MF.getFrameInfo();
3351-
if (RPI.Type == RegPairInfo::ZPR || RPI.Type == RegPairInfo::PPR) {
3349+
if (RPI.Type == RegPairInfo::ZPR) {
33523350
MFI.setStackID(FrameIdxReg1, TargetStackID::ScalableVector);
33533351
if (RPI.isPaired())
33543352
MFI.setStackID(FrameIdxReg2, TargetStackID::ScalableVector);
3353+
} else if (RPI.Type == RegPairInfo::PPR) {
3354+
MFI.setStackID(FrameIdxReg1, TargetStackID::ScalablePredVector);
3355+
if (RPI.isPaired())
3356+
MFI.setStackID(FrameIdxReg2, TargetStackID::ScalablePredVector);
33553357
}
33563358

33573359
if (X0Scratch != AArch64::NoRegister)
@@ -3565,8 +3567,7 @@ void AArch64FrameLowering::determineStackHazardSlot(
35653567
for (auto &MI : MBB) {
35663568
std::optional<int> FI = getLdStFrameID(MI, MFI);
35673569
if (FI && *FI >= 0 && *FI < (int)FrameObjects.size()) {
3568-
if (MFI.getStackID(*FI) == TargetStackID::ScalableVector ||
3569-
AArch64InstrInfo::isFpOrNEON(MI))
3570+
if (MFI.isScalableStackID(*FI) || AArch64InstrInfo::isFpOrNEON(MI))
35703571
FrameObjects[*FI] |= 2;
35713572
else
35723573
FrameObjects[*FI] |= 1;
@@ -4029,7 +4030,7 @@ static int64_t determineSVEStackObjectOffsets(MachineFrameInfo &MFI,
40294030
#ifndef NDEBUG
40304031
// First process all fixed stack objects.
40314032
for (int I = MFI.getObjectIndexBegin(); I != 0; ++I)
4032-
assert(MFI.getStackID(I) != TargetStackID::ScalableVector &&
4033+
assert(!MFI.isScalableStackID(I) &&
40334034
"SVE vectors should never be passed on the stack by value, only by "
40344035
"reference.");
40354036
#endif
@@ -4063,12 +4064,11 @@ static int64_t determineSVEStackObjectOffsets(MachineFrameInfo &MFI,
40634064
int StackProtectorFI = -1;
40644065
if (MFI.hasStackProtectorIndex()) {
40654066
StackProtectorFI = MFI.getStackProtectorIndex();
4066-
if (MFI.getStackID(StackProtectorFI) == TargetStackID::ScalableVector)
4067+
if (MFI.isScalableStackID(StackProtectorFI))
40674068
ObjectsToAllocate.push_back(StackProtectorFI);
40684069
}
40694070
for (int I = 0, E = MFI.getObjectIndexEnd(); I != E; ++I) {
4070-
unsigned StackID = MFI.getStackID(I);
4071-
if (StackID != TargetStackID::ScalableVector)
4071+
if (!MFI.isScalableStackID(I))
40724072
continue;
40734073
if (I == StackProtectorFI)
40744074
continue;
@@ -5083,8 +5083,7 @@ void AArch64FrameLowering::orderFrameObjects(
50835083
if (AFI.hasStackHazardSlotIndex()) {
50845084
std::optional<int> FI = getLdStFrameID(MI, MFI);
50855085
if (FI && *FI >= 0 && *FI < (int)FrameObjects.size()) {
5086-
if (MFI.getStackID(*FI) == TargetStackID::ScalableVector ||
5087-
AArch64InstrInfo::isFpOrNEON(MI))
5086+
if (MFI.isScalableStackID(*FI) || AArch64InstrInfo::isFpOrNEON(MI))
50885087
FrameObjects[*FI].Accesses |= FrameObject::AccessFPR;
50895088
else
50905089
FrameObjects[*FI].Accesses |= FrameObject::AccessGPR;
@@ -5442,7 +5441,7 @@ void AArch64FrameLowering::emitRemarks(
54425441
}
54435442

54445443
unsigned RegTy = StackAccess::AccessType::GPR;
5445-
if (MFI.getStackID(FrameIdx) == TargetStackID::ScalableVector) {
5444+
if (MFI.isScalableStackID(FrameIdx)) {
54465445
// SPILL_PPR_TO_ZPR_SLOT_PSEUDO and FILL_PPR_FROM_ZPR_SLOT_PSEUDO
54475446
// spill/fill the predicate as a data vector (so are an FPR acess).
54485447
if (MI.getOpcode() != AArch64::SPILL_PPR_TO_ZPR_SLOT_PSEUDO &&

‎llvm/lib/Target/AArch64/AArch64FrameLowering.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class AArch64FrameLowering : public TargetFrameLowering {
111111
return false;
112112
case TargetStackID::Default:
113113
case TargetStackID::ScalableVector:
114+
case TargetStackID::ScalablePredVector:
114115
case TargetStackID::NoAlloc:
115116
return true;
116117
}
@@ -119,7 +120,8 @@ class AArch64FrameLowering : public TargetFrameLowering {
119120
bool isStackIdSafeForLocalArea(unsigned StackId) const override {
120121
// We don't support putting SVE objects into the pre-allocated local
121122
// frame block at the moment.
122-
return StackId != TargetStackID::ScalableVector;
123+
return (StackId != TargetStackID::ScalableVector &&
124+
StackId != TargetStackID::ScalablePredVector);
123125
}
124126

125127
void

‎llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7375,7 +7375,7 @@ bool AArch64DAGToDAGISel::SelectAddrModeIndexedSVE(SDNode *Root, SDValue N,
73757375
int FI = cast<FrameIndexSDNode>(N)->getIndex();
73767376
// We can only encode VL scaled offsets, so only fold in frame indexes
73777377
// referencing SVE objects.
7378-
if (MFI.getStackID(FI) == TargetStackID::ScalableVector) {
7378+
if (MFI.isScalableStackID(FI)) {
73797379
Base = CurDAG->getTargetFrameIndex(FI, TLI->getPointerTy(DL));
73807380
OffImm = CurDAG->getTargetConstant(0, SDLoc(N), MVT::i64);
73817381
return true;
@@ -7421,7 +7421,7 @@ bool AArch64DAGToDAGISel::SelectAddrModeIndexedSVE(SDNode *Root, SDValue N,
74217421
int FI = cast<FrameIndexSDNode>(Base)->getIndex();
74227422
// We can only encode VL scaled offsets, so only fold in frame indexes
74237423
// referencing SVE objects.
7424-
if (MFI.getStackID(FI) == TargetStackID::ScalableVector)
7424+
if (MFI.isScalableStackID(FI))
74257425
Base = CurDAG->getTargetFrameIndex(FI, TLI->getPointerTy(DL));
74267426
}
74277427

‎llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8681,8 +8681,7 @@ void AArch64TargetLowering::AdjustInstrPostInstrSelection(MachineInstr &MI,
86818681
(MI.getOpcode() == AArch64::ADDXri ||
86828682
MI.getOpcode() == AArch64::SUBXri)) {
86838683
const MachineOperand &MO = MI.getOperand(1);
8684-
if (MO.isFI() && MF.getFrameInfo().getStackID(MO.getIndex()) ==
8685-
TargetStackID::ScalableVector)
8684+
if (MO.isFI() && MF.getFrameInfo().isScalableStackID(MO.getIndex()))
86868685
MI.addOperand(MachineOperand::CreateReg(AArch64::VG, /*IsDef=*/false,
86878686
/*IsImplicit=*/true));
86888687
}
@@ -9079,8 +9078,12 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
90799078
Align Alignment = DAG.getDataLayout().getPrefTypeAlign(Ty);
90809079
MachineFrameInfo &MFI = MF.getFrameInfo();
90819080
int FI = MFI.CreateStackObject(StoreSize, Alignment, false);
9082-
if (isScalable)
9083-
MFI.setStackID(FI, TargetStackID::ScalableVector);
9081+
if (isScalable) {
9082+
bool IsPred = VA.getValVT() == MVT::aarch64svcount ||
9083+
VA.getValVT().getVectorElementType() == MVT::i1;
9084+
MFI.setStackID(FI, IsPred ? TargetStackID::ScalablePredVector
9085+
: TargetStackID::ScalableVector);
9086+
}
90849087

90859088
MachinePointerInfo MPI = MachinePointerInfo::getFixedStack(MF, FI);
90869089
SDValue Ptr = DAG.getFrameIndex(
@@ -28221,7 +28224,7 @@ void AArch64TargetLowering::finalizeLowering(MachineFunction &MF) const {
2822128224
// than doing it here in finalizeLowering.
2822228225
if (MFI.hasStackProtectorIndex()) {
2822328226
for (unsigned int i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) {
28224-
if (MFI.getStackID(i) == TargetStackID::ScalableVector &&
28227+
if (MFI.isScalableStackID(i) &&
2822528228
MFI.getObjectSSPLayout(i) != MachineFrameInfo::SSPLK_None) {
2822628229
MFI.setStackID(MFI.getStackProtectorIndex(),
2822728230
TargetStackID::ScalableVector);

‎llvm/lib/Target/AArch64/AArch64InstrInfo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5421,7 +5421,7 @@ void AArch64InstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
54215421
assert(Subtarget.isSVEorStreamingSVEAvailable() &&
54225422
"Unexpected register store without SVE store instructions");
54235423
Opc = AArch64::STR_PXI;
5424-
StackID = TargetStackID::ScalableVector;
5424+
StackID = TargetStackID::ScalablePredVector;
54255425
}
54265426
break;
54275427
}
@@ -5436,7 +5436,7 @@ void AArch64InstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
54365436
Opc = AArch64::STRSui;
54375437
else if (AArch64::PPR2RegClass.hasSubClassEq(RC)) {
54385438
Opc = AArch64::STR_PPXI;
5439-
StackID = TargetStackID::ScalableVector;
5439+
StackID = TargetStackID::ScalablePredVector;
54405440
}
54415441
break;
54425442
case 8:
@@ -5598,7 +5598,7 @@ void AArch64InstrInfo::loadRegFromStackSlot(
55985598
if (IsPNR)
55995599
PNRReg = DestReg;
56005600
Opc = AArch64::LDR_PXI;
5601-
StackID = TargetStackID::ScalableVector;
5601+
StackID = TargetStackID::ScalablePredVector;
56025602
}
56035603
break;
56045604
}
@@ -5613,7 +5613,7 @@ void AArch64InstrInfo::loadRegFromStackSlot(
56135613
Opc = AArch64::LDRSui;
56145614
else if (AArch64::PPR2RegClass.hasSubClassEq(RC)) {
56155615
Opc = AArch64::LDR_PPXI;
5616-
StackID = TargetStackID::ScalableVector;
5616+
StackID = TargetStackID::ScalablePredVector;
56175617
}
56185618
break;
56195619
case 8:

‎llvm/test/CodeGen/AArch64/debug-info-sve-dbg-declare.mir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ stack:
164164
- { id: 1, name: z1.addr, size: 16, alignment: 16, stack-id: scalable-vector,
165165
debug-info-variable: '!31', debug-info-expression: '!DIExpression()',
166166
debug-info-location: '!32' }
167-
- { id: 2, name: p0.addr, size: 2, alignment: 2, stack-id: scalable-vector,
167+
- { id: 2, name: p0.addr, size: 2, alignment: 2, stack-id: scalable-pred-vector,
168168
debug-info-variable: '!33', debug-info-expression: '!DIExpression()',
169169
debug-info-location: '!34' }
170-
- { id: 3, name: p1.addr, size: 2, alignment: 2, stack-id: scalable-vector,
170+
- { id: 3, name: p1.addr, size: 2, alignment: 2, stack-id: scalable-pred-vector,
171171
debug-info-variable: '!35', debug-info-expression: '!DIExpression()',
172172
debug-info-location: '!36' }
173173
- { id: 4, name: w0.addr, size: 4, alignment: 4, local-offset: -4, debug-info-variable: '!37',
@@ -181,10 +181,10 @@ stack:
181181
- { id: 7, name: localv1, size: 16, alignment: 16, stack-id: scalable-vector,
182182
debug-info-variable: '!45', debug-info-expression: '!DIExpression()',
183183
debug-info-location: '!46' }
184-
- { id: 8, name: localp0, size: 2, alignment: 2, stack-id: scalable-vector,
184+
- { id: 8, name: localp0, size: 2, alignment: 2, stack-id: scalable-pred-vector,
185185
debug-info-variable: '!48', debug-info-expression: '!DIExpression()',
186186
debug-info-location: '!49' }
187-
- { id: 9, name: localp1, size: 2, alignment: 2, stack-id: scalable-vector,
187+
- { id: 9, name: localp1, size: 2, alignment: 2, stack-id: scalable-pred-vector,
188188
debug-info-variable: '!51', debug-info-expression: '!DIExpression()',
189189
debug-info-location: '!52' }
190190
machineFunctionInfo: {}

0 commit comments

Comments
 (0)