Fix after rebase

Author: againull

source/adapters/level_zero/v2/queue_immediate_in_order.cpp

@@ -847,15 +847,9 @@ ur_result_t ur_queue_immediate_in_order_t::enqueueDeviceGlobalVariableWrite(
     ur_program_handle_t hProgram, const char *name, bool blockingWrite,
     size_t count, size_t offset, const void *pSrc, uint32_t numEventsInWaitList,
     const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
-  // TODO: implement program->getZeModuleMap() to be sure that
-  // it's thread-safe
-  ze_module_handle_t zeModule{};
-  auto It = hProgram->ZeModuleMap.find(this->hDevice->ZeDevice);
-  if (It != hProgram->ZeModuleMap.end()) {
-    zeModule = It->second;
-  } else {
-    zeModule = hProgram->ZeModule;
-  }
+  // TODO: make getZeModuleHandle thread-safe
+  ze_module_handle_t zeModule =
+      hProgram->getZeModuleHandle(this->hDevice->ZeDevice);
 
   // Find global variable pointer
   auto globalVarPtr = getGlobalPointerFromModule(zeModule, offset, count, name);
@@ -869,15 +863,9 @@ ur_result_t ur_queue_immediate_in_order_t::enqueueDeviceGlobalVariableRead(
     ur_program_handle_t hProgram, const char *name, bool blockingRead,
     size_t count, size_t offset, void *pDst, uint32_t numEventsInWaitList,
     const ur_event_handle_t *phEventWaitList, ur_event_handle_t *phEvent) {
-  // TODO: implement program->getZeModule() to be sure that
-  // it's thread-safe
-  ze_module_handle_t zeModule{};
-  auto It = hProgram->ZeModuleMap.find(this->hDevice->ZeDevice);
-  if (It != hProgram->ZeModuleMap.end()) {
-    zeModule = It->second;
-  } else {
-    zeModule = hProgram->ZeModule;
-  }
+  // TODO: make getZeModuleHandle thread-safe
+  ze_module_handle_t zeModule =
+      hProgram->getZeModuleHandle(this->hDevice->ZeDevice);
 
   // Find global variable pointer
   auto globalVarPtr = getGlobalPointerFromModule(zeModule, offset, count, name);

source/loader/layers/sanitizer/ur_sanddi.cpp

@@ -206,10 +206,16 @@ __urdlllocal ur_result_t UR_APICALL urProgramCreateWithIL(
 /// @brief Intercept function for urProgramCreateWithBinary
 __urdlllocal ur_result_t UR_APICALL urProgramCreateWithBinary(
     ur_context_handle_t hContext, ///< [in] handle of the context instance
-    ur_device_handle_t
-        hDevice,            ///< [in] handle to device associated with binary.
-    size_t size,            ///< [in] size in bytes.
-    const uint8_t *pBinary, ///< [in] pointer to binary.
+    uint32_t numDevices,          ///< [in] number of devices
+    ur_device_handle_t *
+        phDevices, ///< [in][range(0, numDevices)] a pointer to a list of device handles. The
+                   ///< binaries are loaded for devices specified in this list.
+    size_t *
+        pLengths, ///< [in][range(0, numDevices)] array of sizes of program binaries
+                  ///< specified by `pBinaries` (in bytes).
+    const uint8_t **
+        ppBinaries, ///< [in][range(0, numDevices)] pointer to program binaries to be loaded
+                    ///< for devices specified by `phDevices`.
     const ur_program_properties_t *
         pProperties, ///< [in][optional] pointer to program creation properties.
     ur_program_handle_t
@@ -224,8 +230,9 @@ __urdlllocal ur_result_t UR_APICALL urProgramCreateWithBinary(
 
     getContext()->logger.debug("==== urProgramCreateWithBinary");
 
-    UR_CALL(pfnProgramCreateWithBinary(hContext, hDevice, size, pBinary,
-                                       pProperties, phProgram));
+    UR_CALL(pfnProgramCreateWithBinary(hContext, numDevices, phDevices,
+                                       pLengths, ppBinaries, pProperties,
+                                       phProgram));
     UR_CALL(getContext()->interceptor->insertProgram(*phProgram));
 
     return UR_RESULT_SUCCESS;

test/conformance/program/program_adapter_level_zero.match

@@ -0,0 +1,4 @@
+{{NONDETERMINISTIC}}
+urProgramSetSpecializationConstantsTest.InvalidValueSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
+urProgramSetSpecializationConstantsTest.InvalidValueId/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
+urProgramSetSpecializationConstantsTest.InvalidValuePtr/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}

test/conformance/program/program_adapter_level_zero_v2.match

@@ -0,0 +1,4 @@
+{{NONDETERMINISTIC}}
+urProgramSetSpecializationConstantsTest.InvalidValueSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}
+urProgramSetSpecializationConstantsTest.InvalidValueId/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urProgramSetSpecializationConstantsTest.InvalidValuePtr/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_