Skip to content

Commit c90a536

Browse files
committed
[CodeGen] Simplify code using TypeSize overloads of getMachineMemOperand [nfc]
These were added in d584cea. This change runs through existing uses and simplifies where obvious.
1 parent 1a7af2a commit c90a536

File tree

3 files changed

+17
-24
lines changed

3 files changed

+17
-24
lines changed

llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25186,16 +25186,15 @@ static SDValue narrowExtractedVectorLoad(SDNode *Extract, SelectionDAG &DAG) {
2518625186
// TODO: Use "BaseIndexOffset" to make this more effective.
2518725187
SDValue NewAddr = DAG.getMemBasePlusOffset(Ld->getBasePtr(), Offset, DL);
2518825188

25189-
LocationSize StoreSize = LocationSize::precise(VT.getStoreSize());
2519025189
MachineFunction &MF = DAG.getMachineFunction();
2519125190
MachineMemOperand *MMO;
2519225191
if (Offset.isScalable()) {
2519325192
MachinePointerInfo MPI =
2519425193
MachinePointerInfo(Ld->getPointerInfo().getAddrSpace());
25195-
MMO = MF.getMachineMemOperand(Ld->getMemOperand(), MPI, StoreSize);
25194+
MMO = MF.getMachineMemOperand(Ld->getMemOperand(), MPI, VT.getStoreSize());
2519625195
} else
2519725196
MMO = MF.getMachineMemOperand(Ld->getMemOperand(), Offset.getFixedValue(),
25198-
StoreSize);
25197+
VT.getStoreSize());
2519925198

2520025199
SDValue NewLd = DAG.getLoad(VT, DL, Ld->getChain(), NewAddr, MMO);
2520125200
DAG.makeEquivalentMemoryOrdering(Ld, NewLd);

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9148,7 +9148,7 @@ SDValue SelectionDAG::getLoad(ISD::MemIndexedMode AM, ISD::LoadExtType ExtType,
91489148
if (PtrInfo.V.isNull())
91499149
PtrInfo = InferPointerInfo(PtrInfo, *this, Ptr, Offset);
91509150

9151-
LocationSize Size = LocationSize::precise(MemVT.getStoreSize());
9151+
TypeSize Size = MemVT.getStoreSize();
91529152
MachineFunction &MF = getMachineFunction();
91539153
MachineMemOperand *MMO = MF.getMachineMemOperand(PtrInfo, MMOFlags, Size,
91549154
Alignment, AAInfo, Ranges);
@@ -9269,7 +9269,7 @@ SDValue SelectionDAG::getStore(SDValue Chain, const SDLoc &dl, SDValue Val,
92699269
PtrInfo = InferPointerInfo(PtrInfo, *this, Ptr);
92709270

92719271
MachineFunction &MF = getMachineFunction();
9272-
LocationSize Size = LocationSize::precise(Val.getValueType().getStoreSize());
9272+
TypeSize Size = Val.getValueType().getStoreSize();
92739273
MachineMemOperand *MMO =
92749274
MF.getMachineMemOperand(PtrInfo, MMOFlags, Size, Alignment, AAInfo);
92759275
return getStore(Chain, dl, Val, Ptr, MMO);
@@ -9322,8 +9322,7 @@ SDValue SelectionDAG::getTruncStore(SDValue Chain, const SDLoc &dl, SDValue Val,
93229322

93239323
MachineFunction &MF = getMachineFunction();
93249324
MachineMemOperand *MMO = MF.getMachineMemOperand(
9325-
PtrInfo, MMOFlags, LocationSize::precise(SVT.getStoreSize()), Alignment,
9326-
AAInfo);
9325+
PtrInfo, MMOFlags, SVT.getStoreSize(), Alignment, AAInfo);
93279326
return getTruncStore(Chain, dl, Val, Ptr, SVT, MMO);
93289327
}
93299328

@@ -9417,7 +9416,7 @@ SDValue SelectionDAG::getLoadVP(
94179416
if (PtrInfo.V.isNull())
94189417
PtrInfo = InferPointerInfo(PtrInfo, *this, Ptr, Offset);
94199418

9420-
LocationSize Size = LocationSize::precise(MemVT.getStoreSize());
9419+
TypeSize Size = MemVT.getStoreSize();
94219420
MachineFunction &MF = getMachineFunction();
94229421
MachineMemOperand *MMO = MF.getMachineMemOperand(PtrInfo, MMOFlags, Size,
94239422
Alignment, AAInfo, Ranges);
@@ -9570,8 +9569,7 @@ SDValue SelectionDAG::getTruncStoreVP(SDValue Chain, const SDLoc &dl,
95709569

95719570
MachineFunction &MF = getMachineFunction();
95729571
MachineMemOperand *MMO = MF.getMachineMemOperand(
9573-
PtrInfo, MMOFlags, LocationSize::precise(SVT.getStoreSize()), Alignment,
9574-
AAInfo);
9572+
PtrInfo, MMOFlags, SVT.getStoreSize(), Alignment, AAInfo);
95759573
return getTruncStoreVP(Chain, dl, Val, Ptr, Mask, EVL, SVT, MMO,
95769574
IsCompressing);
95779575
}

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,8 +3018,7 @@ static SDValue getLoadStackGuard(SelectionDAG &DAG, const SDLoc &DL,
30183018
auto Flags = MachineMemOperand::MOLoad | MachineMemOperand::MOInvariant |
30193019
MachineMemOperand::MODereferenceable;
30203020
MachineMemOperand *MemRef = MF.getMachineMemOperand(
3021-
MPInfo, Flags, LocationSize::precise(PtrTy.getSizeInBits() / 8),
3022-
DAG.getEVTAlign(PtrTy));
3021+
MPInfo, Flags, PtrTy.getSizeInBits() / 8, DAG.getEVTAlign(PtrTy));
30233022
DAG.setNodeMemRefs(Node, {MemRef});
30243023
}
30253024
if (PtrTy != PtrMemTy)
@@ -5046,9 +5045,9 @@ void SelectionDAGBuilder::visitAtomicCmpXchg(const AtomicCmpXchgInst &I) {
50465045

50475046
MachineFunction &MF = DAG.getMachineFunction();
50485047
MachineMemOperand *MMO = MF.getMachineMemOperand(
5049-
MachinePointerInfo(I.getPointerOperand()), Flags,
5050-
LocationSize::precise(MemVT.getStoreSize()), DAG.getEVTAlign(MemVT),
5051-
AAMDNodes(), nullptr, SSID, SuccessOrdering, FailureOrdering);
5048+
MachinePointerInfo(I.getPointerOperand()), Flags, MemVT.getStoreSize(),
5049+
DAG.getEVTAlign(MemVT), AAMDNodes(), nullptr, SSID, SuccessOrdering,
5050+
FailureOrdering);
50525051

50535052
SDValue L = DAG.getAtomicCmpSwap(ISD::ATOMIC_CMP_SWAP_WITH_SUCCESS,
50545053
dl, MemVT, VTs, InChain,
@@ -5106,9 +5105,8 @@ void SelectionDAGBuilder::visitAtomicRMW(const AtomicRMWInst &I) {
51065105

51075106
MachineFunction &MF = DAG.getMachineFunction();
51085107
MachineMemOperand *MMO = MF.getMachineMemOperand(
5109-
MachinePointerInfo(I.getPointerOperand()), Flags,
5110-
LocationSize::precise(MemVT.getStoreSize()), DAG.getEVTAlign(MemVT),
5111-
AAMDNodes(), nullptr, SSID, Ordering);
5108+
MachinePointerInfo(I.getPointerOperand()), Flags, MemVT.getStoreSize(),
5109+
DAG.getEVTAlign(MemVT), AAMDNodes(), nullptr, SSID, Ordering);
51125110

51135111
SDValue L =
51145112
DAG.getAtomic(NT, dl, MemVT, InChain,
@@ -5153,9 +5151,8 @@ void SelectionDAGBuilder::visitAtomicLoad(const LoadInst &I) {
51535151
auto Flags = TLI.getLoadMemOperandFlags(I, DAG.getDataLayout(), AC, LibInfo);
51545152

51555153
MachineMemOperand *MMO = DAG.getMachineFunction().getMachineMemOperand(
5156-
MachinePointerInfo(I.getPointerOperand()), Flags,
5157-
LocationSize::precise(MemVT.getStoreSize()), I.getAlign(), AAMDNodes(),
5158-
nullptr, SSID, Order);
5154+
MachinePointerInfo(I.getPointerOperand()), Flags, MemVT.getStoreSize(),
5155+
I.getAlign(), AAMDNodes(), nullptr, SSID, Order);
51595156

51605157
InChain = TLI.prepareVolatileOrAtomicLoad(InChain, dl, DAG);
51615158

@@ -5191,9 +5188,8 @@ void SelectionDAGBuilder::visitAtomicStore(const StoreInst &I) {
51915188

51925189
MachineFunction &MF = DAG.getMachineFunction();
51935190
MachineMemOperand *MMO = MF.getMachineMemOperand(
5194-
MachinePointerInfo(I.getPointerOperand()), Flags,
5195-
LocationSize::precise(MemVT.getStoreSize()), I.getAlign(), AAMDNodes(),
5196-
nullptr, SSID, Ordering);
5191+
MachinePointerInfo(I.getPointerOperand()), Flags, MemVT.getStoreSize(),
5192+
I.getAlign(), AAMDNodes(), nullptr, SSID, Ordering);
51975193

51985194
SDValue Val = getValue(I.getValueOperand());
51995195
if (Val.getValueType() != MemVT)

0 commit comments

Comments
 (0)