This is an archive of the discontinued LLVM Phabricator instance.

Differential D14298

AMDGPU: Make addr64 atomic operand order consistent
ClosedPublic

Authored by arsenm on Nov 3 2015, 11:03 AM.

Details

Reviewers
• tstellarAMD
Summary

vaddr comes before srsrc in every other MUBUF instruction, and is the order it is printed.

Diff Detail

Event Timeline

arsenm updated this revision to Diff 39094.Nov 3 2015, 11:03 AM
arsenm retitled this revision from to AMDGPU: Make addr64 atomic operand order consistent.
arsenm updated this object.
arsenm added a reviewer: • tstellarAMD.
arsenm added a subscriber: llvm-commits.
Herald added a subscriber: arsenm. · View Herald TranscriptNov 3 2015, 11:03 AM
• tstellarAMD accepted this revision.Nov 4 2015, 6:32 PM
• tstellarAMD edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Nov 4 2015, 6:32 PM
arsenm closed this revision.Nov 4 2015, 6:49 PM

r252139

Revision Contents

PathSize
lib/
Target/
AMDGPU/
4 lines

Diff 39094

lib/Target/AMDGPU/SIInstrInfo.td

Show First 20 Lines • Show All 2,385 Lines • ▼ Show 20 Linesmulticlass MUBUF_Atomic <mubuf op, string name, RegisterClass rc,
let mayStore = 1, mayLoad = 1, hasPostISelHook = 1 in { let mayStore = 1, mayLoad = 1, hasPostISelHook = 1 in {
// No return variants // No return variants
let glc = 0 in { let glc = 0 in {
defm _ADDR64 : MUBUFAtomicAddr64_m < defm _ADDR64 : MUBUFAtomicAddr64_m <
op, name#"_addr64", (outs), op, name#"_addr64", (outs),
(ins rc:$vdata, SReg_128:$srsrc, VReg_64:$vaddr, (ins rc:$vdata, VReg_64:$vaddr, SReg_128:$srsrc,
SCSrc_32:$soffset, mbuf_offset:$offset, slc:$slc), SCSrc_32:$soffset, mbuf_offset:$offset, slc:$slc),
name#" $vdata, $vaddr, $srsrc, $soffset addr64"#"$offset"#"$slc", [], 0 name#" $vdata, $vaddr, $srsrc, $soffset addr64"#"$offset"#"$slc", [], 0
>; >;
defm _OFFSET : MUBUFAtomicOffset_m < defm _OFFSET : MUBUFAtomicOffset_m <
op, name#"_offset", (outs), op, name#"_offset", (outs),
(ins rc:$vdata, SReg_128:$srsrc, SCSrc_32:$soffset, mbuf_offset:$offset, (ins rc:$vdata, SReg_128:$srsrc, SCSrc_32:$soffset, mbuf_offset:$offset,
slc:$slc), slc:$slc),
name#" $vdata, $srsrc, $soffset"#"$offset"#"$slc", [], 0 name#" $vdata, $srsrc, $soffset"#"$offset"#"$slc", [], 0
>; >;
} // glc = 0 } // glc = 0
// Variant that return values // Variant that return values
let glc = 1, Constraints = "$vdata = $vdata_in", let glc = 1, Constraints = "$vdata = $vdata_in",
DisableEncoding = "$vdata_in" in { DisableEncoding = "$vdata_in" in {
defm _RTN_ADDR64 : MUBUFAtomicAddr64_m < defm _RTN_ADDR64 : MUBUFAtomicAddr64_m <
op, name#"_rtn_addr64", (outs rc:$vdata), op, name#"_rtn_addr64", (outs rc:$vdata),
(ins rc:$vdata_in, SReg_128:$srsrc, VReg_64:$vaddr, (ins rc:$vdata_in, VReg_64:$vaddr, SReg_128:$srsrc,
SCSrc_32:$soffset, mbuf_offset:$offset, slc:$slc), SCSrc_32:$soffset, mbuf_offset:$offset, slc:$slc),
name#" $vdata, $vaddr, $srsrc, $soffset addr64"#"$offset"#" glc"#"$slc", name#" $vdata, $vaddr, $srsrc, $soffset addr64"#"$offset"#" glc"#"$slc",
[(set vt:$vdata, [(set vt:$vdata,
(atomic (MUBUFAddr64Atomic v4i32:$srsrc, i64:$vaddr, i32:$soffset, (atomic (MUBUFAddr64Atomic v4i32:$srsrc, i64:$vaddr, i32:$soffset,
i16:$offset, i1:$slc), vt:$vdata_in))], 1 i16:$offset, i1:$slc), vt:$vdata_in))], 1
>; >;
defm _RTN_OFFSET : MUBUFAtomicOffset_m < defm _RTN_OFFSET : MUBUFAtomicOffset_m <
▲ Show 20 Lines • Show All 432 Lines • Show Last 20 Lines