Skip to content

Commit 1e45d73

Browse files
authored
[WaveTransform] Missing clang-format on commit by PR #473. (#487)
1 parent a09ca75 commit 1e45d73

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

llvm/lib/Target/AMDGPU/AMDGPULaneMaskUtils.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ class LaneMaskConstants {
7070
XorOpc(IsWave32 ? AMDGPU::S_XOR_B32 : AMDGPU::S_XOR_B64),
7171
XorTermOpc(IsWave32 ? AMDGPU::S_XOR_B32_term : AMDGPU::S_XOR_B64_term),
7272
WQMOpc(IsWave32 ? AMDGPU::S_WQM_B32 : AMDGPU::S_WQM_B64),
73-
LaneMaskRC(IsWave32 ? &AMDGPU::SReg_32RegClass : &AMDGPU::SReg_64RegClass) {}
73+
LaneMaskRC(IsWave32 ? &AMDGPU::SReg_32RegClass
74+
: &AMDGPU::SReg_64RegClass) {}
7475

7576
static inline const LaneMaskConstants &get(const GCNSubtarget &ST);
7677
};

llvm/lib/Target/AMDGPU/AMDGPUWaveTransform.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1841,8 +1841,8 @@ void ControlFlowRewriter::rewrite() {
18411841
Register CondReg = Info.OrigCondition;
18421842
if (!LMA.isSubsetOfExec(CondReg, *Node->Block)) {
18431843
CondReg = LMU.createLaneMaskReg();
1844-
BuildMI(*Node->Block, Node->Block->end(), {},
1845-
TII.get(LMC.AndOpc), CondReg)
1844+
BuildMI(*Node->Block, Node->Block->end(), {}, TII.get(LMC.AndOpc),
1845+
CondReg)
18461846
.addReg(LMC.ExecReg)
18471847
.addReg(Info.OrigCondition);
18481848
}

llvm/lib/Target/AMDGPU/GCNLaneMaskUtils.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,9 @@ void GCNLaneMaskUtils::buildMergeLaneMasks(MachineBasicBlock &MBB,
151151
CurMaskedReg = CurReg;
152152
} else {
153153
CurMaskedReg = createLaneMaskReg();
154-
CurMaskedBuilt =
155-
BuildMI(MBB, I, DL, TII->get(LMC.AndOpc), CurMaskedReg)
156-
.addReg(CurReg)
157-
.addReg(LMC.ExecReg);
154+
CurMaskedBuilt = BuildMI(MBB, I, DL, TII->get(LMC.AndOpc), CurMaskedReg)
155+
.addReg(CurReg)
156+
.addReg(LMC.ExecReg);
158157
}
159158
}
160159

@@ -268,7 +267,7 @@ bool GCNLaneMaskAnalysis::isSubsetOfExec(Register Reg,
268267
void GCNLaneMaskUpdater::init(Register Reg) {
269268
Processed = false;
270269
Blocks.clear();
271-
//SSAUpdater.Initialize(LMU.getLaneMaskConsts().LaneMaskRC);
270+
// SSAUpdater.Initialize(LMU.getLaneMaskConsts().LaneMaskRC);
272271
SSAUpdater.Initialize(Reg);
273272
}
274273

@@ -418,8 +417,8 @@ void GCNLaneMaskUpdater::process() {
418417
// Prepare an all-zero value for the default and reset in accumulating mode.
419418
if (Accumulating && !ZeroReg) {
420419
ZeroReg = LMU.createLaneMaskReg();
421-
BuildMI(Entry, Entry.getFirstTerminator(), {}, TII->get(LMU.getLaneMaskConsts().MovOpc),
422-
ZeroReg)
420+
BuildMI(Entry, Entry.getFirstTerminator(), {},
421+
TII->get(LMU.getLaneMaskConsts().MovOpc), ZeroReg)
423422
.addImm(0);
424423
}
425424

llvm/lib/Target/AMDGPU/GCNLaneMaskUtils.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ class GCNLaneMaskUtils {
3535

3636
public:
3737
GCNLaneMaskUtils() = delete;
38-
explicit GCNLaneMaskUtils(MachineFunction &MF) : MF(MF),
39-
LMC(AMDGPU::LaneMaskConstants::get(MF.getSubtarget<GCNSubtarget>())) {}
38+
explicit GCNLaneMaskUtils(MachineFunction &MF)
39+
: MF(MF),
40+
LMC(AMDGPU::LaneMaskConstants::get(MF.getSubtarget<GCNSubtarget>())) {}
4041

4142
MachineFunction *function() const { return &MF; }
42-
const AMDGPU::LaneMaskConstants &getLaneMaskConsts() const {
43-
return LMC;
44-
}
43+
const AMDGPU::LaneMaskConstants &getLaneMaskConsts() const { return LMC; }
4544

4645
bool maybeLaneMask(Register Reg) const;
4746
bool isConstantLaneMask(Register Reg, bool &Val) const;

0 commit comments

Comments
 (0)