[L0] don't release program in kernel release and check work dim size

Signed-off-by: Spruit, Neil R <neil.r.spruit@intel.com>
oneapi-src · Jan 17, 2024 · 84c241d · 84c241d
1 parent cd3fde2
commit 84c241d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/source/adapters/level_zero/kernel.cpp b/source/adapters/level_zero/kernel.cpp
@@ -82,10 +82,14 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
   uint32_t WG[3]{};
 
   // global_work_size of unused dimensions must be set to 1
-  UR_ASSERT(WorkDim == 3 || GlobalWorkSize[2] == 1,
-            UR_RESULT_ERROR_INVALID_VALUE);
-  UR_ASSERT(WorkDim >= 2 || GlobalWorkSize[1] == 1,
-            UR_RESULT_ERROR_INVALID_VALUE);
+  if (WorkDim >= 2) {
+    UR_ASSERT(WorkDim >= 2 || GlobalWorkSize[1] == 1,
+              UR_RESULT_ERROR_INVALID_VALUE);
+    if (WorkDim == 3) {
+      UR_ASSERT(WorkDim == 3 || GlobalWorkSize[2] == 1,
+                UR_RESULT_ERROR_INVALID_VALUE);
+    }
+  }
   if (LocalWorkSize) {
     // L0
     UR_ASSERT(LocalWorkSize[0] < (std::numeric_limits<uint32_t>::max)(),
@@ -642,8 +646,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelRelease(
   if (IndirectAccessTrackingEnabled) {
     UR_CALL(urContextRelease(KernelProgram->Context));
   }
-  // do a release on the program this kernel was part of
-  UR_CALL(urProgramRelease(KernelProgram));
+
   delete Kernel;
 
   return UR_RESULT_SUCCESS;

diff --git a/test/conformance/kernel/kernel_adapter_level_zero.match b/test/conformance/kernel/kernel_adapter_level_zero.match
@@ -11,7 +11,6 @@ urKernelSetArgMemObjTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runt
 urKernelSetArgPointerTest.SuccessHost/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urKernelSetArgPointerTest.SuccessDevice/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urKernelSetArgPointerTest.SuccessShared/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
-urKernelSetArgPointerNegativeTest.InvalidNullHandleKernel/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urKernelSetArgPointerNegativeTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urKernelSetArgSamplerTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urKernelSetArgValueTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_