From 9fd521f4718e408e95e5af0529a5d07af2916739 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Sat, 7 Jun 2025 16:53:41 +0200
Subject: [PATCH] Revert "refactor: add validateWorkgroupSize() method"

This reverts commit 708b81bab5a7a95bad011b798fd281082aae58a4.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 level_zero/core/source/kernel/kernel_imp.cpp   | 18 +++++++-----------
 level_zero/core/source/kernel/kernel_imp.h     |  1 -
 .../core/source/kernel/kernel_imp_helper.cpp   |  3 ---
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/level_zero/core/source/kernel/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp
index fa18f462c1..cda485bac8 100644
--- a/level_zero/core/source/kernel/kernel_imp.cpp
+++ b/level_zero/core/source/kernel/kernel_imp.cpp
@@ -375,17 +375,6 @@ ze_result_t KernelImp::setGroupSize(uint32_t groupSizeX, uint32_t groupSizeY,
     patchWorkgroupSizeInCrossThreadData(groupSizeX, groupSizeY, groupSizeZ);
 
     auto simdSize = kernelDescriptor.kernelAttributes.simdSize;
-    auto grfCount = kernelDescriptor.kernelAttributes.numGrfRequired;
-    auto neoDevice = module->getDevice()->getNEODevice();
-    auto &rootDeviceEnvironment = neoDevice->getRootDeviceEnvironment();
-    auto &gfxCoreHelper = rootDeviceEnvironment.getHelper<NEO::GfxCoreHelper>();
-    this->numThreadsPerThreadGroup = gfxCoreHelper.calculateNumThreadsPerThreadGroup(
-        simdSize, static_cast<uint32_t>(itemsInGroup), grfCount, rootDeviceEnvironment);
-
-    if (auto wgSizeRet = validateWorkgroupSize(); wgSizeRet != ZE_RESULT_SUCCESS) {
-        return wgSizeRet;
-    }
-
     auto remainderSimdLanes = itemsInGroup & (simdSize - 1u);
     threadExecutionMask = static_cast<uint32_t>(maxNBitValue(remainderSimdLanes));
     if (!threadExecutionMask) {
@@ -393,6 +382,13 @@ ze_result_t KernelImp::setGroupSize(uint32_t groupSizeX, uint32_t groupSizeY,
     }
     evaluateIfRequiresGenerationOfLocalIdsByRuntime(kernelDescriptor);
 
+    auto grfCount = kernelDescriptor.kernelAttributes.numGrfRequired;
+    auto neoDevice = module->getDevice()->getNEODevice();
+    auto &rootDeviceEnvironment = neoDevice->getRootDeviceEnvironment();
+    auto &gfxCoreHelper = rootDeviceEnvironment.getHelper<NEO::GfxCoreHelper>();
+    this->numThreadsPerThreadGroup = gfxCoreHelper.calculateNumThreadsPerThreadGroup(
+        simdSize, static_cast<uint32_t>(itemsInGroup), grfCount, rootDeviceEnvironment);
+
     if (kernelRequiresGenerationOfLocalIdsByRuntime) {
         auto grfSize = this->module->getDevice()->getHwInfo().capabilityTable.grfSize;
         uint32_t perThreadDataSizeForWholeThreadGroupNeeded =
diff --git a/level_zero/core/source/kernel/kernel_imp.h b/level_zero/core/source/kernel/kernel_imp.h
index fcaa78a9f7..10321a6658 100644
--- a/level_zero/core/source/kernel/kernel_imp.h
+++ b/level_zero/core/source/kernel/kernel_imp.h
@@ -251,7 +251,6 @@ struct KernelImp : Kernel {
     virtual void evaluateIfRequiresGenerationOfLocalIdsByRuntime(const NEO::KernelDescriptor &kernelDescriptor) = 0;
     void *patchBindlessSurfaceState(NEO::GraphicsAllocation *alloc, uint32_t bindless);
     uint32_t getSurfaceStateIndexForBindlessOffset(NEO::CrossThreadDataOffset bindlessOffset) const;
-    ze_result_t validateWorkgroupSize() const;
 
     const KernelImmutableData *kernelImmData = nullptr;
     Module *module = nullptr;
diff --git a/level_zero/core/source/kernel/kernel_imp_helper.cpp b/level_zero/core/source/kernel/kernel_imp_helper.cpp
index d12512dc09..e317cf27e9 100644
--- a/level_zero/core/source/kernel/kernel_imp_helper.cpp
+++ b/level_zero/core/source/kernel/kernel_imp_helper.cpp
@@ -14,7 +14,4 @@ KernelExt *KernelImp::getExtension(uint32_t extensionType) { return nullptr; }
 
 void KernelImp::patchRegionParams(const CmdListKernelLaunchParams &launchParams, const ze_group_count_t &threadGroupDimensions) {}
 
-ze_result_t KernelImp::validateWorkgroupSize() const {
-    return ZE_RESULT_SUCCESS;
-}
 } // namespace L0