This is an archive of the discontinued LLVM Phabricator instance.

Differential D64729

[AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message
ClosedPublic

Authored by dp on Jul 15 2019, 5:57 AM.

Details

Reviewers
arsenm
artem.tamazov
t-tye
Commits
rG5153b1723a62: [AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message
rL366071: [AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message

Diff Detail

Event Timeline

dp created this revision.Jul 15 2019, 5:57 AM
Herald added subscribers: tpr, dstuttard, yaxunl and 4 others. · View Herald TranscriptJul 15 2019, 5:57 AM
artem.tamazov accepted this revision.Jul 15 2019, 7:04 AM

LGTM

This revision is now accepted and ready to land.Jul 15 2019, 7:04 AM
Closed by commit rL366071: [AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message (authored by dpreobra). · Explain WhyJul 15 2019, 8:12 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 15 2019, 8:12 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
docs/
AMDGPU/
2 lines
2 lines
lib/
Target/
AMDGPU/
1 line
Utils/
2 lines
11 lines
test/
MC/
AMDGPU/
17 lines
12 lines

Diff 209820

docs/AMDGPU/gfx10_msg.rst

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 LinesEach message type supports specific operations:
MSG_GS 2 GS_OP_CUT 1 Optional MSG_GS 2 GS_OP_CUT 1 Optional
\ GS_OP_EMIT 2 Optional \ GS_OP_EMIT 2 Optional
\ GS_OP_EMIT_CUT 3 Optional \ GS_OP_EMIT_CUT 3 Optional
MSG_GS_DONE 3 GS_OP_NOP 0 \- MSG_GS_DONE 3 GS_OP_NOP 0 \-
\ GS_OP_CUT 1 Optional \ GS_OP_CUT 1 Optional
\ GS_OP_EMIT 2 Optional \ GS_OP_EMIT 2 Optional
\ GS_OP_EMIT_CUT 3 Optional \ GS_OP_EMIT_CUT 3 Optional
MSG_GS_ALLOC_REQ 9 \- \- \- MSG_GS_ALLOC_REQ 9 \- \- \-
MSG_GET_DOORBELL 10 \- \- \-
MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \- MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \-
\ SYSMSG_OP_REG_RD 2 \- \ SYSMSG_OP_REG_RD 2 \-
\ SYSMSG_OP_HOST_TRAP_ACK 3 \- \ SYSMSG_OP_HOST_TRAP_ACK 3 \-
\ SYSMSG_OP_TTRACE_PC 4 \- \ SYSMSG_OP_TTRACE_PC 4 \-
================= ========== ============================== ============ ========== ================= ========== ============================== ============ ==========
Examples: Examples:
.. parsed-literal:: .. parsed-literal::
s_sendmsg 0x12 s_sendmsg 0x12
s_sendmsg sendmsg(MSG_INTERRUPT) s_sendmsg sendmsg(MSG_INTERRUPT)
s_sendmsg sendmsg(MSG_GET_DOORBELL)
s_sendmsg sendmsg(2, GS_OP_CUT) s_sendmsg sendmsg(2, GS_OP_CUT)
s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT) s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT)
s_sendmsg sendmsg(MSG_GS, 2) s_sendmsg sendmsg(MSG_GS, 2)
s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_EMIT_CUT, 1) s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_EMIT_CUT, 1)
s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_TTRACE_PC) s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_TTRACE_PC)

docs/AMDGPU/gfx9_msg.rst

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 LinesEach message type supports specific operations:
MSG_GS 2 GS_OP_CUT 1 Optional MSG_GS 2 GS_OP_CUT 1 Optional
\ GS_OP_EMIT 2 Optional \ GS_OP_EMIT 2 Optional
\ GS_OP_EMIT_CUT 3 Optional \ GS_OP_EMIT_CUT 3 Optional
MSG_GS_DONE 3 GS_OP_NOP 0 \- MSG_GS_DONE 3 GS_OP_NOP 0 \-
\ GS_OP_CUT 1 Optional \ GS_OP_CUT 1 Optional
\ GS_OP_EMIT 2 Optional \ GS_OP_EMIT 2 Optional
\ GS_OP_EMIT_CUT 3 Optional \ GS_OP_EMIT_CUT 3 Optional
MSG_GS_ALLOC_REQ 9 \- \- \- MSG_GS_ALLOC_REQ 9 \- \- \-
MSG_GET_DOORBELL 10 \- \- \-
MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \- MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \-
\ SYSMSG_OP_REG_RD 2 \- \ SYSMSG_OP_REG_RD 2 \-
\ SYSMSG_OP_HOST_TRAP_ACK 3 \- \ SYSMSG_OP_HOST_TRAP_ACK 3 \-
\ SYSMSG_OP_TTRACE_PC 4 \- \ SYSMSG_OP_TTRACE_PC 4 \-
================= ========== ============================== ============ ========== ================= ========== ============================== ============ ==========
Examples: Examples:
.. parsed-literal:: .. parsed-literal::
s_sendmsg 0x12 s_sendmsg 0x12
s_sendmsg sendmsg(MSG_INTERRUPT) s_sendmsg sendmsg(MSG_INTERRUPT)
s_sendmsg sendmsg(MSG_GET_DOORBELL)
s_sendmsg sendmsg(2, GS_OP_CUT) s_sendmsg sendmsg(2, GS_OP_CUT)
s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT) s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT)
s_sendmsg sendmsg(MSG_GS, 2) s_sendmsg sendmsg(MSG_GS, 2)
s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_EMIT_CUT, 1) s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_EMIT_CUT, 1)
s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_TTRACE_PC) s_sendmsg sendmsg(MSG_SYSMSG, SYSMSG_OP_TTRACE_PC)

lib/Target/AMDGPU/SIDefines.h

Show First 20 Lines • Show All 257 Lines • ▼ Show 20 Lines
namespace SendMsg { // Encoding of SIMM16 used in s_sendmsg* insns. namespace SendMsg { // Encoding of SIMM16 used in s_sendmsg* insns.
enum Id { // Message ID, width(4) [3:0]. enum Id { // Message ID, width(4) [3:0].
ID_UNKNOWN_ = -1, ID_UNKNOWN_ = -1,
ID_INTERRUPT = 1, ID_INTERRUPT = 1,
ID_GS, ID_GS,
ID_GS_DONE, ID_GS_DONE,
ID_GS_ALLOC_REQ = 9, ID_GS_ALLOC_REQ = 9,
ID_GET_DOORBELL = 10,
ID_SYSMSG = 15, ID_SYSMSG = 15,
ID_GAPS_LAST_, // Indicate that sequence has gaps. ID_GAPS_LAST_, // Indicate that sequence has gaps.
ID_GAPS_FIRST_ = ID_INTERRUPT, ID_GAPS_FIRST_ = ID_INTERRUPT,
ID_SHIFT_ = 0, ID_SHIFT_ = 0,
ID_WIDTH_ = 4, ID_WIDTH_ = 4,
ID_MASK_ = (((1 << ID_WIDTH_) - 1) << ID_SHIFT_) ID_MASK_ = (((1 << ID_WIDTH_) - 1) << ID_SHIFT_)
}; };
▲ Show 20 Lines • Show All 350 Lines • Show Last 20 Lines

lib/Target/AMDGPU/Utils/AMDGPUAsmUtils.cpp

Show All 17 Linesconst char* const IdSymbolic[] = {
"MSG_GS", "MSG_GS",
"MSG_GS_DONE", "MSG_GS_DONE",
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
"MSG_GS_ALLOC_REQ", "MSG_GS_ALLOC_REQ",
nullptr, "MSG_GET_DOORBELL",
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,
"MSG_SYSMSG" "MSG_SYSMSG"
}; };
// These two must be in sync with llvm::AMDGPU::SendMsg::Op enum members, see SIDefines.h. // These two must be in sync with llvm::AMDGPU::SendMsg::Op enum members, see SIDefines.h.
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Show First 20 Lines • Show All 725 Lines • ▼ Show 20 Linesint64_t getMsgId(const StringRef Name) {
return ID_UNKNOWN_; return ID_UNKNOWN_;
} }
static bool isValidMsgId(int64_t MsgId) { static bool isValidMsgId(int64_t MsgId) {
return (ID_GAPS_FIRST_ <= MsgId && MsgId < ID_GAPS_LAST_) && IdSymbolic[MsgId]; return (ID_GAPS_FIRST_ <= MsgId && MsgId < ID_GAPS_LAST_) && IdSymbolic[MsgId];
} }
bool isValidMsgId(int64_t MsgId, const MCSubtargetInfo &STI, bool Strict) { bool isValidMsgId(int64_t MsgId, const MCSubtargetInfo &STI, bool Strict) {
return Strict ? if (Strict) {
isValidMsgId(MsgId) && (MsgId != ID_GS_ALLOC_REQ || isGFX9(STI) || isGFX10(STI)) : if (MsgId == ID_GS_ALLOC_REQ || MsgId == ID_GET_DOORBELL)
0 <= MsgId && isUInt<ID_WIDTH_>(MsgId); return isGFX9(STI) || isGFX10(STI);
else
return isValidMsgId(MsgId);
} else {
return 0 <= MsgId && isUInt<ID_WIDTH_>(MsgId);
}
} }
StringRef getMsgName(int64_t MsgId) { StringRef getMsgName(int64_t MsgId) {
return isValidMsgId(MsgId)? IdSymbolic[MsgId] : ""; return isValidMsgId(MsgId)? IdSymbolic[MsgId] : "";
} }
int64_t getMsgOpId(int64_t MsgId, const StringRef Name) { int64_t getMsgOpId(int64_t MsgId, const StringRef Name) {
const char* const *S = (MsgId == ID_SYSMSG) ? OpSysSymbolic : OpGsSymbolic; const char* const *S = (MsgId == ID_SYSMSG) ? OpSysSymbolic : OpGsSymbolic;
▲ Show 20 Lines • Show All 540 Lines • Show Last 20 Lines

test/MC/AMDGPU/sopp-gfx10.s

  • This file was added.
// RUN: llvm-mc -arch=amdgcn -mcpu=gfx1010 -show-encoding %s | FileCheck --check-prefix=GFX10 %s
//===----------------------------------------------------------------------===//
// s_sendmsg
//===----------------------------------------------------------------------===//
s_sendmsg 9
// GFX10: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf]
s_sendmsg sendmsg(MSG_GS_ALLOC_REQ)
// GFX10: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf]
s_sendmsg 10
// GFX10: s_sendmsg sendmsg(MSG_GET_DOORBELL) ; encoding: [0x0a,0x00,0x90,0xbf]
s_sendmsg sendmsg(MSG_GET_DOORBELL)
// GFX10: s_sendmsg sendmsg(MSG_GET_DOORBELL) ; encoding: [0x0a,0x00,0x90,0xbf]

test/MC/AMDGPU/sopp-gfx9.s

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Lines
// GFX9: s_waitcnt vmcnt(62) expcnt(6) ; encoding: [0x6e,0xcf,0x8c,0xbf] // GFX9: s_waitcnt vmcnt(62) expcnt(6) ; encoding: [0x6e,0xcf,0x8c,0xbf]
s_waitcnt vmcnt(62) lgkmcnt(14) s_waitcnt vmcnt(62) lgkmcnt(14)
// GFX9: s_waitcnt vmcnt(62) lgkmcnt(14) ; encoding: [0x7e,0xce,0x8c,0xbf] // GFX9: s_waitcnt vmcnt(62) lgkmcnt(14) ; encoding: [0x7e,0xce,0x8c,0xbf]
s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14) s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14)
// GFX9: s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14) ; encoding: [0x6e,0xce,0x8c,0xbf] // GFX9: s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14) ; encoding: [0x6e,0xce,0x8c,0xbf]
//===----------------------------------------------------------------------===//
// s_sendmsg
//===----------------------------------------------------------------------===//
s_sendmsg 9 s_sendmsg 9
// GCN: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf] // GFX9: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf]
s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) s_sendmsg sendmsg(MSG_GS_ALLOC_REQ)
// GFX9: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf] // GFX9: s_sendmsg sendmsg(MSG_GS_ALLOC_REQ) ; encoding: [0x09,0x00,0x90,0xbf]
s_sendmsg 10
// GFX9: s_sendmsg sendmsg(MSG_GET_DOORBELL) ; encoding: [0x0a,0x00,0x90,0xbf]
s_sendmsg sendmsg(MSG_GET_DOORBELL)
// GFX9: s_sendmsg sendmsg(MSG_GET_DOORBELL) ; encoding: [0x0a,0x00,0x90,0xbf]