Skip to content

Commit 8194ef1

Browse files
committed
Fix formatting issues and change if statements in SelectSMRDBaseOffset() to if-else if.
1 parent 48b758a commit 8194ef1

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2104,9 +2104,7 @@ bool AMDGPUDAGToDAGISel::SelectSMRDBaseOffset(SDValue Addr, SDValue &SBase,
21042104
if (SelectSMRDOffset(N1, SOffset, Offset, Imm32Only, IsBuffer)) {
21052105
SBase = N0;
21062106
Selected = true;
2107-
}
2108-
2109-
if (SelectSMRDOffset(N0, SOffset, Offset, Imm32Only, IsBuffer)) {
2107+
} else if (SelectSMRDOffset(N0, SOffset, Offset, Imm32Only, IsBuffer)) {
21102108
SBase = N1;
21112109
Selected = true;
21122110
}
@@ -2140,7 +2138,8 @@ bool AMDGPUDAGToDAGISel::SelectSMRDBaseOffset(SDValue Addr, SDValue &SBase,
21402138
bool AMDGPUDAGToDAGISel::SelectSMRD(SDValue Addr, SDValue &SBase,
21412139
SDValue *SOffset, SDValue *Offset,
21422140
bool Imm32Only, bool IsPrefetch) const {
2143-
if (SelectSMRDBaseOffset(Addr, SBase, SOffset, Offset, Imm32Only, IsPrefetch)) {
2141+
if (SelectSMRDBaseOffset(Addr, SBase, SOffset, Offset, Imm32Only,
2142+
IsPrefetch)) {
21442143
SBase = Expand32BitAddress(SBase);
21452144
return true;
21462145
}
@@ -2200,7 +2199,7 @@ bool AMDGPUDAGToDAGISel::SelectSMRDBufferSgprImm(SDValue N, SDValue &SOffset,
22002199
}
22012200

22022201
bool AMDGPUDAGToDAGISel::SelectSMRDPrefetchImm(SDValue Addr, SDValue &SBase,
2203-
SDValue &Offset) const {
2202+
SDValue &Offset) const {
22042203
return SelectSMRD(Addr, SBase, /* SOffset */ nullptr, &Offset, false, true);
22052204
}
22062205

llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ class AMDGPUDAGToDAGISel : public SelectionDAGISel {
194194
SDValue *Offset, bool Imm32Only = false,
195195
bool IsBuffer = false) const;
196196
SDValue Expand32BitAddress(SDValue Addr) const;
197-
bool SelectSMRDBaseOffset(SDValue Addr, SDValue & SBase, SDValue * SOffset,
198-
SDValue * Offset, bool Imm32Only = false,
197+
bool SelectSMRDBaseOffset(SDValue Addr, SDValue &SBase, SDValue *SOffset,
198+
SDValue *Offset, bool Imm32Only = false,
199199
bool IsBuffer = false, bool IsPrefetch = false,
200200
bool HasSOffset = false) const;
201-
bool SelectSMRD(SDValue Addr, SDValue & SBase, SDValue * SOffset,
202-
SDValue * Offset, bool Imm32Only = false,
201+
bool SelectSMRD(SDValue Addr, SDValue &SBase, SDValue *SOffset,
202+
SDValue *Offset, bool Imm32Only = false,
203203
bool IsPrefetch = false) const;
204204
bool SelectSMRDImm(SDValue Addr, SDValue &SBase, SDValue &Offset) const;
205205
bool SelectSMRDImm32(SDValue Addr, SDValue &SBase, SDValue &Offset) const;
@@ -210,8 +210,8 @@ class AMDGPUDAGToDAGISel : public SelectionDAGISel {
210210
bool SelectSMRDBufferImm32(SDValue N, SDValue &Offset) const;
211211
bool SelectSMRDBufferSgprImm(SDValue N, SDValue &SOffset,
212212
SDValue &Offset) const;
213-
bool SelectSMRDPrefetchImm(SDValue Addr, SDValue & SBase, SDValue & Offset)
214-
const;
213+
bool SelectSMRDPrefetchImm(SDValue Addr, SDValue &SBase,
214+
SDValue &Offset) const;
215215
bool SelectMOVRELOffset(SDValue Index, SDValue &Base, SDValue &Offset) const;
216216

217217
bool SelectVOP3ModsImpl(SDValue In, SDValue &Src, unsigned &SrcMods,

llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,8 @@ class AMDGPUInstructionSelector final : public InstructionSelector {
220220
InstructionSelector::ComplexRendererFns
221221
selectVINTERPModsHi(MachineOperand &Root) const;
222222

223-
bool selectSmrdOffset(MachineOperand & Root, Register & Base,
224-
Register * SOffset, int64_t * Offset,
225-
bool IsPrefetch = false) const;
223+
bool selectSmrdOffset(MachineOperand &Root, Register &Base, Register *SOffset,
224+
int64_t *Offset, bool IsPrefetch = false) const;
226225

227226
InstructionSelector::ComplexRendererFns
228227
selectSmrdImm(MachineOperand &Root) const;

0 commit comments

Comments
 (0)