[UR] Uplift tag to bring urProgramCreateWithBinary change

Author: againull

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -116,14 +116,13 @@ if(SYCL_UR_USE_FETCH_CONTENT)
       CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
   endfunction()
 
-  set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  # commit c742ca49efb12380a35b8b0b467e6577ab8174ce
-  # Merge: 3a8bf2c5 504d3b63
-  # Author: Kenneth Benzie (Benie) <[email protected]>
-  # Date:   Mon Oct 21 11:55:23 2024 +0100
-  #     Merge pull request #2131 from Bensuo/ben/command-handle-fix
-  #     [EXP][CMDBUF] Make command handle behaviour consistent
-  set(UNIFIED_RUNTIME_TAG c742ca49efb12380a35b8b0b467e6577ab8174ce)
+  set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime")
+  # commit 3db3a5e2d935630f2ffddd93a72ae0aa9af89acb
+  # Author: Artur Gainullin <[email protected]>
+  # Date:   Tue Oct 22 03:30:08 2024 -0700
+  #
+  #     Support UR program creation from multiple device binaries (#2147)
+  set(UNIFIED_RUNTIME_TAG 3db3a5e2d935630f2ffddd93a72ae0aa9af89acb)
 
   set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
   # Due to the use of dependentloadflag and no installer for UMF and hwloc we need

sycl/source/detail/program_manager/program_manager.cpp

@@ -96,7 +96,8 @@ createBinaryProgram(const ContextImplPtr Context, const device &Device,
   Properties.count = Metadata.size();
   Properties.pMetadatas = Metadata.data();
   Adapter->call<UrApiKind::urProgramCreateWithBinary>(
-      Context->getHandleRef(), UrDevice, DataLen, Data, &Properties, &Program);
+      Context->getHandleRef(), 1, &UrDevice, &DataLen, &Data, &Properties,
+      &Program);
 
   if (BinaryStatus != UR_RESULT_SUCCESS) {
     throw detail::set_ur_error(

sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp

@@ -105,7 +105,8 @@ ur_result_t redefinedUrProgramCreate(void *pParams) {
 
 ur_result_t redefinedUrProgramCreateWithBinary(void *pParams) {
   auto params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
-  redefinedUrProgramCreateCommon(*params.ppBinary);
+  for (uint32_t i = 0; i < *params.pnumDevices; ++i)
+    redefinedUrProgramCreateCommon(*params.pppBinaries[i]);
   return UR_RESULT_SUCCESS;
 }
 

sycl/unittests/helpers/RuntimeLinkingCommon.hpp

@@ -40,7 +40,7 @@ static ur_result_t redefined_urProgramCreateWithIL(void *pParams) {
 
 static ur_result_t redefined_urProgramCreateWithBinary(void *pParams) {
   auto Params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
-  auto *Magic = reinterpret_cast<const unsigned char *>(*Params.ppBinary);
+  auto *Magic = reinterpret_cast<const unsigned char *>(*Params.pppBinaries[0]);
   ur_program_handle_t *res = *Params.pphProgram;
   *res = mock::createDummyHandle<ur_program_handle_t>(sizeof(unsigned));
   reinterpret_cast<mock::dummy_handle_t>(*res)->setDataAs<unsigned>(*Magic);

sycl/unittests/program_manager/CompileTarget.cpp

@@ -138,8 +138,9 @@ static ur_result_t redefinedDeviceGet(void *pParams) {
 std::vector<std::string> createWithBinaryLog;
 static ur_result_t redefinedProgramCreateWithBinary(void *pParams) {
   auto params = *static_cast<ur_program_create_with_binary_params_t *>(pParams);
-  createWithBinaryLog.push_back(
-      reinterpret_cast<const char *>(*params.ppBinary));
+  for (uint32_t i = 0; i < *params.pnumDevices; ++i)
+    createWithBinaryLog.push_back(
+        reinterpret_cast<const char *>(*params.pppBinaries[i]));
   return UR_RESULT_SUCCESS;
 }