Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FastRA] Fix handling of bundled MIs
Fast register allocator skips bundled MIs, as the main assignment loop uses MachineBasicBlock::iterator (= MachineInstrBundleIterator) This was causing SIInsertWaitcnts to crash which expects all instructions to have registers assigned. This patch makes sure to set everything inside bundle to the same assignments done on BUNDLE header. Reviewed By: qcolombet Differential Revision: https://reviews.llvm.org/D90369
- Loading branch information
1 parent
3183add
commit e2303a4
Showing
3 changed files
with
88 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py | ||
# RUN: llc -march=amdgcn -mcpu=gfx902 -verify-machineinstrs -run-pass=regallocfast %s -o - | FileCheck -check-prefixes=GCN,XNACK,GCX9 %s | ||
|
||
--- | ||
name: fast_regalloc_bundle_handling | ||
tracksRegLiveness: true | ||
registers: | ||
- { id: 0, class: vgpr_32 } | ||
- { id: 1, class: vgpr_32 } | ||
- { id: 2, class: vgpr_32 } | ||
body: | | ||
bb.0: | ||
; GCN-LABEL: name: fast_regalloc_bundle_handling | ||
; GCN: renamable $vgpr0 = IMPLICIT_DEF | ||
; GCN: renamable $vgpr1 = IMPLICIT_DEF | ||
; GCN: renamable $vgpr0 = BUNDLE implicit killed renamable $vgpr0, implicit killed renamable $vgpr1, implicit $exec { | ||
; GCN: renamable $vgpr0 = V_ADD_U32_e32 $vgpr0, $vgpr1, implicit $exec | ||
; GCN: } | ||
; GCN: S_ENDPGM 0, implicit killed renamable $vgpr0 | ||
%0 = IMPLICIT_DEF | ||
%1 = IMPLICIT_DEF | ||
%2 = BUNDLE implicit %0, implicit %1, implicit $exec { | ||
%2 = V_ADD_U32_e32 %0, %1, implicit $exec | ||
} | ||
S_ENDPGM 0, implicit %2 | ||
... |
19 changes: 19 additions & 0 deletions
19
llvm/test/CodeGen/AMDGPU/llvm.amdgcn.ds.gws.barrier-fastregalloc.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py | ||
; RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=gfx900 -O0 -stop-after=postrapseudos -o - -verify-machineinstrs < %s | FileCheck -enable-var-scope -check-prefix=MIR %s | ||
|
||
|
||
; MIR-LABEL: name: gws_barrier_offset0{{$}} | ||
; MIR: BUNDLE implicit{{( killed)?( renamable)?}} $vgpr0, implicit $m0, implicit $exec { | ||
; MIR-NEXT: DS_GWS_BARRIER renamable $vgpr0, 0, implicit $m0, implicit $exec :: (load 4 from custom "GWSResource") | ||
; MIR-NEXT: S_WAITCNT 0 | ||
; MIR-NEXT: } | ||
define amdgpu_kernel void @gws_barrier_offset0(i32 %val) #0 { | ||
call void @llvm.amdgcn.ds.gws.barrier(i32 %val, i32 0) | ||
ret void | ||
} | ||
|
||
|
||
declare void @llvm.amdgcn.ds.gws.barrier(i32, i32) #1 | ||
|
||
attributes #0 = { nounwind } | ||
attributes #1 = { convergent inaccessiblememonly nounwind } |