From b7d56427ec593f94b9848cdb804002cad57bcc22 Mon Sep 17 00:00:00 2001 From: cfreeamd Date: Thu, 8 May 2025 09:59:41 -0500 Subject: [PATCH] rocr: Fix ISA generic's for gfx906 wrt sramecc gfx9-generic cannot support sramecc- and sramecc+. sramecc feature is only configurable on gfx906. The code object produced for gfx9-generic can be loaded on both gfx906 with any sramecc setting, compiler will produce the isa that will correctly work on both (EF_AMDGPU_FEATURE_SRAMECC_ANY_V4). [ROCm/ROCR-Runtime commit: 3e99bb61505ef96ff58343c93bda6eb12a1178ef] --- .../runtime/hsa-runtime/core/runtime/isa.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/isa.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/isa.cpp index a53f1c4c0a..be059c39f1 100755 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/isa.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/isa.cpp @@ -365,12 +365,12 @@ const IsaRegistry::IsaMap& IsaRegistry::GetSupportedIsas() { ISAREG_ENTRY_GEN("gfx906", 9, 0, 6, any, any, 64, "gfx9-generic") ISAREG_ENTRY_GEN("gfx906:xnack-", 9, 0, 6, any, disabled, 64, "gfx9-generic:xnack-") ISAREG_ENTRY_GEN("gfx906:xnack+", 9, 0, 6, any, enabled, 64, "gfx9-generic:xnack+") - ISAREG_ENTRY_GEN("gfx906:sramecc-", 9, 0, 6, disabled, any, 64, "gfx9-generic:sramecc-") - ISAREG_ENTRY_GEN("gfx906:sramecc+", 9, 0, 6, enabled, any, 64, "gfx9-generic:sramecc+") - ISAREG_ENTRY_GEN("gfx906:sramecc-:xnack-", 9, 0, 6, disabled, disabled, 64, "gfx9-generic:sramecc-:xnack-") - ISAREG_ENTRY_GEN("gfx906:sramecc-:xnack+", 9, 0, 6, disabled, enabled, 64, "gfx9-generic:sramecc-:xnack+") - ISAREG_ENTRY_GEN("gfx906:sramecc+:xnack-", 9, 0, 6, enabled, disabled, 64, "gfx9-generic:sramecc+:xnack-") - ISAREG_ENTRY_GEN("gfx906:sramecc+:xnack+", 9, 0, 6, enabled, enabled, 64, "gfx9-generic:sramecc+:xnack+") + ISAREG_ENTRY_GEN("gfx906:sramecc-", 9, 0, 6, any, any, 64, "gfx9-generic") + ISAREG_ENTRY_GEN("gfx906:sramecc+", 9, 0, 6, any, any, 64, "gfx9-generic") + ISAREG_ENTRY_GEN("gfx906:sramecc-:xnack-", 9, 0, 6, any, disabled, 64, "gfx9-generic:xnack-") + ISAREG_ENTRY_GEN("gfx906:sramecc-:xnack+", 9, 0, 6, any, enabled, 64, "gfx9-generic:xnack+") + ISAREG_ENTRY_GEN("gfx906:sramecc+:xnack-", 9, 0, 6, any, disabled, 64, "gfx9-generic:xnack-") + ISAREG_ENTRY_GEN("gfx906:sramecc+:xnack+", 9, 0, 6, any, enabled, 64, "gfx9-generic:xnack+") ISAREG_ENTRY_GEN("gfx908", 9, 0, 8, any, any, 64, "") ISAREG_ENTRY_GEN("gfx908:xnack-", 9, 0, 8, any, disabled, 64, "") ISAREG_ENTRY_GEN("gfx908:xnack+", 9, 0, 8, any, enabled, 64, "")