Skip to content

Commit 6892c17

Browse files
AMDGPU/GlobalISel: add AMDGPUGlobalISelDivergenceLowering pass (llvm#75340)
Add empty AMDGPUGlobalISelDivergenceLowering pass. This pass will implement - selection of divergent i1 phis as lane mask phis, requires lane mask merging in some cases - lower uses of divergent i1 values outside of the cycle using lane mask merging - lowering of all cases of temporal divergence: - lower uses of uniform i1 values outside of the cycle using lane mask merging - lower uses of uniform non-i1 values outside of the cycle using a copy to vgpr inside of the cycle Add very detailed set of regression tests for cases mentioned above. patch 1 from: llvm#73337
1 parent ae2f816 commit 6892c17

14 files changed

+4514
-0
lines changed

llvm/lib/Target/AMDGPU/AMDGPU.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ FunctionPass *createSIAnnotateControlFlowPass();
3636
FunctionPass *createSIFoldOperandsPass();
3737
FunctionPass *createSIPeepholeSDWAPass();
3838
FunctionPass *createSILowerI1CopiesPass();
39+
FunctionPass *createAMDGPUGlobalISelDivergenceLoweringPass();
3940
FunctionPass *createSIShrinkInstructionsPass();
4041
FunctionPass *createSILoadStoreOptimizerPass();
4142
FunctionPass *createSIWholeQuadModePass();
@@ -162,6 +163,9 @@ extern char &SILowerWWMCopiesID;
162163
void initializeSILowerI1CopiesPass(PassRegistry &);
163164
extern char &SILowerI1CopiesID;
164165

166+
void initializeAMDGPUGlobalISelDivergenceLoweringPass(PassRegistry &);
167+
extern char &AMDGPUGlobalISelDivergenceLoweringID;
168+
165169
void initializeSILowerSGPRSpillsPass(PassRegistry &);
166170
extern char &SILowerSGPRSpillsID;
167171

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
//===-- AMDGPUGlobalISelDivergenceLowering.cpp ----------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
//
9+
/// \file
10+
/// GlobalISel pass that selects divergent i1 phis as lane mask phis.
11+
/// Lane mask merging uses same algorithm as SDAG in SILowerI1Copies.
12+
/// Handles all cases of temporal divergence.
13+
/// For divergent non-phi i1 and uniform i1 uses outside of the cycle this pass
14+
/// currently depends on LCSSA to insert phis with one incoming.
15+
//
16+
//===----------------------------------------------------------------------===//
17+
18+
#include "AMDGPU.h"
19+
#include "llvm/CodeGen/MachineFunctionPass.h"
20+
21+
#define DEBUG_TYPE "amdgpu-global-isel-divergence-lowering"
22+
23+
using namespace llvm;
24+
25+
namespace {
26+
27+
class AMDGPUGlobalISelDivergenceLowering : public MachineFunctionPass {
28+
public:
29+
static char ID;
30+
31+
public:
32+
AMDGPUGlobalISelDivergenceLowering() : MachineFunctionPass(ID) {
33+
initializeAMDGPUGlobalISelDivergenceLoweringPass(
34+
*PassRegistry::getPassRegistry());
35+
}
36+
37+
bool runOnMachineFunction(MachineFunction &MF) override;
38+
39+
StringRef getPassName() const override {
40+
return "AMDGPU GlobalISel divergence lowering";
41+
}
42+
43+
void getAnalysisUsage(AnalysisUsage &AU) const override {
44+
AU.setPreservesCFG();
45+
MachineFunctionPass::getAnalysisUsage(AU);
46+
}
47+
};
48+
49+
} // End anonymous namespace.
50+
51+
INITIALIZE_PASS_BEGIN(AMDGPUGlobalISelDivergenceLowering, DEBUG_TYPE,
52+
"AMDGPU GlobalISel divergence lowering", false, false)
53+
INITIALIZE_PASS_END(AMDGPUGlobalISelDivergenceLowering, DEBUG_TYPE,
54+
"AMDGPU GlobalISel divergence lowering", false, false)
55+
56+
char AMDGPUGlobalISelDivergenceLowering::ID = 0;
57+
58+
char &llvm::AMDGPUGlobalISelDivergenceLoweringID =
59+
AMDGPUGlobalISelDivergenceLowering::ID;
60+
61+
FunctionPass *llvm::createAMDGPUGlobalISelDivergenceLoweringPass() {
62+
return new AMDGPUGlobalISelDivergenceLowering();
63+
}
64+
65+
bool AMDGPUGlobalISelDivergenceLowering::runOnMachineFunction(
66+
MachineFunction &MF) {
67+
return false;
68+
}

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeAMDGPUTarget() {
375375
initializeAMDGPUDAGToDAGISelPass(*PR);
376376
initializeGCNDPPCombinePass(*PR);
377377
initializeSILowerI1CopiesPass(*PR);
378+
initializeAMDGPUGlobalISelDivergenceLoweringPass(*PR);
378379
initializeSILowerWWMCopiesPass(*PR);
379380
initializeSILowerSGPRSpillsPass(*PR);
380381
initializeSIFixSGPRCopiesPass(*PR);
@@ -1255,6 +1256,7 @@ bool GCNPassConfig::addLegalizeMachineIR() {
12551256
void GCNPassConfig::addPreRegBankSelect() {
12561257
bool IsOptNone = getOptLevel() == CodeGenOptLevel::None;
12571258
addPass(createAMDGPUPostLegalizeCombiner(IsOptNone));
1259+
addPass(createAMDGPUGlobalISelDivergenceLoweringPass());
12581260
}
12591261

12601262
bool GCNPassConfig::addRegBankSelect() {

llvm/lib/Target/AMDGPU/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ add_llvm_target(AMDGPUCodeGen
5555
AMDGPUCtorDtorLowering.cpp
5656
AMDGPUExportClustering.cpp
5757
AMDGPUFrameLowering.cpp
58+
AMDGPUGlobalISelDivergenceLowering.cpp
5859
AMDGPUGlobalISelUtils.cpp
5960
AMDGPUHSAMetadataStreamer.cpp
6061
AMDGPUInsertDelayAlu.cpp

0 commit comments

Comments
 (0)