Fix command_list_manager.cpp

Author: ldorau

unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp

@@ -174,9 +174,10 @@ ur_result_t ur_command_list_manager::appendKernelLaunchUnlocked(
   auto zeSignalEvent = getSignalEvent(phEvent, UR_COMMAND_KERNEL_LAUNCH);
   auto waitListView = getWaitListView(phEventWaitList, numEventsInWaitList);
 
+  std::vector<void *> emptyKMemObj;
   UR_CALL(hKernel->prepareForSubmission(
       hContext.get(), hDevice.get(), pGlobalWorkOffset, workDim, WG[0], WG[1],
-      WG[2], getZeCommandList(), waitListView));
+      WG[2], getZeCommandList(), waitListView, emptyKMemObj));
 
   if (cooperative) {
     TRACK_SCOPE_LATENCY("ur_command_list_manager::"
@@ -1122,7 +1123,6 @@ ur_result_t ur_command_list_manager::appendKernelLaunchWithArgsExpNew(
       break;
     case UR_EXP_KERNEL_ARG_TYPE_MEM_OBJ:
       // prepareForSubmission() will save zePtr in kernelMemObj[argIndex]
-      hKernel->kernelMemObj[argIndex] = 0;
       hKernel->kernelArgs[argIndex] = &hKernel->kernelMemObj[argIndex];
       UR_CALL(hKernel->addPendingMemoryAllocation(
           {pArgs[argIndex].value.memObjTuple.hMem,
@@ -1139,10 +1139,12 @@ ur_result_t ur_command_list_manager::appendKernelLaunchWithArgsExpNew(
 
   // It is needed in case of UR_KERNEL_LAUNCH_PROPERTY_ID_COOPERATIVE
   // to launch the cooperative kernel.
-  ze_command_list_append_launch_kernel_param_cooperative_desc_t
-      cooperativeDesc = {
-          ZE_STRUCTURE_TYPE_COMMAND_LIST_APPEND_PARAM_COOPERATIVE_DESC, nullptr,
-          static_cast<ze_bool_t>(true)};
+  ZeStruct<ze_command_list_append_launch_kernel_param_cooperative_desc_t>
+      cooperativeDesc;
+  cooperativeDesc.isCooperative = static_cast<ze_bool_t>(true);
+  UR_ASSERT(cooperativeDesc.stype ==
+                ZE_STRUCTURE_TYPE_COMMAND_LIST_APPEND_PARAM_COOPERATIVE_DESC,
+            UR_RESULT_ERROR_INVALID_VALUE);
 
   void *pNext = nullptr;
   if (cooperativeKernelLaunchRequested) {
@@ -1168,7 +1170,7 @@ ur_result_t ur_command_list_manager::appendKernelLaunchWithArgsExpNew(
 
   UR_CALL(hKernel->prepareForSubmission(
       hContext.get(), hDevice.get(), pGlobalWorkOffset, workDim, WG[0], WG[1],
-      WG[2], getZeCommandList(), waitListView, &hKernel->kernelArgs));
+      WG[2], getZeCommandList(), waitListView, hKernel->kernelMemObj));
 
   {
     TRACK_SCOPE_LATENCY("ur_command_list_manager::"

unified-runtime/source/adapters/level_zero/v2/kernel.cpp

@@ -271,7 +271,7 @@ ur_result_t ur_kernel_handle_t_::prepareForSubmission(
     const size_t *pGlobalWorkOffset, uint32_t workDim, uint32_t groupSizeX,
     uint32_t groupSizeY, uint32_t groupSizeZ,
     ze_command_list_handle_t commandList, wait_list_view &waitListView,
-    std::vector<void *> *kernelArgs) {
+    std::vector<void *> &kMemObj) {
   auto &deviceKernelOpt = deviceKernels[deviceIndex(hDevice)];
   if (!deviceKernelOpt.has_value())
     return UR_RESULT_ERROR_INVALID_KERNEL;
@@ -300,20 +300,18 @@ ur_result_t ur_kernel_handle_t_::prepareForSubmission(
       }
     }
 
-    // kernelArgs must be non-nullptr in the path of
+    // kMemObj must be a non-empty vector in the path of
     // zeCommandListAppendLaunchKernelWithArguments()
-    if (kernelArgs) {
+    if (!kMemObj.empty()) {
       // zeCommandListAppendLaunchKernelWithArguments()
       // (==CommandListCoreFamily<gfxCoreFamily>::appendLaunchKernelWithArguments())
       // calls setArgumentValue(i, argSize, argValue) for all arguments on its
-      // own so do not call it here, but save the zePtr pointer in kernelArgs
+      // own so do not call it here, but save the zePtr pointer in kMemObj
       // for this future call.
-      if (pending.argIndex > kernelArgs->size() - 1) {
+      if (pending.argIndex > kMemObj.size() - 1) {
         return UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_INDEX;
       }
-      UR_ASSERT((*kernelArgs)[pending.argIndex] != nullptr,
-                UR_RESULT_ERROR_INVALID_NULL_POINTER);
-      *((void **)(*kernelArgs)[pending.argIndex]) = zePtr;
+      kMemObj[pending.argIndex] = zePtr;
     } else {
       // Set the argument only on this device's kernel.
       UR_CALL(deviceKernel.setArgPointer(pending.argIndex, zePtr));

unified-runtime/source/adapters/level_zero/v2/kernel.hpp

@@ -96,7 +96,7 @@ struct ur_kernel_handle_t_ : ur_object {
 
   // Set all required values for the kernel before submission (including pending
   // memory allocations).
-  // The kernelArgs argument must be non-nullptr
+  // The kMemObj argument must be a non-empty vector
   // in the path of zeCommandListAppendLaunchKernelWithArguments()
   ur_result_t prepareForSubmission(ur_context_handle_t hContext,
                                    ur_device_handle_t hDevice,
@@ -105,7 +105,7 @@ struct ur_kernel_handle_t_ : ur_object {
                                    uint32_t groupSizeY, uint32_t groupSizeZ,
                                    ze_command_list_handle_t cmdList,
                                    wait_list_view &waitListView,
-                                   std::vector<void *> *kernelArgs = nullptr);
+                                   std::vector<void *> &kMemObj);
 
   // Get context of the kernel.
   ur_context_handle_t getContext() const { return hProgram->Context; }