From: Dmitry Preobrazhensky Date: Mon, 15 Jul 2019 15:12:16 +0000 (+0000) Subject: [AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e201b95d1adae7bfae9b4c9b13a6613e0a5a7105;p=llvm [AMDGPU][MC][GFX9][GFX10] Added support of GET_DOORBELL message Reviewers: artem.tamazov, arsenm Differential Revision: https://reviews.llvm.org/D64729 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@366071 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/docs/AMDGPU/gfx10_msg.rst b/docs/AMDGPU/gfx10_msg.rst index d56daa5c240..ef531a14db1 100644 --- a/docs/AMDGPU/gfx10_msg.rst +++ b/docs/AMDGPU/gfx10_msg.rst @@ -53,6 +53,7 @@ Each message type supports specific operations: \ GS_OP_EMIT 2 Optional \ GS_OP_EMIT_CUT 3 Optional MSG_GS_ALLOC_REQ 9 \- \- \- + MSG_GET_DOORBELL 10 \- \- \- MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \- \ SYSMSG_OP_REG_RD 2 \- \ SYSMSG_OP_HOST_TRAP_ACK 3 \- @@ -65,6 +66,7 @@ Examples: s_sendmsg 0x12 s_sendmsg sendmsg(MSG_INTERRUPT) + s_sendmsg sendmsg(MSG_GET_DOORBELL) s_sendmsg sendmsg(2, GS_OP_CUT) s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT) s_sendmsg sendmsg(MSG_GS, 2) diff --git a/docs/AMDGPU/gfx9_msg.rst b/docs/AMDGPU/gfx9_msg.rst index 898848532c1..14dff9050e6 100644 --- a/docs/AMDGPU/gfx9_msg.rst +++ b/docs/AMDGPU/gfx9_msg.rst @@ -53,6 +53,7 @@ Each message type supports specific operations: \ GS_OP_EMIT 2 Optional \ GS_OP_EMIT_CUT 3 Optional MSG_GS_ALLOC_REQ 9 \- \- \- + MSG_GET_DOORBELL 10 \- \- \- MSG_SYSMSG 15 SYSMSG_OP_ECC_ERR_INTERRUPT 1 \- \ SYSMSG_OP_REG_RD 2 \- \ SYSMSG_OP_HOST_TRAP_ACK 3 \- @@ -65,6 +66,7 @@ Examples: s_sendmsg 0x12 s_sendmsg sendmsg(MSG_INTERRUPT) + s_sendmsg sendmsg(MSG_GET_DOORBELL) s_sendmsg sendmsg(2, GS_OP_CUT) s_sendmsg sendmsg(MSG_GS, GS_OP_EMIT) s_sendmsg sendmsg(MSG_GS, 2) diff --git a/lib/Target/AMDGPU/SIDefines.h b/lib/Target/AMDGPU/SIDefines.h index a329dd27a6e..a0e1ec6ac23 100644 --- a/lib/Target/AMDGPU/SIDefines.h +++ b/lib/Target/AMDGPU/SIDefines.h @@ -263,6 +263,7 @@ enum Id { // Message ID, width(4) [3:0]. ID_GS, ID_GS_DONE, ID_GS_ALLOC_REQ = 9, + ID_GET_DOORBELL = 10, ID_SYSMSG = 15, ID_GAPS_LAST_, // Indicate that sequence has gaps. ID_GAPS_FIRST_ = ID_INTERRUPT, diff --git a/lib/Target/AMDGPU/Utils/AMDGPUAsmUtils.cpp b/lib/Target/AMDGPU/Utils/AMDGPUAsmUtils.cpp index 8b2e91a8ee3..075e08986c0 100644 --- a/lib/Target/AMDGPU/Utils/AMDGPUAsmUtils.cpp +++ b/lib/Target/AMDGPU/Utils/AMDGPUAsmUtils.cpp @@ -23,7 +23,7 @@ const char* const IdSymbolic[] = { nullptr, nullptr, "MSG_GS_ALLOC_REQ", - nullptr, + "MSG_GET_DOORBELL", nullptr, nullptr, nullptr, diff --git a/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp b/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp index 05df975cdd4..e90f40e6abe 100644 --- a/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp +++ b/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp @@ -731,9 +731,14 @@ static bool isValidMsgId(int64_t MsgId) { } bool isValidMsgId(int64_t MsgId, const MCSubtargetInfo &STI, bool Strict) { - return Strict ? - isValidMsgId(MsgId) && (MsgId != ID_GS_ALLOC_REQ || isGFX9(STI) || isGFX10(STI)) : - 0 <= MsgId && isUInt(MsgId); + if (Strict) { + if (MsgId == ID_GS_ALLOC_REQ || MsgId == ID_GET_DOORBELL) + return isGFX9(STI) || isGFX10(STI); + else + return isValidMsgId(MsgId); + } else { + return 0 <= MsgId && isUInt(MsgId); + } } StringRef getMsgName(int64_t MsgId) { diff --git a/test/MC/AMDGPU/sopp-gfx10.s b/test/MC/AMDGPU/sopp-gfx10.s new file mode 100644 index 00000000000..f597f26e57a --- /dev/null +++ b/test/MC/AMDGPU/sopp-gfx10.s @@ -0,0 +1,17 @@ +// 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] diff --git a/test/MC/AMDGPU/sopp-gfx9.s b/test/MC/AMDGPU/sopp-gfx9.s index a02f8e11042..dbf5983cbcd 100644 --- a/test/MC/AMDGPU/sopp-gfx9.s +++ b/test/MC/AMDGPU/sopp-gfx9.s @@ -70,8 +70,18 @@ s_waitcnt vmcnt(62) lgkmcnt(14) s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14) // GFX9: s_waitcnt vmcnt(62) expcnt(6) lgkmcnt(14) ; encoding: [0x6e,0xce,0x8c,0xbf] +//===----------------------------------------------------------------------===// +// s_sendmsg +//===----------------------------------------------------------------------===// + 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) // 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]