diff options
author | Vyacheslav Levytskyy <vyacheslav.levytskyy@intel.com> | 2024-12-09 21:10:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-09 21:10:09 +0100 |
commit | 42633cf27bd2cfb44e9f332c33cfd6750b9d7be4 (patch) | |
tree | ad5bd7a20d6c8d61e1ae4d1ab7c1fd1596a5b6f6 /llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp | |
parent | 0f7b3a9407d20e6a4d33ea623e05cf2a3f65eabd (diff) | |
download | llvm-42633cf27bd2cfb44e9f332c33cfd6750b9d7be4.zip llvm-42633cf27bd2cfb44e9f332c33cfd6750b9d7be4.tar.gz llvm-42633cf27bd2cfb44e9f332c33cfd6750b9d7be4.tar.bz2 |
[SPIR-V] Improve general validity of emitted code between passes (#119202)
This PR improves general validity of emitted code between passes due to
generation of `TargetOpcode::PHI` instead of `SPIRV::OpPhi` after
Instruction Selection, fixing generation of OpTypePointer instructions
and using of proper virtual register classes.
Using `TargetOpcode::PHI` instead of `SPIRV::OpPhi` after Instruction
Selection has a benefit to support existing optimization passes
immediately, as an alternative path to disable those passes that use
`MI.isPHI()`. This PR makes it possible thus to revert
https://github.com/llvm/llvm-project/pull/116060 actions and get back to
use the `MachineSink` pass.
This PR is a solution of the problem discussed in details in
https://github.com/llvm/llvm-project/pull/110507. It accepts an advice
from code reviewers of the PR #110507 to postpone generation of OpPhi
rather than to patch CodeGen. This solution allows to unblock
improvements wrt. expensive checks and makes it unrelated to the general
points of the discussion about OpPhi vs. G_PHI/PHI.
This PR contains numerous small patches of emitted code validity that
allows to substantially pass rate with expensive checks. Namely, the
test suite with expensive checks set ON now has only 12 fails out of 569
total test cases.
FYI @bogner
Diffstat (limited to 'llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp')
-rw-r--r-- | llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp index 4ee71c7..4dea405 100644 --- a/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp +++ b/llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp @@ -1770,6 +1770,27 @@ static void addMBBNames(const Module &M, const SPIRVInstrInfo &TII, } } +// patching Instruction::PHI to SPIRV::OpPhi +static void patchPhis(const Module &M, SPIRVGlobalRegistry *GR, + const SPIRVInstrInfo &TII, MachineModuleInfo *MMI) { + for (auto F = M.begin(), E = M.end(); F != E; ++F) { + MachineFunction *MF = MMI->getMachineFunction(*F); + if (!MF) + continue; + for (auto &MBB : *MF) { + for (MachineInstr &MI : MBB) { + if (MI.getOpcode() != TargetOpcode::PHI) + continue; + MI.setDesc(TII.get(SPIRV::OpPhi)); + Register ResTypeReg = GR->getSPIRVTypeID( + GR->getSPIRVTypeForVReg(MI.getOperand(0).getReg(), MF)); + MI.insert(MI.operands_begin() + 1, + {MachineOperand::CreateReg(ResTypeReg, false)}); + } + } + } +} + struct SPIRV::ModuleAnalysisInfo SPIRVModuleAnalysis::MAI; void SPIRVModuleAnalysis::getAnalysisUsage(AnalysisUsage &AU) const { @@ -1788,6 +1809,8 @@ bool SPIRVModuleAnalysis::runOnModule(Module &M) { setBaseInfo(M); + patchPhis(M, GR, *TII, MMI); + addMBBNames(M, *TII, MMI, *ST, MAI); addDecorations(M, *TII, MMI, *ST, MAI); |