This is an archive of the discontinued LLVM Phabricator instance.

Differential D81690

AMDGPU: Do not bundle inline asm
ClosedPublic

Authored by arsenm on Jun 11 2020, 1:49 PM.

Details

Reviewers
dp
rampitec
Summary

Fixes bug 46285

Diff Detail

Event Timeline

arsenm created this revision.Jun 11 2020, 1:49 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 11 2020, 1:49 PM
Herald added subscribers: kerbowa, hiraditya, t-tye and 7 others. · View Herald Transcript
rampitec accepted this revision.Jun 11 2020, 1:56 PM

LGTM

This revision is now accepted and ready to land.Jun 11 2020, 1:56 PM
arsenm closed this revision.Jun 14 2020, 10:28 AM

804397dde69a44ed23b6f9671757567b067a59d2

Revision Contents

PathSize
llvm/
lib/
Target/
AMDGPU/
9 lines
test/
CodeGen/
AMDGPU/
35 lines

Diff 270228

llvm/lib/Target/AMDGPU/SIPostRABundler.cpp

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
} }
bool SIPostRABundler::runOnMachineFunction(MachineFunction &MF) { bool SIPostRABundler::runOnMachineFunction(MachineFunction &MF) {
if (skipFunction(MF.getFunction())) if (skipFunction(MF.getFunction()))
return false; return false;
TRI = MF.getSubtarget<GCNSubtarget>().getRegisterInfo(); TRI = MF.getSubtarget<GCNSubtarget>().getRegisterInfo();
bool Changed = false; bool Changed = false;
const unsigned MemFlags = SIInstrFlags::MTBUF | SIInstrFlags::MUBUF | const uint64_t MemFlags = SIInstrFlags::MTBUF | SIInstrFlags::MUBUF |
SIInstrFlags::SMRD | SIInstrFlags::DS | SIInstrFlags::SMRD | SIInstrFlags::DS |
SIInstrFlags::FLAT | SIInstrFlags::MIMG; SIInstrFlags::FLAT | SIInstrFlags::MIMG;
for (MachineBasicBlock &MBB : MF) { for (MachineBasicBlock &MBB : MF) {
MachineBasicBlock::instr_iterator Next; MachineBasicBlock::instr_iterator Next;
MachineBasicBlock::instr_iterator B = MBB.instr_begin(); MachineBasicBlock::instr_iterator B = MBB.instr_begin();
MachineBasicBlock::instr_iterator E = MBB.instr_end(); MachineBasicBlock::instr_iterator E = MBB.instr_end();
for (auto I = B; I != E; I = Next) { for (auto I = B; I != E; I = Next) {
Next = std::next(I); Next = std::next(I);
if (I->isBundled() || !I->mayLoadOrStore() || const uint64_t IMemFlags = I->getDesc().TSFlags & MemFlags;
if (IMemFlags == 0 || I->isBundled() || !I->mayLoadOrStore() ||
B->mayLoad() != I->mayLoad() || B->mayStore() != I->mayStore() || B->mayLoad() != I->mayLoad() || B->mayStore() != I->mayStore() ||
(B->getDesc().TSFlags & MemFlags) != ((B->getDesc().TSFlags & MemFlags) != IMemFlags) ||
(I->getDesc().TSFlags & MemFlags) ||
isDependentLoad(*I)) { isDependentLoad(*I)) {
if (B != I) { if (B != I) {
if (std::next(B) != I) { if (std::next(B) != I) {
finalizeBundle(MBB, B, I); finalizeBundle(MBB, B, I);
Changed = true; Changed = true;
} }
Next = I; Next = I;
Show All 23 Lines

llvm/test/CodeGen/AMDGPU/no-bundle-asm.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 < %s | FileCheck %s
; SIPostRABundler used to incorrectly try to form a bundle containing
; inline asm.
define amdgpu_kernel void @no_bundle_asm_sideeffect() {
; CHECK-LABEL: no_bundle_asm_sideeffect:
; CHECK: ; %bb.0:
; CHECK-NEXT: ;;#ASMSTART
; CHECK-NEXT: s_mov_b32 s0, 42
; CHECK-NEXT: ;;#ASMEND
; CHECK-NEXT: ;;#ASMSTART
; CHECK-NEXT: s_mov_b64 s[0:1], 42
; CHECK-NEXT: ;;#ASMEND
; CHECK-NEXT: s_endpgm
call void asm sideeffect "s_mov_b32 s0, $0", "i,~{s0}"(i32 42)
call void asm sideeffect "s_mov_b64 s[0:1], $0", "i,~{s[0:1]}"(i64 42)
ret void
}
define amdgpu_kernel void @no_bundle_asm() {
; CHECK-LABEL: no_bundle_asm:
; CHECK: ; %bb.0:
; CHECK-NEXT: ;;#ASMSTART
; CHECK-NEXT: s_mov_b32 s0, 42
; CHECK-NEXT: ;;#ASMEND
; CHECK-NEXT: ;;#ASMSTART
; CHECK-NEXT: s_mov_b64 s[0:1], 42
; CHECK-NEXT: ;;#ASMEND
; CHECK-NEXT: s_endpgm
call void asm "s_mov_b32 s0, $0", "i,~{s0}"(i32 42)
call void asm "s_mov_b64 s[0:1], $0", "i,~{s[0:1]}"(i64 42)
ret void
}