Skip to content

Commit 4460766

Browse files
authored
[AMDGPU] Simplify conditional expressions. NFC. (#129228)
Simplfy `cond ? val : false` to `cond && val` and similar.
1 parent c545d57 commit 4460766

9 files changed

+26
-28
lines changed

llvm/lib/Target/AMDGPU/AMDGPUCodeGenPrepare.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ bool AMDGPUCodeGenPrepareImpl::isSigned(const BinaryOperator &I) const {
404404
}
405405

406406
bool AMDGPUCodeGenPrepareImpl::isSigned(const SelectInst &I) const {
407-
return isa<ICmpInst>(I.getOperand(0)) ?
408-
cast<ICmpInst>(I.getOperand(0))->isSigned() : false;
407+
return isa<ICmpInst>(I.getOperand(0)) &&
408+
cast<ICmpInst>(I.getOperand(0))->isSigned();
409409
}
410410

411411
bool AMDGPUCodeGenPrepareImpl::needsPromotionToI32(const Type *T) const {

llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ bool AMDGPUTargetLowering::isNarrowingProfitable(SDNode *N, EVT SrcVT,
10411041
case ISD::SETCC:
10421042
case ISD::SELECT:
10431043
if (Subtarget->has16BitInsts() &&
1044-
(DestVT.isVector() ? !Subtarget->hasVOP3PInsts() : true)) {
1044+
(!DestVT.isVector() || !Subtarget->hasVOP3PInsts())) {
10451045
// Don't narrow back down to i16 if promoted to i32 already.
10461046
if (!N->isDivergent() && DestVT.isInteger() &&
10471047
DestVT.getScalarSizeInBits() > 1 &&

llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,9 +2003,9 @@ static bool parseTexFail(uint64_t TexFailCtrl, bool &TFE, bool &LWE,
20032003
if (TexFailCtrl)
20042004
IsTexFail = true;
20052005

2006-
TFE = (TexFailCtrl & 0x1) ? true : false;
2006+
TFE = TexFailCtrl & 0x1;
20072007
TexFailCtrl &= ~(uint64_t)0x1;
2008-
LWE = (TexFailCtrl & 0x2) ? true : false;
2008+
LWE = TexFailCtrl & 0x2;
20092009
TexFailCtrl &= ~(uint64_t)0x2;
20102010

20112011
return TexFailCtrl == 0;

llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ bool AMDGPUPromoteAllocaImpl::run(Function &F, bool PromoteToLDS) {
308308

309309
MaxVGPRs = getMaxVGPRs(TM, F);
310310

311-
bool SufficientLDS = PromoteToLDS ? hasSufficientLocalMem(F) : false;
311+
bool SufficientLDS = PromoteToLDS && hasSufficientLocalMem(F);
312312

313313
// Use up to 1/4 of available register budget for vectorization.
314314
// FIXME: Increase the limit for whole function budgets? Perhaps x2?

llvm/lib/Target/AMDGPU/AMDGPUSwLowerLDS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ void AMDGPUSwLowerLDS::buildSwDynLDSGlobal(Function *Func) {
378378

379379
void AMDGPUSwLowerLDS::populateSwLDSAttributeAndMetadata(Function *Func) {
380380
auto &LDSParams = FuncLDSAccessInfo.KernelToLDSParametersMap[Func];
381-
bool IsDynLDSUsed = LDSParams.SwDynLDS ? true : false;
381+
bool IsDynLDSUsed = LDSParams.SwDynLDS;
382382
uint32_t Offset = LDSParams.LDSSize;
383383
recordLDSAbsoluteAddress(M, LDSParams.SwLDS, 0);
384384
addLDSSizeAttribute(Func, Offset, IsDynLDSUsed);

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15334,10 +15334,8 @@ SDNode *SITargetLowering::adjustWritemask(MachineSDNode *&Node,
1533415334
unsigned NewDmask = 0;
1533515335
unsigned TFEIdx = AMDGPU::getNamedOperandIdx(Opcode, AMDGPU::OpName::tfe) - 1;
1533615336
unsigned LWEIdx = AMDGPU::getNamedOperandIdx(Opcode, AMDGPU::OpName::lwe) - 1;
15337-
bool UsesTFC = ((int(TFEIdx) >= 0 && Node->getConstantOperandVal(TFEIdx)) ||
15338-
(int(LWEIdx) >= 0 && Node->getConstantOperandVal(LWEIdx)))
15339-
? true
15340-
: false;
15337+
bool UsesTFC = (int(TFEIdx) >= 0 && Node->getConstantOperandVal(TFEIdx)) ||
15338+
(int(LWEIdx) >= 0 && Node->getConstantOperandVal(LWEIdx));
1534115339
unsigned TFCLane = 0;
1534215340
bool HasChain = Node->getNumValues() > 1;
1534315341

llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3500,7 +3500,7 @@ bool SIRegisterInfo::isSGPRReg(const MachineRegisterInfo &MRI,
35003500
RC = MRI.getRegClass(Reg);
35013501
else
35023502
RC = getPhysRegBaseClass(Reg);
3503-
return RC ? isSGPRClass(RC) : false;
3503+
return RC && isSGPRClass(RC);
35043504
}
35053505

35063506
const TargetRegisterClass *

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -459,17 +459,17 @@ int getMTBUFElements(unsigned Opc) {
459459

460460
bool getMTBUFHasVAddr(unsigned Opc) {
461461
const MTBUFInfo *Info = getMTBUFOpcodeHelper(Opc);
462-
return Info ? Info->has_vaddr : false;
462+
return Info && Info->has_vaddr;
463463
}
464464

465465
bool getMTBUFHasSrsrc(unsigned Opc) {
466466
const MTBUFInfo *Info = getMTBUFOpcodeHelper(Opc);
467-
return Info ? Info->has_srsrc : false;
467+
return Info && Info->has_srsrc;
468468
}
469469

470470
bool getMTBUFHasSoffset(unsigned Opc) {
471471
const MTBUFInfo *Info = getMTBUFOpcodeHelper(Opc);
472-
return Info ? Info->has_soffset : false;
472+
return Info && Info->has_soffset;
473473
}
474474

475475
int getMUBUFBaseOpcode(unsigned Opc) {
@@ -489,47 +489,47 @@ int getMUBUFElements(unsigned Opc) {
489489

490490
bool getMUBUFHasVAddr(unsigned Opc) {
491491
const MUBUFInfo *Info = getMUBUFOpcodeHelper(Opc);
492-
return Info ? Info->has_vaddr : false;
492+
return Info && Info->has_vaddr;
493493
}
494494

495495
bool getMUBUFHasSrsrc(unsigned Opc) {
496496
const MUBUFInfo *Info = getMUBUFOpcodeHelper(Opc);
497-
return Info ? Info->has_srsrc : false;
497+
return Info && Info->has_srsrc;
498498
}
499499

500500
bool getMUBUFHasSoffset(unsigned Opc) {
501501
const MUBUFInfo *Info = getMUBUFOpcodeHelper(Opc);
502-
return Info ? Info->has_soffset : false;
502+
return Info && Info->has_soffset;
503503
}
504504

505505
bool getMUBUFIsBufferInv(unsigned Opc) {
506506
const MUBUFInfo *Info = getMUBUFOpcodeHelper(Opc);
507-
return Info ? Info->IsBufferInv : false;
507+
return Info && Info->IsBufferInv;
508508
}
509509

510510
bool getMUBUFTfe(unsigned Opc) {
511511
const MUBUFInfo *Info = getMUBUFOpcodeHelper(Opc);
512-
return Info ? Info->tfe : false;
512+
return Info && Info->tfe;
513513
}
514514

515515
bool getSMEMIsBuffer(unsigned Opc) {
516516
const SMInfo *Info = getSMEMOpcodeHelper(Opc);
517-
return Info ? Info->IsBuffer : false;
517+
return Info && Info->IsBuffer;
518518
}
519519

520520
bool getVOP1IsSingle(unsigned Opc) {
521521
const VOPInfo *Info = getVOP1OpcodeHelper(Opc);
522-
return Info ? Info->IsSingle : true;
522+
return !Info || Info->IsSingle;
523523
}
524524

525525
bool getVOP2IsSingle(unsigned Opc) {
526526
const VOPInfo *Info = getVOP2OpcodeHelper(Opc);
527-
return Info ? Info->IsSingle : true;
527+
return !Info || Info->IsSingle;
528528
}
529529

530530
bool getVOP3IsSingle(unsigned Opc) {
531531
const VOPInfo *Info = getVOP3OpcodeHelper(Opc);
532-
return Info ? Info->IsSingle : true;
532+
return !Info || Info->IsSingle;
533533
}
534534

535535
bool isVOPC64DPP(unsigned Opc) {
@@ -540,12 +540,12 @@ bool isVOPCAsmOnly(unsigned Opc) { return isVOPCAsmOnlyOpcodeHelper(Opc); }
540540

541541
bool getMAIIsDGEMM(unsigned Opc) {
542542
const MAIInstInfo *Info = getMAIInstInfoHelper(Opc);
543-
return Info ? Info->is_dgemm : false;
543+
return Info && Info->is_dgemm;
544544
}
545545

546546
bool getMAIIsGFX940XDL(unsigned Opc) {
547547
const MAIInstInfo *Info = getMAIInstInfoHelper(Opc);
548-
return Info ? Info->is_gfx940_xdl : false;
548+
return Info && Info->is_gfx940_xdl;
549549
}
550550

551551
uint8_t mfmaScaleF8F6F4FormatToNumRegs(unsigned EncodingVal) {
@@ -666,7 +666,7 @@ bool isGenericAtomic(unsigned Opc) {
666666

667667
bool isTrue16Inst(unsigned Opc) {
668668
const VOPTrue16Info *Info = getTrue16OpcodeHelper(Opc);
669-
return Info ? Info->IsTrue16 : false;
669+
return Info && Info->IsTrue16;
670670
}
671671

672672
FPType getFPDstSelType(unsigned Opc) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ bool AMDGPUMCKernelCodeT::ParseKernelCodeT(StringRef ID, MCAsmParser &MCParser,
452452
return true;
453453
}
454454
auto Parser = getParserTable()[Idx];
455-
return Parser ? Parser(*this, MCParser, Err) : false;
455+
return Parser && Parser(*this, MCParser, Err);
456456
}
457457

458458
void AMDGPUMCKernelCodeT::EmitKernelCodeT(raw_ostream &OS, MCContext &Ctx,

0 commit comments

Comments
 (0)