From 88335be213f0886619e68a6e9f7dedfcf59f9ecd Mon Sep 17 00:00:00 2001 From: David Belanger Date: Thu, 2 Nov 2023 15:13:17 -0400 Subject: [PATCH] libhsakmt: Fix VGPR size for GFX12/GFX12.1 Set max size needed for VGPR when doing a CWSR for GFX12 and GFX12.1. Signed-off-by: David Belanger Change-Id: Iddefc62f1ad419c6f5ab6a872048457a1dc24037 Signed-off-by: Chris Freehill [ROCm/ROCR-Runtime commit: 259a724e212288c44a85ef50186d5c30bbf3d288] --- projects/rocr-runtime/libhsakmt/src/libhsakmt.h | 2 ++ projects/rocr-runtime/libhsakmt/src/queues.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/rocr-runtime/libhsakmt/src/libhsakmt.h b/projects/rocr-runtime/libhsakmt/src/libhsakmt.h index 71cef9cef8..8e6df2a2ea 100644 --- a/projects/rocr-runtime/libhsakmt/src/libhsakmt.h +++ b/projects/rocr-runtime/libhsakmt/src/libhsakmt.h @@ -162,6 +162,8 @@ enum full_gfx_versions { GFX_VERSION_YELLOW_CARP = 0x0A0305, GFX_VERSION_PLUM_BONITO = 0x0B0000, GFX_VERSION_WHEAT_NAS = 0x0B0001, + GFX_VERSION_GFX1200 = 0x0C0000, + GFX_VERSION_GFX1201 = 0x0C0001, }; struct hsa_gfxip_table { diff --git a/projects/rocr-runtime/libhsakmt/src/queues.c b/projects/rocr-runtime/libhsakmt/src/queues.c index fffce67668..5b1a0317bb 100644 --- a/projects/rocr-runtime/libhsakmt/src/queues.c +++ b/projects/rocr-runtime/libhsakmt/src/queues.c @@ -94,7 +94,9 @@ uint32_t get_vgpr_size_per_cu(uint32_t gfxv) vgpr_size = 0x80000; else if (gfxv == GFX_VERSION_PLUM_BONITO || - gfxv == GFX_VERSION_WHEAT_NAS) + gfxv == GFX_VERSION_WHEAT_NAS || + gfxv == GFX_VERSION_GFX1200 || + gfxv == GFX_VERSION_GFX1201) vgpr_size = 0x60000; return vgpr_size;