Skip to content

Commit f0fe6c6

Browse files
authored
[AMDGPU][NFC] Rename isHi() to isHi16Reg() for clarity. (#103888)
And declare it to take an MCRegister. Also rename related entities and remove a comment for the function that depending on its purpose is either irrelevant or misleading.
1 parent 8345289 commit f0fe6c6

File tree

8 files changed

+15
-16
lines changed

8 files changed

+15
-16
lines changed

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8546,7 +8546,7 @@ static void cvtVOP3DstOpSelOnly(MCInst &Inst, const MCRegisterInfo &MRI) {
85468546
uint32_t ModVal = Inst.getOperand(ModIdx).getImm();
85478547
if (DstOp.isReg() &&
85488548
MRI.getRegClass(AMDGPU::VGPR_16RegClassID).contains(DstOp.getReg())) {
8549-
if (AMDGPU::isHi(DstOp.getReg(), MRI))
8549+
if (AMDGPU::isHi16Reg(DstOp.getReg(), MRI))
85508550
ModVal |= SISrcMods::DST_OP_SEL;
85518551
} else {
85528552
if ((OpSel & (1 << SrcNum)) != 0)
@@ -8826,7 +8826,7 @@ void AMDGPUAsmParser::cvtVOP3P(MCInst &Inst, const OperandVector &Operands,
88268826
if (SrcOp.isReg() && getMRI()
88278827
->getRegClass(AMDGPU::VGPR_16RegClassID)
88288828
.contains(SrcOp.getReg())) {
8829-
bool VGPRSuffixIsHi = AMDGPU::isHi(SrcOp.getReg(), *getMRI());
8829+
bool VGPRSuffixIsHi = AMDGPU::isHi16Reg(SrcOp.getReg(), *getMRI());
88308830
if (VGPRSuffixIsHi)
88318831
ModVal |= SISrcMods::OP_SEL_0;
88328832
} else {

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ void AMDGPUMCCodeEmitter::getMachineOpValueT16(
608608
AMDGPU::getNamedOperandIdx(MI.getOpcode(), AMDGPU::OpName::vdst);
609609
if (VDstMOIdx != -1) {
610610
auto DstReg = MI.getOperand(VDstMOIdx).getReg();
611-
if (AMDGPU::isHi(DstReg, MRI))
611+
if (AMDGPU::isHi16Reg(DstReg, MRI))
612612
Op |= SISrcMods::DST_OP_SEL;
613613
}
614614
} else if ((int)OpNo == AMDGPU::getNamedOperandIdx(
@@ -626,7 +626,7 @@ void AMDGPUMCCodeEmitter::getMachineOpValueT16(
626626
auto SrcReg = SrcMO.getReg();
627627
if (AMDGPU::isSGPR(SrcReg, &MRI))
628628
return;
629-
if (AMDGPU::isHi(SrcReg, MRI))
629+
if (AMDGPU::isHi16Reg(SrcReg, MRI))
630630
Op |= SISrcMods::OP_SEL_0;
631631
}
632632

@@ -637,7 +637,7 @@ void AMDGPUMCCodeEmitter::getMachineOpValueT16Lo128(
637637
if (MO.isReg()) {
638638
uint16_t Encoding = MRI.getEncodingValue(MO.getReg());
639639
unsigned RegIdx = Encoding & AMDGPU::HWEncoding::REG_IDX_MASK;
640-
bool IsHi = Encoding & AMDGPU::HWEncoding::IS_HI;
640+
bool IsHi = Encoding & AMDGPU::HWEncoding::IS_HI16;
641641
bool IsVGPR = Encoding & AMDGPU::HWEncoding::IS_VGPR;
642642
assert((!IsVGPR || isUInt<7>(RegIdx)) && "VGPR0-VGPR127 expected!");
643643
Op = (IsVGPR ? 0x100 : 0) | (IsHi ? 0x80 : 0) | RegIdx;

llvm/lib/Target/AMDGPU/SIDefines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ enum : unsigned {
371371
REG_IDX_MASK = 0xff,
372372
IS_VGPR = 1 << 8,
373373
IS_AGPR = 1 << 9,
374-
IS_HI = 1 << 10, // High 16-bit register.
374+
IS_HI16 = 1 << 10,
375375
};
376376
} // namespace HWEncoding
377377

llvm/lib/Target/AMDGPU/SIInstrInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,8 +954,8 @@ void SIInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
954954
bool IsSGPRSrc = AMDGPU::SReg_LO16RegClass.contains(SrcReg);
955955
bool IsAGPRDst = AMDGPU::AGPR_LO16RegClass.contains(DestReg);
956956
bool IsAGPRSrc = AMDGPU::AGPR_LO16RegClass.contains(SrcReg);
957-
bool DstLow = !AMDGPU::isHi(DestReg, RI);
958-
bool SrcLow = !AMDGPU::isHi(SrcReg, RI);
957+
bool DstLow = !AMDGPU::isHi16Reg(DestReg, RI);
958+
bool SrcLow = !AMDGPU::isHi16Reg(SrcReg, RI);
959959
MCRegister NewDestReg = RI.get32BitRegister(DestReg);
960960
MCRegister NewSrcReg = RI.get32BitRegister(SrcReg);
961961

llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ SIRegisterInfo::SIRegisterInfo(const GCNSubtarget &ST)
332332
RegPressureIgnoredUnits.resize(getNumRegUnits());
333333
RegPressureIgnoredUnits.set(*regunits(MCRegister::from(AMDGPU::M0)).begin());
334334
for (auto Reg : AMDGPU::VGPR_16RegClass) {
335-
if (AMDGPU::isHi(Reg, *this))
335+
if (AMDGPU::isHi16Reg(Reg, *this))
336336
RegPressureIgnoredUnits.set(*regunits(Reg).begin());
337337
}
338338

llvm/lib/Target/AMDGPU/SIRegisterInfo.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class SIRegisterTuples<list<SubRegIndex> Indices, RegisterClass RC,
123123
// Declarations that describe the SI registers
124124
//===----------------------------------------------------------------------===//
125125
class SIReg <string n, bits<8> regIdx = 0, bit isVGPR = 0,
126-
bit isAGPR = 0, bit isHi = 0> : Register<n> {
126+
bit isAGPR = 0, bit isHi16 = 0> : Register<n> {
127127
let Namespace = "AMDGPU";
128128

129129
// These are generic helper values we use to form actual register
@@ -132,7 +132,7 @@ class SIReg <string n, bits<8> regIdx = 0, bit isVGPR = 0,
132132
let HWEncoding{7-0} = regIdx;
133133
let HWEncoding{8} = isVGPR;
134134
let HWEncoding{9} = isAGPR;
135-
let HWEncoding{10} = isHi;
135+
let HWEncoding{10} = isHi16;
136136

137137
int Index = !cast<int>(regIdx);
138138
}
@@ -161,7 +161,7 @@ multiclass SIRegLoHi16 <string n, bits<8> regIdx, bit ArtificialHigh = 1,
161161
bit isVGPR = 0, bit isAGPR = 0> {
162162
def _LO16 : SIReg<n#".l", regIdx, isVGPR, isAGPR>;
163163
def _HI16 : SIReg<!if(ArtificialHigh, "", n#".h"), regIdx, isVGPR, isAGPR,
164-
/* isHi */ 1> {
164+
/* isHi16 */ 1> {
165165
let isArtificial = ArtificialHigh;
166166
}
167167
def "" : RegisterWithSubRegs<n, [!cast<Register>(NAME#"_LO16"),

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,8 +2237,8 @@ bool isSGPR(unsigned Reg, const MCRegisterInfo* TRI) {
22372237
Reg == AMDGPU::SCC;
22382238
}
22392239

2240-
bool isHi(unsigned Reg, const MCRegisterInfo &MRI) {
2241-
return MRI.getEncodingValue(Reg) & AMDGPU::HWEncoding::IS_HI;
2240+
bool isHi16Reg(MCRegister Reg, const MCRegisterInfo &MRI) {
2241+
return MRI.getEncodingValue(Reg) & AMDGPU::HWEncoding::IS_HI16;
22422242
}
22432243

22442244
#define MAP_REG2REG \

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,7 @@ bool hasSMRDSignedImmOffset(const MCSubtargetInfo &ST);
13141314
bool isSGPR(unsigned Reg, const MCRegisterInfo* TRI);
13151315

13161316
/// \returns if \p Reg occupies the high 16-bits of a 32-bit register.
1317-
/// The bit indicating isHi is the LSB of the encoding.
1318-
bool isHi(unsigned Reg, const MCRegisterInfo &MRI);
1317+
bool isHi16Reg(MCRegister Reg, const MCRegisterInfo &MRI);
13191318

13201319
/// If \p Reg is a pseudo reg, return the correct hardware register given
13211320
/// \p STI otherwise return \p Reg.

0 commit comments

Comments
 (0)