From 6fa299f3a391d1740e5a6fbd424dd1698ab1dcfa Mon Sep 17 00:00:00 2001 From: Jaydeep Patel Date: Wed, 5 Jul 2023 04:40:54 +0000 Subject: [PATCH] Revert "SWDEV-403995 - 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 063b3d4e519cf6a3078f2f1ff77506da7aef18ca. Change-Id: I077135a726320eb109888f0e7442120dc852ad3e [ROCm/clr commit: 90f53925a3c39d0855a903ccc97f2ba5d5258ba6] --- projects/clr/rocclr/device/devkernel.cpp | 2 +- projects/clr/rocclr/device/pal/palprogram.cpp | 5 ++--- projects/clr/rocclr/device/rocm/rocprogram.cpp | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/clr/rocclr/device/devkernel.cpp b/projects/clr/rocclr/device/devkernel.cpp index f3d6e71762..fdd20a0e37 100644 --- a/projects/clr/rocclr/device/devkernel.cpp +++ b/projects/clr/rocclr/device/devkernel.cpp @@ -570,7 +570,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 fb5ed4e141..cbd517eea8 100644 --- a/projects/clr/rocclr/device/pal/palprogram.cpp +++ b/projects/clr/rocclr/device/pal/palprogram.cpp @@ -748,9 +748,8 @@ bool LightningProgram::createKernels(void* binary, size_t binSize, bool useUnifo return false; } 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; }