From 77be355fd93059a773c2c7e9ef31b746f7053ae5 Mon Sep 17 00:00:00 2001
From: Jaydeepkumar Patel <Jaydeepkumar.Patel@amd.com>
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 ea25e658343ea8b12ae33034215195c00d9ae37d.

Reason for revert: Waiting for staging results before finally merging it.

Change-Id: Iaabb510325f50147f368108e98531291217627c0
---
 rocclr/device/devkernel.cpp       | 2 +-
 rocclr/device/pal/palprogram.cpp  | 4 +---
 rocclr/device/rocm/rocprogram.cpp | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/rocclr/device/devkernel.cpp b/rocclr/device/devkernel.cpp
index 84e6ab7e87..2b919bf563 100644
--- a/rocclr/device/devkernel.cpp
+++ b/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/rocclr/device/pal/palprogram.cpp b/rocclr/device/pal/palprogram.cpp
index c7a49479d4..05eba432b7 100644
--- a/rocclr/device/pal/palprogram.cpp
+++ b/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/rocclr/device/rocm/rocprogram.cpp b/rocclr/device/rocm/rocprogram.cpp
index 580803fdeb..4f77026d6a 100644
--- a/rocclr/device/rocm/rocprogram.cpp
+++ b/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;
   }