From 2c5b834f897677413ca34de3460cb456149d55ee Mon Sep 17 00:00:00 2001 From: Graham Sider Date: Mon, 11 Jul 2022 13:23:58 -0400 Subject: [PATCH] kfdtest: Update COMPUTE_PGM_RSRC1 for software trap For software trap in GFX11, COMPUTE_PGM_RSRC1 must have PRIV = 1. Signed-off-by: Graham Sider Change-Id: Id504889c3ca2588b6c8cefdebaec00dcfc217995 [ROCm/ROCR-Runtime commit: 6294ef564b723b2fd2799d862f2f3dd616c88ddf] --- projects/rocr-runtime/tests/kfdtest/src/Dispatch.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/Dispatch.cpp b/projects/rocr-runtime/tests/kfdtest/src/Dispatch.cpp index 3aa3892f38..87eb659c7f 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/Dispatch.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/Dispatch.cpp @@ -138,10 +138,11 @@ void Dispatch::BuildIb() { pgmRsrc2 |= (1 << COMPUTE_PGM_RSRC2__EXCP_EN_MSB__SHIFT) & COMPUTE_PGM_RSRC2__EXCP_EN_MSB_MASK; + const bool priv = (m_FamilyId == FAMILY_GFX11); const unsigned int COMPUTE_PGM_RSRC[] = { - // PGM_RSRC1 = { VGPRS: 16 SGPRS: 16 PRIORITY: m_SpiPriority FLOAT_MODE: c0 PRIV: 0 - // DX10_CLAMP: 0 DEBUG_MODE: 0 IEEE_MODE: 0 BULKY: 0 CDBG_USER: 0 } - 0x000c0084 | ((m_SpiPriority & 3) << 10), + // PGM_RSRC1 = { VGPRS: 16 SGPRS: 16 PRIORITY: m_SpiPriority FLOAT_MODE: c0 + // PRIV: 0 (1 for GFX11) DX10_CLAMP: 0 DEBUG_MODE: 0 IEEE_MODE: 0 BULKY: 0 CDBG_USER: 0 } + 0x000c0084 | ((m_SpiPriority & 3) << 10) | (priv << 20), pgmRsrc2 };