From 0f08f53c760e4ba780fdcead01bf84f25b66e757 Mon Sep 17 00:00:00 2001 From: David Yat Sin Date: Thu, 23 May 2024 19:11:58 +0000 Subject: [PATCH] Remove debug bits set in forbiddenBlock Removing extra bits set in forbiddenBlock that seemed to be set for debugging and are causing unexpected image formats to be used. Change-Id: I29c9e319907027a2b0b6bf7c1c0c8558eb6a36f4 Signed-off-by: Chris Freehill [ROCm/ROCR-Runtime commit: e721eb509ba8133467c5dcd69c8c9a8693e0ff20] --- .../runtime/hsa-runtime/image/image_manager_gfx11.cpp | 5 ----- .../runtime/hsa-runtime/image/image_manager_nv.cpp | 5 ----- 2 files changed, 10 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp index 20a9eeaf15..427dab3863 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp @@ -703,11 +703,6 @@ uint32_t ImageManagerGfx11::GetAddrlibSurfaceInfoNv( prefSettingsInput.forbiddenBlock.macroThick64KB = 1; prefSettingsInput.forbiddenBlock.micro = 1; prefSettingsInput.forbiddenBlock.var = 1; - } else { - // Debug setting, simplifies buffer alignment until language runtimes have official gfx10 - // support. - prefSettingsInput.forbiddenBlock.macroThin64KB = 1; - prefSettingsInput.forbiddenBlock.macroThick64KB = 1; } // but don't ever allow the 256b swizzle modes diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp index 139a3755c1..cb897f196a 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp @@ -698,11 +698,6 @@ uint32_t ImageManagerNv::GetAddrlibSurfaceInfoNv( prefSettingsInput.forbiddenBlock.macroThick64KB = 1; prefSettingsInput.forbiddenBlock.micro = 1; prefSettingsInput.forbiddenBlock.var = 1; - } else { - // Debug setting, simplifies buffer alignment until language runtimes have official gfx10 - // support. - prefSettingsInput.forbiddenBlock.macroThin64KB = 1; - prefSettingsInput.forbiddenBlock.macroThick64KB = 1; } // but don't ever allow the 256b swizzle modes