Skip to content

Commit e703c73

Browse files
authored
AMDGPU: Remove incorrect uses of SubtaretPredicate around DS_Reals (#85001)
SubtargetPredicate is copied from DS_Pseudo to DS_Real. We should not use another SubtargetPredicate assignment around DS_Real, because doing so will override the predicate from DS_Pseudo. For example, for DS_ADD_RTN_F64, SubtargetPredicate was set to HasLdsAtomicAddF64 in Pseudo. And it will be overridden to isGFX90APlus if we assign isGFX90APlus to SubtargetPredicate in Real definition.
1 parent 360da83 commit e703c73

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

llvm/lib/Target/AMDGPU/DSInstructions.td

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,14 +1735,12 @@ def DS_WRITE_B128_vi : DS_Real_vi<0xdf, DS_WRITE_B128>;
17351735
def DS_READ_B96_vi : DS_Real_vi<0xfe, DS_READ_B96>;
17361736
def DS_READ_B128_vi : DS_Real_vi<0xff, DS_READ_B128>;
17371737

1738-
let SubtargetPredicate = isGFX90APlus in {
1739-
def DS_ADD_F64_vi : DS_Real_vi<0x5c, DS_ADD_F64>;
1740-
def DS_ADD_RTN_F64_vi : DS_Real_vi<0x7c, DS_ADD_RTN_F64>;
1741-
} // End SubtargetPredicate = isGFX90APlus
1742-
1743-
let SubtargetPredicate = isGFX940Plus in {
1744-
def DS_PK_ADD_F16_vi : DS_Real_vi<0x17, DS_PK_ADD_F16>;
1745-
def DS_PK_ADD_RTN_F16_vi : DS_Real_vi<0xb7, DS_PK_ADD_RTN_F16>;
1746-
def DS_PK_ADD_BF16_vi : DS_Real_vi<0x18, DS_PK_ADD_BF16>;
1747-
def DS_PK_ADD_RTN_BF16_vi : DS_Real_vi<0xb8, DS_PK_ADD_RTN_BF16>;
1748-
} // End SubtargetPredicate = isGFX940Plus
1738+
// GFX90A+.
1739+
def DS_ADD_F64_vi : DS_Real_vi<0x5c, DS_ADD_F64>;
1740+
def DS_ADD_RTN_F64_vi : DS_Real_vi<0x7c, DS_ADD_RTN_F64>;
1741+
1742+
// GFX940+.
1743+
def DS_PK_ADD_F16_vi : DS_Real_vi<0x17, DS_PK_ADD_F16>;
1744+
def DS_PK_ADD_RTN_F16_vi : DS_Real_vi<0xb7, DS_PK_ADD_RTN_F16>;
1745+
def DS_PK_ADD_BF16_vi : DS_Real_vi<0x18, DS_PK_ADD_BF16>;
1746+
def DS_PK_ADD_RTN_BF16_vi : DS_Real_vi<0xb8, DS_PK_ADD_RTN_BF16>;

0 commit comments

Comments
 (0)