[llvm] Clang-Tidy issues in fixed in file SystemZISelLowering.cpp (PR #147251)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 7 01:35:58 PDT 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-systemz
Author: None (MangalaPG)
<details>
<summary>Changes</summary>
Corrected variable names corrections according to the clang-tidy standards.
---
Full diff: https://github.com/llvm/llvm-project/pull/147251.diff
1 Files Affected:
- (modified) llvm/lib/Target/SystemZ/SystemZISelLowering.cpp (+72-72)
``````````diff
diff --git a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
index f06246706aaa9..b5e8cb2372e5f 100644
--- a/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
@@ -895,7 +895,7 @@ bool SystemZVectorConstantInfo::isVectorConstantLegal(
if (SplatBitSize > 64)
return false;
- auto tryValue = [&](uint64_t Value) -> bool {
+ auto TryValue = [&](uint64_t Value) -> bool {
// Try VECTOR REPLICATE IMMEDIATE
int64_t SignedValue = SignExtend64(Value, SplatBitSize);
if (isInt<16>(SignedValue)) {
@@ -931,14 +931,14 @@ bool SystemZVectorConstantInfo::isVectorConstantLegal(
unsigned UpperBits = llvm::countl_zero(SplatBitsZ);
uint64_t Lower = SplatUndefZ & maskTrailingOnes<uint64_t>(LowerBits);
uint64_t Upper = SplatUndefZ & maskLeadingOnes<uint64_t>(UpperBits);
- if (tryValue(SplatBitsZ | Upper | Lower))
+ if (TryValue(SplatBitsZ | Upper | Lower))
return true;
// Now try assuming that any undefined bits between the first and
// last defined set bits are set. This increases the chances of
// using a non-wraparound mask.
uint64_t Middle = SplatUndefZ & ~Upper & ~Lower;
- return tryValue(SplatBitsZ | Middle);
+ return TryValue(SplatBitsZ | Middle);
}
SystemZVectorConstantInfo::SystemZVectorConstantInfo(APInt IntImm) {
@@ -1007,8 +1007,8 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
const TargetRegisterClass *RC = MRI.getRegClass(DstReg);
assert(TRI->isTypeLegalForClass(*RC, MVT::i32) && "Invalid destination!");
(void)TRI;
- Register mainDstReg = MRI.createVirtualRegister(RC);
- Register restoreDstReg = MRI.createVirtualRegister(RC);
+ Register MainDstReg = MRI.createVirtualRegister(RC);
+ Register RestoreDstReg = MRI.createVirtualRegister(RC);
MVT PVT = getPointerTy(MF->getDataLayout());
assert((PVT == MVT::i64 || PVT == MVT::i32) && "Invalid Pointer Size!");
@@ -1046,22 +1046,22 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
// restoreMBB:
// v_restore = 1
- MachineBasicBlock *thisMBB = MBB;
- MachineBasicBlock *mainMBB = MF->CreateMachineBasicBlock(BB);
- MachineBasicBlock *sinkMBB = MF->CreateMachineBasicBlock(BB);
- MachineBasicBlock *restoreMBB = MF->CreateMachineBasicBlock(BB);
+ MachineBasicBlock *ThisMBB = MBB;
+ MachineBasicBlock *MainMBB = MF->CreateMachineBasicBlock(BB);
+ MachineBasicBlock *SinkMBB = MF->CreateMachineBasicBlock(BB);
+ MachineBasicBlock *RestoreMBB = MF->CreateMachineBasicBlock(BB);
- MF->insert(I, mainMBB);
- MF->insert(I, sinkMBB);
- MF->push_back(restoreMBB);
- restoreMBB->setMachineBlockAddressTaken();
+ MF->insert(I, MainMBB);
+ MF->insert(I, SinkMBB);
+ MF->push_back(RestoreMBB);
+ RestoreMBB->setMachineBlockAddressTaken();
MachineInstrBuilder MIB;
// Transfer the remainder of BB and its successor edges to sinkMBB.
- sinkMBB->splice(sinkMBB->begin(), MBB,
+ SinkMBB->splice(SinkMBB->begin(), MBB,
std::next(MachineBasicBlock::iterator(MI)), MBB->end());
- sinkMBB->transferSuccessorsAndUpdatePHIs(MBB);
+ SinkMBB->transferSuccessorsAndUpdatePHIs(MBB);
// thisMBB:
const int64_t FPOffset = 0; // Slot 1.
@@ -1073,13 +1073,13 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
Register BufReg = MI.getOperand(1).getReg();
const TargetRegisterClass *PtrRC = getRegClassFor(PVT);
- unsigned LabelReg = MRI.createVirtualRegister(PtrRC);
+ Register LabelReg = MRI.createVirtualRegister(PtrRC);
// Prepare IP for longjmp.
- BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::LARL), LabelReg)
- .addMBB(restoreMBB);
+ BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::LARL), LabelReg)
+ .addMBB(RestoreMBB);
// Store IP for return from jmp, slot 2, offset = 1.
- BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::STG))
+ BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::STG))
.addReg(LabelReg)
.addReg(BufReg)
.addImm(LabelOffset)
@@ -1088,7 +1088,7 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
auto *SpecialRegs = Subtarget.getSpecialRegisters();
bool HasFP = Subtarget.getFrameLowering()->hasFP(*MF);
if (HasFP) {
- BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::STG))
+ BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::STG))
.addReg(SpecialRegs->getFramePointerRegister())
.addReg(BufReg)
.addImm(FPOffset)
@@ -1096,7 +1096,7 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
}
// Store SP.
- BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::STG))
+ BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::STG))
.addReg(SpecialRegs->getStackPointerRegister())
.addReg(BufReg)
.addImm(SPOffset)
@@ -1107,12 +1107,12 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
if (BackChain) {
Register BCReg = MRI.createVirtualRegister(PtrRC);
auto *TFL = Subtarget.getFrameLowering<SystemZFrameLowering>();
- MIB = BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::LG), BCReg)
+ MIB = BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::LG), BCReg)
.addReg(SpecialRegs->getStackPointerRegister())
.addImm(TFL->getBackchainOffset(*MF))
.addReg(0);
- BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::STG))
+ BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::STG))
.addReg(BCReg)
.addReg(BufReg)
.addImm(BCOffset)
@@ -1120,34 +1120,34 @@ SystemZTargetLowering::emitEHSjLjSetJmp(MachineInstr &MI,
}
// Setup.
- MIB = BuildMI(*thisMBB, MI, DL, TII->get(SystemZ::EH_SjLj_Setup))
- .addMBB(restoreMBB);
+ MIB = BuildMI(*ThisMBB, MI, DL, TII->get(SystemZ::EH_SjLj_Setup))
+ .addMBB(RestoreMBB);
const SystemZRegisterInfo *RegInfo = Subtarget.getRegisterInfo();
MIB.addRegMask(RegInfo->getNoPreservedMask());
- thisMBB->addSuccessor(mainMBB);
- thisMBB->addSuccessor(restoreMBB);
+ ThisMBB->addSuccessor(MainMBB);
+ ThisMBB->addSuccessor(RestoreMBB);
// mainMBB:
- BuildMI(mainMBB, DL, TII->get(SystemZ::LHI), mainDstReg).addImm(0);
- mainMBB->addSuccessor(sinkMBB);
+ BuildMI(MainMBB, DL, TII->get(SystemZ::LHI), MainDstReg).addImm(0);
+ MainMBB->addSuccessor(SinkMBB);
// sinkMBB:
- BuildMI(*sinkMBB, sinkMBB->begin(), DL, TII->get(SystemZ::PHI), DstReg)
- .addReg(mainDstReg)
- .addMBB(mainMBB)
- .addReg(restoreDstReg)
- .addMBB(restoreMBB);
+ BuildMI(*SinkMBB, SinkMBB->begin(), DL, TII->get(SystemZ::PHI), DstReg)
+ .addReg(MainDstReg)
+ .addMBB(MainMBB)
+ .addReg(RestoreDstReg)
+ .addMBB(RestoreMBB);
// restoreMBB.
- BuildMI(restoreMBB, DL, TII->get(SystemZ::LHI), restoreDstReg).addImm(1);
- BuildMI(restoreMBB, DL, TII->get(SystemZ::J)).addMBB(sinkMBB);
- restoreMBB->addSuccessor(sinkMBB);
+ BuildMI(RestoreMBB, DL, TII->get(SystemZ::LHI), RestoreDstReg).addImm(1);
+ BuildMI(RestoreMBB, DL, TII->get(SystemZ::J)).addMBB(SinkMBB);
+ RestoreMBB->addSuccessor(SinkMBB);
MI.eraseFromParent();
- return sinkMBB;
+ return SinkMBB;
}
MachineBasicBlock *
@@ -1497,70 +1497,70 @@ SystemZTargetLowering::getConstraintType(StringRef Constraint) const {
}
TargetLowering::ConstraintWeight SystemZTargetLowering::
-getSingleConstraintMatchWeight(AsmOperandInfo &info,
- const char *constraint) const {
- ConstraintWeight weight = CW_Invalid;
- Value *CallOperandVal = info.CallOperandVal;
+getSingleConstraintMatchWeight(AsmOperandInfo &Info,
+ const char *Constraint) const {
+ ConstraintWeight Weight = CW_Invalid;
+ Value *CallOperandVal = Info.CallOperandVal;
// If we don't have a value, we can't do a match,
// but allow it at the lowest weight.
if (!CallOperandVal)
return CW_Default;
Type *type = CallOperandVal->getType();
// Look at the constraint type.
- switch (*constraint) {
+ switch (*Constraint) {
default:
- weight = TargetLowering::getSingleConstraintMatchWeight(info, constraint);
+ Weight = TargetLowering::getSingleConstraintMatchWeight(Info, Constraint);
break;
case 'a': // Address register
case 'd': // Data register (equivalent to 'r')
case 'h': // High-part register
case 'r': // General-purpose register
- weight = CallOperandVal->getType()->isIntegerTy() ? CW_Register : CW_Default;
+ Weight = CallOperandVal->getType()->isIntegerTy() ? CW_Register : CW_Default;
break;
case 'f': // Floating-point register
if (!useSoftFloat())
- weight = type->isFloatingPointTy() ? CW_Register : CW_Default;
+ Weight = type->isFloatingPointTy() ? CW_Register : CW_Default;
break;
case 'v': // Vector register
if (Subtarget.hasVector())
- weight = (type->isVectorTy() || type->isFloatingPointTy()) ? CW_Register
+ Weight = (type->isVectorTy() || type->isFloatingPointTy()) ? CW_Register
: CW_Default;
break;
case 'I': // Unsigned 8-bit constant
if (auto *C = dyn_cast<ConstantInt>(CallOperandVal))
if (isUInt<8>(C->getZExtValue()))
- weight = CW_Constant;
+ Weight = CW_Constant;
break;
case 'J': // Unsigned 12-bit constant
if (auto *C = dyn_cast<ConstantInt>(CallOperandVal))
if (isUInt<12>(C->getZExtValue()))
- weight = CW_Constant;
+ Weight = CW_Constant;
break;
case 'K': // Signed 16-bit constant
if (auto *C = dyn_cast<ConstantInt>(CallOperandVal))
if (isInt<16>(C->getSExtValue()))
- weight = CW_Constant;
+ Weight = CW_Constant;
break;
case 'L': // Signed 20-bit displacement (on all targets we support)
if (auto *C = dyn_cast<ConstantInt>(CallOperandVal))
if (isInt<20>(C->getSExtValue()))
- weight = CW_Constant;
+ Weight = CW_Constant;
break;
case 'M': // 0x7fffffff
if (auto *C = dyn_cast<ConstantInt>(CallOperandVal))
if (C->getZExtValue() == 0x7fffffff)
- weight = CW_Constant;
+ Weight = CW_Constant;
break;
}
- return weight;
+ return Weight;
}
// Parse a "{tNNN}" register constraint for which the register type "t"
@@ -2125,7 +2125,7 @@ static SDValue getADAEntry(SelectionDAG &DAG, SDValue Val, SDLoc DL,
unsigned Offset, bool LoadAdr = false) {
MachineFunction &MF = DAG.getMachineFunction();
SystemZMachineFunctionInfo *MFI = MF.getInfo<SystemZMachineFunctionInfo>();
- unsigned ADAvReg = MFI->getADAVirtualRegister();
+ Register ADAvReg = MFI->getADAVirtualRegister();
EVT PtrVT = DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
SDValue Reg = DAG.getRegister(ADAvReg, PtrVT);
@@ -2179,7 +2179,7 @@ static bool getzOSCalleeAndADA(SelectionDAG &DAG, SDValue &Callee, SDValue &ADA,
if (IsInternal) {
SystemZMachineFunctionInfo *MFI =
MF.getInfo<SystemZMachineFunctionInfo>();
- unsigned ADAvReg = MFI->getADAVirtualRegister();
+ Register ADAvReg = MFI->getADAVirtualRegister();
ADA = DAG.getCopyFromReg(Chain, DL, ADAvReg, PtrVT);
Callee = DAG.getTargetGlobalAddress(G->getGlobal(), DL, PtrVT);
Callee = DAG.getNode(SystemZISD::PCREL_WRAPPER, DL, PtrVT, Callee);
@@ -2474,7 +2474,7 @@ std::pair<SDValue, SDValue> SystemZTargetLowering::makeExternalCall(
bool SystemZTargetLowering::
CanLowerReturn(CallingConv::ID CallConv,
- MachineFunction &MF, bool isVarArg,
+ MachineFunction &MF, bool IsVarArg,
const SmallVectorImpl<ISD::OutputArg> &Outs,
LLVMContext &Context,
const Type *RetTy) const {
@@ -2485,7 +2485,7 @@ CanLowerReturn(CallingConv::ID CallConv,
return false;
SmallVector<CCValAssign, 16> RetLocs;
- CCState RetCCInfo(CallConv, isVarArg, MF, RetLocs, Context);
+ CCState RetCCInfo(CallConv, IsVarArg, MF, RetLocs, Context);
return RetCCInfo.CheckReturn(Outs, RetCC_SystemZ);
}
@@ -6044,8 +6044,8 @@ SDValue GeneralShuffle::getNode(SelectionDAG &DAG, const SDLoc &DL) {
#ifndef NDEBUG
static void dumpBytes(const SmallVectorImpl<int> &Bytes, std::string Msg) {
dbgs() << Msg.c_str() << " { ";
- for (unsigned i = 0; i < Bytes.size(); i++)
- dbgs() << Bytes[i] << " ";
+ for (unsigned I = 0; I < Bytes.size(); I++)
+ dbgs() << Bytes[I] << " ";
dbgs() << "}\n";
}
#endif
@@ -6760,7 +6760,7 @@ SDValue SystemZTargetLowering::lowerFSHR(SDValue Op, SelectionDAG &DAG) const {
}
static SDValue lowerAddrSpaceCast(SDValue Op, SelectionDAG &DAG) {
- SDLoc dl(Op);
+ SDLoc DL(Op);
SDValue Src = Op.getOperand(0);
MVT DstVT = Op.getSimpleValueType();
@@ -6773,14 +6773,14 @@ static SDValue lowerAddrSpaceCast(SDValue Op, SelectionDAG &DAG) {
// addrspacecast [0 <- 1] : Assinging a ptr32 value to a 64-bit pointer.
// addrspacecast [1 <- 0] : Assigining a 64-bit pointer to a ptr32 value.
if (SrcAS == SYSTEMZAS::PTR32 && DstVT == MVT::i64) {
- Op = DAG.getNode(ISD::AND, dl, MVT::i32, Src,
- DAG.getConstant(0x7fffffff, dl, MVT::i32));
- Op = DAG.getNode(ISD::ZERO_EXTEND, dl, DstVT, Op);
+ Op = DAG.getNode(ISD::AND, DL, MVT::i32, Src,
+ DAG.getConstant(0x7fffffff, DL, MVT::i32));
+ Op = DAG.getNode(ISD::ZERO_EXTEND, DL, DstVT, Op);
} else if (DstVT == MVT::i32) {
- Op = DAG.getNode(ISD::TRUNCATE, dl, DstVT, Src);
- Op = DAG.getNode(ISD::AND, dl, MVT::i32, Op,
- DAG.getConstant(0x7fffffff, dl, MVT::i32));
- Op = DAG.getNode(ISD::ZERO_EXTEND, dl, DstVT, Op);
+ Op = DAG.getNode(ISD::TRUNCATE, DL, DstVT, Src);
+ Op = DAG.getNode(ISD::AND, DL, MVT::i32, Op,
+ DAG.getConstant(0x7fffffff, DL, MVT::i32));
+ Op = DAG.getNode(ISD::ZERO_EXTEND, DL, DstVT, Op);
} else {
report_fatal_error("Bad address space in addrspacecast");
}
@@ -9278,8 +9278,8 @@ SystemZTargetLowering::computeKnownBitsForTargetNode(const SDValue Op,
Known.resetAll();
// Intrinsic CC result is returned in the two low bits.
- unsigned tmp0, tmp1; // not used
- if (Op.getResNo() == 1 && isIntrinsicWithCC(Op, tmp0, tmp1)) {
+ unsigned Tmp0, Tmp1; // not used
+ if (Op.getResNo() == 1 && isIntrinsicWithCC(Op, Tmp0, Tmp1)) {
Known.Zero.setBitsFrom(2);
return;
}
@@ -9504,10 +9504,10 @@ static bool checkCCKill(MachineInstr &MI, MachineBasicBlock *MBB) {
// Scan forward through BB for a use/def of CC.
MachineBasicBlock::iterator miI(std::next(MachineBasicBlock::iterator(MI)));
for (MachineBasicBlock::iterator miE = MBB->end(); miI != miE; ++miI) {
- const MachineInstr& mi = *miI;
- if (mi.readsRegister(SystemZ::CC, /*TRI=*/nullptr))
+ const MachineInstr& MI = *miI;
+ if (MI.readsRegister(SystemZ::CC, /*TRI=*/nullptr))
return false;
- if (mi.definesRegister(SystemZ::CC, /*TRI=*/nullptr))
+ if (MI.definesRegister(SystemZ::CC, /*TRI=*/nullptr))
break; // Should have kill-flag - update below.
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/147251
More information about the llvm-commits
mailing list