Skip to content

Commit f44abf4

Browse files
topperctopperc
committed
[SelectionDAG] Move SDNode::use_iterator::getOperandNo to SDUse.
This allows to write more range based for loops because we no longer need the iterator. SDNode is declared after SDUse so I had to put the definition later in the header file.
1 parent 18e1928 commit f44abf4

File tree

10 files changed

+58
-69
lines changed

10 files changed

+58
-69
lines changed

‎llvm/include/llvm/CodeGen/SelectionDAGNodes.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,9 @@ class SDUse {
310310
/// Get the next SDUse in the use list.
311311
SDUse *getNext() const { return Next; }
312312

313+
/// Return the operand # of this use in its user.
314+
inline unsigned getOperandNo() const;
315+
313316
/// Convenience function for get().getNode().
314317
SDNode *getNode() const { return Val.getNode(); }
315318
/// Convenience function for get().getResNo().
@@ -827,12 +830,6 @@ END_TWO_BYTE_PACK()
827830
}
828831

829832
SDUse *operator->() const { return &operator*(); }
830-
831-
/// Retrieve the operand # of this use in its user.
832-
unsigned getOperandNo() const {
833-
assert(Op && "Cannot dereference end iterator!");
834-
return (unsigned)(Op - Op->getUser()->OperandList);
835-
}
836833
};
837834

838835
class user_iterator {
@@ -1309,6 +1306,9 @@ inline void SDValue::dumpr(const SelectionDAG *G) const {
13091306
}
13101307

13111308
// Define inline functions from the SDUse class.
1309+
inline unsigned SDUse::getOperandNo() const {
1310+
return this - getUser()->op_begin();
1311+
}
13121312

13131313
inline void SDUse::set(const SDValue &V) {
13141314
if (Val.getNode()) removeFromList();

‎llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18921,10 +18921,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
1892118921
SmallVector<SDNode *, 16> OtherUses;
1892218922
unsigned MaxSteps = SelectionDAG::getHasPredecessorMaxSteps();
1892318923
if (isa<ConstantSDNode>(Offset))
18924-
for (SDNode::use_iterator UI = BasePtr->use_begin(),
18925-
UE = BasePtr->use_end();
18926-
UI != UE; ++UI) {
18927-
SDUse &Use = *UI;
18924+
for (SDUse &Use : BasePtr->uses()) {
1892818925
// Skip the use that is Ptr and uses of other results from BasePtr's
1892918926
// node (important for nodes that return multiple results).
1893018927
if (Use.getUser() == Ptr.getNode() || Use != BasePtr)
@@ -18940,7 +18937,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
1894018937
break;
1894118938
}
1894218939

18943-
SDValue Op1 = Use.getUser()->getOperand((UI.getOperandNo() + 1) & 1);
18940+
SDValue Op1 = Use.getUser()->getOperand((Use.getOperandNo() + 1) & 1);
1894418941
if (!isa<ConstantSDNode>(Op1)) {
1894518942
OtherUses.clear();
1894618943
break;
@@ -20931,11 +20928,11 @@ DAGCombiner::getStoreMergeCandidates(StoreSDNode *St,
2093120928
RootCount->second.second > StoreMergeDependenceLimit;
2093220929
};
2093320930

20934-
auto TryToAddCandidate = [&](SDNode::use_iterator UseIter) {
20931+
auto TryToAddCandidate = [&](SDUse &Use) {
2093520932
// This must be a chain use.
20936-
if (UseIter.getOperandNo() != 0)
20933+
if (Use.getOperandNo() != 0)
2093720934
return;
20938-
if (auto *OtherStore = dyn_cast<StoreSDNode>(UseIter->getUser())) {
20935+
if (auto *OtherStore = dyn_cast<StoreSDNode>(Use.getUser())) {
2093920936
BaseIndexOffset Ptr;
2094020937
int64_t PtrDiff;
2094120938
if (CandidateMatch(OtherStore, Ptr, PtrDiff) &&
@@ -20954,19 +20951,19 @@ DAGCombiner::getStoreMergeCandidates(StoreSDNode *St,
2095420951
for (auto I = RootNode->use_begin(), E = RootNode->use_end();
2095520952
I != E && NumNodesExplored < MaxSearchNodes; ++I, ++NumNodesExplored) {
2095620953
SDNode *User = I->getUser();
20957-
if (I.getOperandNo() == 0 && isa<LoadSDNode>(User)) { // walk down chain
20958-
for (auto I2 = User->use_begin(), E2 = User->use_end(); I2 != E2; ++I2)
20959-
TryToAddCandidate(I2);
20954+
if (I->getOperandNo() == 0 && isa<LoadSDNode>(User)) { // walk down chain
20955+
for (SDUse &U2 : User->uses())
20956+
TryToAddCandidate(U2);
2096020957
}
2096120958
// Check stores that depend on the root (e.g. Store 3 in the chart above).
20962-
if (I.getOperandNo() == 0 && isa<StoreSDNode>(User)) {
20963-
TryToAddCandidate(I);
20959+
if (I->getOperandNo() == 0 && isa<StoreSDNode>(User)) {
20960+
TryToAddCandidate(*I);
2096420961
}
2096520962
}
2096620963
} else {
2096720964
for (auto I = RootNode->use_begin(), E = RootNode->use_end();
2096820965
I != E && NumNodesExplored < MaxSearchNodes; ++I, ++NumNodesExplored)
20969-
TryToAddCandidate(I);
20966+
TryToAddCandidate(*I);
2097020967
}
2097120968

2097220969
return RootNode;

‎llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,7 +3757,7 @@ bool AMDGPUDAGToDAGISel::isVGPRImm(const SDNode * N) const {
37573757
for (SDNode::use_iterator U = N->use_begin(), E = SDNode::use_end();
37583758
Limit < 10 && U != E; ++U, ++Limit) {
37593759
const TargetRegisterClass *RC =
3760-
getOperandRegClass(U->getUser(), U.getOperandNo());
3760+
getOperandRegClass(U->getUser(), U->getOperandNo());
37613761

37623762
// If the register class is unknown, it could be an unknown
37633763
// register class that needs to be an SGPR, e.g. an inline asm
@@ -3772,7 +3772,7 @@ bool AMDGPUDAGToDAGISel::isVGPRImm(const SDNode * N) const {
37723772
unsigned Opc = User->getMachineOpcode();
37733773
const MCInstrDesc &Desc = SII->get(Opc);
37743774
if (Desc.isCommutable()) {
3775-
unsigned OpIdx = Desc.getNumDefs() + U.getOperandNo();
3775+
unsigned OpIdx = Desc.getNumDefs() + U->getOperandNo();
37763776
unsigned CommuteIdx1 = TargetInstrInfo::CommuteAnyOperandIndex;
37773777
if (SII->findCommutedOpIndices(Desc, OpIdx, CommuteIdx1)) {
37783778
unsigned CommutedOpNo = CommuteIdx1 - Desc.getNumDefs();

‎llvm/lib/Target/AMDGPU/SIISelLowering.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16874,10 +16874,9 @@ bool SITargetLowering::requiresUniformRegister(MachineFunction &MF,
1687416874
}
1687516875

1687616876
bool SITargetLowering::hasMemSDNodeUser(SDNode *N) const {
16877-
SDNode::use_iterator I = N->use_begin(), E = N->use_end();
16878-
for (; I != E; ++I) {
16879-
if (MemSDNode *M = dyn_cast<MemSDNode>(I->getUser())) {
16880-
if (getBasePtrIndex(M) == I.getOperandNo())
16877+
for (SDUse &Use : N->uses()) {
16878+
if (MemSDNode *M = dyn_cast<MemSDNode>(Use.getUser())) {
16879+
if (getBasePtrIndex(M) == Use.getOperandNo())
1688116880
return true;
1688216881
}
1688316882
}

‎llvm/lib/Target/ARM/ARMISelLowering.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16200,13 +16200,12 @@ static SDValue CombineBaseUpdate(SDNode *N,
1620016200
SmallVector<BaseUpdateUser, 8> BaseUpdates;
1620116201

1620216202
// Search for a use of the address operand that is an increment.
16203-
for (SDNode::use_iterator UI = Addr.getNode()->use_begin(),
16204-
UE = Addr.getNode()->use_end(); UI != UE; ++UI) {
16205-
SDNode *User = UI->getUser();
16206-
if (UI->getResNo() != Addr.getResNo() || User->getNumOperands() != 2)
16203+
for (SDUse &Use : Addr->uses()) {
16204+
SDNode *User = Use.getUser();
16205+
if (Use.getResNo() != Addr.getResNo() || User->getNumOperands() != 2)
1620716206
continue;
1620816207

16209-
SDValue Inc = User->getOperand(UI.getOperandNo() == 1 ? 0 : 1);
16208+
SDValue Inc = User->getOperand(Use.getOperandNo() == 1 ? 0 : 1);
1621016209
unsigned ConstInc =
1621116210
getPointerConstIncrement(User->getOpcode(), Addr, Inc, DCI.DAG);
1621216211

@@ -16221,15 +16220,14 @@ static SDValue CombineBaseUpdate(SDNode *N,
1622116220
if (findPointerConstIncrement(Addr.getNode(), &Base, &CInc)) {
1622216221
unsigned Offset =
1622316222
getPointerConstIncrement(Addr->getOpcode(), Base, CInc, DCI.DAG);
16224-
for (SDNode::use_iterator UI = Base->use_begin(), UE = Base->use_end();
16225-
UI != UE; ++UI) {
16223+
for (SDUse &Use : Base->uses()) {
1622616224

16227-
SDNode *User = UI->getUser();
16228-
if (UI->getResNo() != Base.getResNo() || User == Addr.getNode() ||
16225+
SDNode *User = Use.getUser();
16226+
if (Use.getResNo() != Base.getResNo() || User == Addr.getNode() ||
1622916227
User->getNumOperands() != 2)
1623016228
continue;
1623116229

16232-
SDValue UserInc = User->getOperand(UI.getOperandNo() == 0 ? 1 : 0);
16230+
SDValue UserInc = User->getOperand(Use.getOperandNo() == 0 ? 1 : 0);
1623316231
unsigned UserOffset =
1623416232
getPointerConstIncrement(User->getOpcode(), Base, UserInc, DCI.DAG);
1623516233

‎llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,8 +1302,8 @@ void HexagonDAGToDAGISel::ppHoistZextI1(std::vector<SDNode*> &&Nodes) {
13021302
EVT OpVT = OpI1.getValueType();
13031303
if (!OpVT.isSimple() || OpVT.getSimpleVT() != MVT::i1)
13041304
continue;
1305-
for (auto I = N->use_begin(), E = N->use_end(); I != E; ++I) {
1306-
SDNode *U = I->getUser();
1305+
for (SDUse &Use : N->uses()) {
1306+
SDNode *U = Use.getUser();
13071307
if (U->getNumValues() != 1)
13081308
continue;
13091309
EVT UVT = U->getValueType(0);
@@ -1316,7 +1316,7 @@ void HexagonDAGToDAGISel::ppHoistZextI1(std::vector<SDNode*> &&Nodes) {
13161316
continue;
13171317

13181318
// Potentially simplifiable operation.
1319-
unsigned I1N = I.getOperandNo();
1319+
unsigned I1N = Use.getOperandNo();
13201320
SmallVector<SDValue,2> Ops(U->getNumOperands());
13211321
for (unsigned i = 0, n = U->getNumOperands(); i != n; ++i)
13221322
Ops[i] = U->getOperand(i);

‎llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -954,9 +954,8 @@ static unsigned allUsesTruncate(SelectionDAG *CurDAG, SDNode *N) {
954954
// Cannot use range-based for loop here as we need the actual use (i.e. we
955955
// need the operand number corresponding to the use). A range-based for
956956
// will unbox the use and provide an SDNode*.
957-
for (SDNode::use_iterator UI = N->use_begin(), UE = N->use_end(); UI != UE;
958-
++UI) {
959-
SDNode *User = UI->getUser();
957+
for (SDUse &Use : N->uses()) {
958+
SDNode *User = Use.getUser();
960959
unsigned Opc =
961960
User->isMachineOpcode() ? User->getMachineOpcode() : User->getOpcode();
962961
switch (Opc) {
@@ -972,7 +971,7 @@ static unsigned allUsesTruncate(SelectionDAG *CurDAG, SDNode *N) {
972971
return 0;
973972
StoreSDNode *STN = cast<StoreSDNode>(User);
974973
unsigned MemVTSize = STN->getMemoryVT().getSizeInBits();
975-
if (MemVTSize == 64 || UI.getOperandNo() != 0)
974+
if (MemVTSize == 64 || Use.getOperandNo() != 0)
976975
return 0;
977976
MaxTruncation = std::max(MaxTruncation, MemVTSize);
978977
continue;
@@ -981,23 +980,23 @@ static unsigned allUsesTruncate(SelectionDAG *CurDAG, SDNode *N) {
981980
case PPC::STWX8:
982981
case PPC::STWU8:
983982
case PPC::STWUX8:
984-
if (UI.getOperandNo() != 0)
983+
if (Use.getOperandNo() != 0)
985984
return 0;
986985
MaxTruncation = std::max(MaxTruncation, 32u);
987986
continue;
988987
case PPC::STH8:
989988
case PPC::STHX8:
990989
case PPC::STHU8:
991990
case PPC::STHUX8:
992-
if (UI.getOperandNo() != 0)
991+
if (Use.getOperandNo() != 0)
993992
return 0;
994993
MaxTruncation = std::max(MaxTruncation, 16u);
995994
continue;
996995
case PPC::STB8:
997996
case PPC::STBX8:
998997
case PPC::STBU8:
999998
case PPC::STBUX8:
1000-
if (UI.getOperandNo() != 0)
999+
if (Use.getOperandNo() != 0)
10011000
return 0;
10021001
MaxTruncation = std::max(MaxTruncation, 8u);
10031002
continue;

‎llvm/lib/Target/RISCV/RISCVISelDAGToDAG.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,16 +3293,16 @@ bool RISCVDAGToDAGISel::hasAllNBitUsers(SDNode *Node, unsigned Bits,
32933293
if (Depth == 0 && !Node->getValueType(0).isScalarInteger())
32943294
return false;
32953295

3296-
for (auto UI = Node->use_begin(), UE = Node->use_end(); UI != UE; ++UI) {
3297-
SDNode *User = UI->getUser();
3296+
for (SDUse &Use : Node->uses()) {
3297+
SDNode *User = Use.getUser();
32983298
// Users of this node should have already been instruction selected
32993299
if (!User->isMachineOpcode())
33003300
return false;
33013301

33023302
// TODO: Add more opcodes?
33033303
switch (User->getMachineOpcode()) {
33043304
default:
3305-
if (vectorPseudoHasAllNBitUsers(User, UI.getOperandNo(), Bits, TII))
3305+
if (vectorPseudoHasAllNBitUsers(User, Use.getOperandNo(), Bits, TII))
33063306
break;
33073307
return false;
33083308
case RISCV::ADDW:
@@ -3353,7 +3353,7 @@ bool RISCVDAGToDAGISel::hasAllNBitUsers(SDNode *Node, unsigned Bits,
33533353
case RISCV::BCLR:
33543354
case RISCV::BINV:
33553355
// Shift amount operands only use log2(Xlen) bits.
3356-
if (UI.getOperandNo() == 1 && Bits >= Log2_32(Subtarget->getXLen()))
3356+
if (Use.getOperandNo() == 1 && Bits >= Log2_32(Subtarget->getXLen()))
33573357
break;
33583358
return false;
33593359
case RISCV::SLLI:
@@ -3417,19 +3417,19 @@ bool RISCVDAGToDAGISel::hasAllNBitUsers(SDNode *Node, unsigned Bits,
34173417
case RISCV::SH3ADD_UW:
34183418
// The first operand to add.uw/shXadd.uw is implicitly zero extended from
34193419
// 32 bits.
3420-
if (UI.getOperandNo() == 0 && Bits >= 32)
3420+
if (Use.getOperandNo() == 0 && Bits >= 32)
34213421
break;
34223422
return false;
34233423
case RISCV::SB:
3424-
if (UI.getOperandNo() == 0 && Bits >= 8)
3424+
if (Use.getOperandNo() == 0 && Bits >= 8)
34253425
break;
34263426
return false;
34273427
case RISCV::SH:
3428-
if (UI.getOperandNo() == 0 && Bits >= 16)
3428+
if (Use.getOperandNo() == 0 && Bits >= 16)
34293429
break;
34303430
return false;
34313431
case RISCV::SW:
3432-
if (UI.getOperandNo() == 0 && Bits >= 32)
3432+
if (Use.getOperandNo() == 0 && Bits >= 32)
34333433
break;
34343434
return false;
34353435
}

‎llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15688,14 +15688,12 @@ static SDValue combineOp_VLToVWOp_VL(SDNode *N,
1568815688
auto AppendUsersIfNeeded = [&Worklist, &Subtarget,
1568915689
&Inserted](const NodeExtensionHelper &Op) {
1569015690
if (Op.needToPromoteOtherUsers()) {
15691-
for (SDNode::use_iterator UI = Op.OrigOperand->use_begin(),
15692-
UE = Op.OrigOperand->use_end();
15693-
UI != UE; ++UI) {
15694-
SDNode *TheUser = UI->getUser();
15691+
for (SDUse &Use : Op.OrigOperand->uses()) {
15692+
SDNode *TheUser = Use.getUser();
1569515693
if (!NodeExtensionHelper::isSupportedRoot(TheUser, Subtarget))
1569615694
return false;
1569715695
// We only support the first 2 operands of FMA.
15698-
if (UI.getOperandNo() >= 2)
15696+
if (Use.getOperandNo() >= 2)
1569915697
return false;
1570015698
if (Inserted.insert(TheUser).second)
1570115699
Worklist.push_back(TheUser);

‎llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22868,13 +22868,12 @@ static SDValue MatchVectorAllEqualTest(SDValue LHS, SDValue RHS,
2286822868

2286922869
/// return true if \c Op has a use that doesn't just read flags.
2287022870
static bool hasNonFlagsUse(SDValue Op) {
22871-
for (SDNode::use_iterator UI = Op->use_begin(), UE = Op->use_end(); UI != UE;
22872-
++UI) {
22873-
SDNode *User = UI->getUser();
22874-
unsigned UOpNo = UI.getOperandNo();
22871+
for (SDUse &Use : Op->uses()) {
22872+
SDNode *User = Use.getUser();
22873+
unsigned UOpNo = Use.getOperandNo();
2287522874
if (User->getOpcode() == ISD::TRUNCATE && User->hasOneUse()) {
2287622875
// Look past truncate.
22877-
UOpNo = User->use_begin().getOperandNo();
22876+
UOpNo = User->use_begin()->getOperandNo();
2287822877
User = User->use_begin()->getUser();
2287922878
}
2288022879

@@ -46731,11 +46730,10 @@ static SDValue combineVSelectToBLENDV(SDNode *N, SelectionDAG &DAG,
4673146730
return SDValue();
4673246731

4673346732
auto OnlyUsedAsSelectCond = [](SDValue Cond) {
46734-
for (SDNode::use_iterator UI = Cond->use_begin(), UE = Cond->use_end();
46735-
UI != UE; ++UI)
46736-
if ((UI->getUser()->getOpcode() != ISD::VSELECT &&
46737-
UI->getUser()->getOpcode() != X86ISD::BLENDV) ||
46738-
UI.getOperandNo() != 0)
46733+
for (SDUse &Use : Cond->uses())
46734+
if ((Use.getUser()->getOpcode() != ISD::VSELECT &&
46735+
Use.getUser()->getOpcode() != X86ISD::BLENDV) ||
46736+
Use.getOperandNo() != 0)
4673946737
return false;
4674046738

4674146739
return true;

0 commit comments

Comments
 (0)