shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AMDGPU] Make use of SIInstrInfo::isWaitcnt. NFC. (#154087)

Browse Source
This commit is contained in:
Jay Foad 2025-08-18 16:18:46 +01:00 committed by GitHub
parent 6ce13ae1c2
commit f15c6ff6cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
llvm/lib/Target/AMDGPU/GCNHazardRecognizer.cpp
View File

@ -1357,17 +1357,10 @@ bool GCNHazardRecognizer::fixSMEMtoVectorWriteHazards(MachineInstr *MI) {
// DsCnt corresponds to LGKMCnt here. // DsCnt corresponds to LGKMCnt here.
return (Decoded.DsCnt == 0); return (Decoded.DsCnt == 0);
} }
case AMDGPU::S_WAIT_STORECNT:
case AMDGPU::S_WAIT_STORECNT_DSCNT:
case AMDGPU::S_WAIT_LOADCNT:
case AMDGPU::S_WAIT_LOADCNT_DSCNT:
case AMDGPU::S_WAIT_SAMPLECNT:
case AMDGPU::S_WAIT_BVHCNT:
case AMDGPU::S_WAIT_DSCNT:
case AMDGPU::S_WAIT_EXPCNT:
case AMDGPU::S_WAIT_KMCNT:
llvm_unreachable("unexpected wait count instruction");
default: default:
assert((!SIInstrInfo::isWaitcnt(MI.getOpcode()) ||
MI.getOpcode() == AMDGPU::S_WAIT_IDLE) &&
"unexpected wait count instruction");
// SOPP instructions cannot mitigate the hazard. // SOPP instructions cannot mitigate the hazard.
if (TII->isSOPP(MI)) if (TII->isSOPP(MI))
return false; return false;
@ -2257,28 +2250,7 @@ int GCNHazardRecognizer::checkFPAtomicToDenormModeHazard(MachineInstr *MI) {
if (WaitStates >= 3 || SIInstrInfo::isVALU(MI)) if (WaitStates >= 3 || SIInstrInfo::isVALU(MI))
return true; return true;
switch (MI.getOpcode()) { return SIInstrInfo::isWaitcnt(MI.getOpcode());
case AMDGPU::S_WAITCNT:
case AMDGPU::S_WAITCNT_VSCNT:
case AMDGPU::S_WAITCNT_VMCNT:
case AMDGPU::S_WAITCNT_EXPCNT:
case AMDGPU::S_WAITCNT_LGKMCNT:
case AMDGPU::S_WAIT_IDLE:
case AMDGPU::S_WAIT_LOADCNT:
case AMDGPU::S_WAIT_LOADCNT_DSCNT:
case AMDGPU::S_WAIT_SAMPLECNT:
case AMDGPU::S_WAIT_BVHCNT:
case AMDGPU::S_WAIT_STORECNT:
case AMDGPU::S_WAIT_STORECNT_DSCNT:
case AMDGPU::S_WAIT_EXPCNT:
case AMDGPU::S_WAIT_DSCNT:
case AMDGPU::S_WAIT_KMCNT:
return true;
default:
break;
}
return false;
}; };
return FPAtomicToDenormModeWaitStates - return FPAtomicToDenormModeWaitStates -

2
llvm/lib/Target/AMDGPU/SIInstrInfo.h
View File

@ -1056,7 +1056,7 @@ public:
} }
} }
bool isWaitcnt(unsigned Opcode) const { static bool isWaitcnt(unsigned Opcode) {
switch (getNonSoftWaitcntOpcode(Opcode)) { switch (getNonSoftWaitcntOpcode(Opcode)) {
case AMDGPU::S_WAITCNT: case AMDGPU::S_WAITCNT:
case AMDGPU::S_WAITCNT_VSCNT: case AMDGPU::S_WAITCNT_VSCNT: