From 5b6349bb605e3ace17a852c8c70151520b0caad5 Mon Sep 17 00:00:00 2001 From: Jaydeepkumar Patel Date: Wed, 17 Jan 2024 06:16:54 -0500 Subject: [PATCH] Revert "SWDEV-359287 - uniform_work_group_size is interger type is 1 for true and 0 for false. Lighting kernel's init sets uniform work group flag and hence not need to set it from options." This reverts commit 1b05247a0324d52f007f95c144e0651ac6e38b5b. Reason for revert: Waiting for staging results before finally merging it. Change-Id: Iaabb510325f50147f368108e98531291217627c0 [ROCm/clr commit: 77be355fd93059a773c2c7e9ef31b746f7053ae5] --- projects/clr/rocclr/device/devkernel.cpp | 2 +- projects/clr/rocclr/device/pal/palprogram.cpp | 4 +--- projects/clr/rocclr/device/rocm/rocprogram.cpp | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/projects/clr/rocclr/device/devkernel.cpp b/projects/clr/rocclr/device/devkernel.cpp index 84e6ab7e87..2b919bf563 100644 --- a/projects/clr/rocclr/device/devkernel.cpp +++ b/projects/clr/rocclr/device/devkernel.cpp @@ -575,7 +575,7 @@ static amd_comgr_status_t populateKernelMetaV3(const amd_comgr_metadata_node_t k kernel->SetWGPMode(buf.compare("true") == 0); break; case KernelField::UniformWrokGroupSize: - kernel->setUniformWorkGroupSize(buf.compare("1") == 0); + kernel->setUniformWorkGroupSize(buf.compare("true") == 0); break; default: return AMD_COMGR_STATUS_ERROR; diff --git a/projects/clr/rocclr/device/pal/palprogram.cpp b/projects/clr/rocclr/device/pal/palprogram.cpp index c7a49479d4..05eba432b7 100644 --- a/projects/clr/rocclr/device/pal/palprogram.cpp +++ b/projects/clr/rocclr/device/pal/palprogram.cpp @@ -762,9 +762,7 @@ bool LightningProgram::createKernels(void* binary, size_t binSize, bool useUnifo } kernels()[kernelName] = kernel; - if (codeObjectVer() < 5) { - kernel->setUniformWorkGroupSize(useUniformWorkGroupSize); - } + kernel->setUniformWorkGroupSize(useUniformWorkGroupSize); } } executable_ = loader_->CreateExecutable(HSA_PROFILE_FULL, nullptr); diff --git a/projects/clr/rocclr/device/rocm/rocprogram.cpp b/projects/clr/rocclr/device/rocm/rocprogram.cpp index 580803fdeb..4f77026d6a 100644 --- a/projects/clr/rocclr/device/rocm/rocprogram.cpp +++ b/projects/clr/rocclr/device/rocm/rocprogram.cpp @@ -274,9 +274,7 @@ bool LightningProgram::createKernels(void* binary, size_t binSize, bool useUnifo if (!aKernel->init()) { return false; } - if (codeObjectVer() < 5) { - aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize); - } + aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize); aKernel->setInternalKernelFlag(internalKernel); kernels()[kernelName] = aKernel; }