Skip to content

Commit bdb3cd0

Browse files
committed
Fix for other (besides image_atomic_*) mimg instructions.
1 parent c22991d commit bdb3cd0

File tree

2 files changed

+178
-4
lines changed

2 files changed

+178
-4
lines changed

llvm/lib/Target/AMDGPU/MIMGInstructions.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class MIMG_NoSampler_Helper <mimgopc op, string asm,
424424
RegisterClass addr_rc,
425425
string dns="">
426426
: MIMG_gfx6789 <op.GFX10M, (outs dst_rc:$vdata), dns> {
427-
let InOperandList = !con((ins addr_rc:$vaddr, SReg_256_XNULL:$srsrc,
427+
let InOperandList = !con((ins addr_rc:$vaddr, SReg_RSRC:$srsrc,
428428
DMask:$dmask, UNorm:$unorm, CPol:$cpol,
429429
R128A16:$r128, TFE:$tfe, LWE:$lwe, DA:$da),
430430
!if(BaseOpcode.HasD16, (ins D16:$d16), (ins)));
@@ -681,7 +681,7 @@ class MIMG_Store_Helper <mimgopc op, string asm,
681681
RegisterClass addr_rc,
682682
string dns = "">
683683
: MIMG_gfx6789<op.GFX10M, (outs), dns> {
684-
let InOperandList = !con((ins data_rc:$vdata, addr_rc:$vaddr, SReg_256_XNULL:$srsrc,
684+
let InOperandList = !con((ins data_rc:$vdata, addr_rc:$vaddr, SReg_RSRC:$srsrc,
685685
DMask:$dmask, UNorm:$unorm, CPol:$cpol,
686686
R128A16:$r128, TFE:$tfe, LWE:$lwe, DA:$da),
687687
!if(BaseOpcode.HasD16, (ins D16:$d16), (ins)));
@@ -923,7 +923,7 @@ class MIMG_Atomic_gfx10<mimgopc op, string opcode,
923923
!if(enableDisasm, "GFX10", "")> {
924924
let Constraints = "$vdst = $vdata";
925925

926-
let InOperandList = (ins DataRC:$vdata, AddrRC:$vaddr0, SReg_RSRC:$srsrc,
926+
let InOperandList = (ins DataRC:$vdata, AddrRC:$vaddr0, SReg_256_XNULL:$srsrc,
927927
DMask:$dmask, Dim:$dim, UNorm:$unorm, CPol:$cpol,
928928
R128A16:$r128, A16:$a16, TFE:$tfe, LWE:$lwe);
929929
let AsmString = opcode#" $vdst, $vaddr0, $srsrc$dmask$dim$unorm$cpol$r128$a16$tfe$lwe";
@@ -1130,7 +1130,7 @@ multiclass MIMG_Atomic_Renamed <mimgopc op, string asm, string renamed,
11301130
class MIMG_Sampler_Helper <mimgopc op, string asm, RegisterClass dst_rc,
11311131
RegisterClass src_rc, string dns="">
11321132
: MIMG_gfx6789 <op.VI, (outs dst_rc:$vdata), dns> {
1133-
let InOperandList = !con((ins src_rc:$vaddr, SReg_256_XNULL:$srsrc, SReg_128_XNULL:$ssamp,
1133+
let InOperandList = !con((ins src_rc:$vaddr, SReg_RSRC:$srsrc, SReg_128_XNULL:$ssamp,
11341134
DMask:$dmask, UNorm:$unorm, CPol:$cpol,
11351135
R128A16:$r128, TFE:$tfe, LWE:$lwe, DA:$da),
11361136
!if(BaseOpcode.HasD16, (ins D16:$d16), (ins)));

0 commit comments

Comments
 (0)