Merge branch 'l0v2' of github.com:mateuszpn/llvm into l0v2

Author: mateuszpn

unified-runtime/source/adapters/hip/CMakeLists.txt

@@ -110,12 +110,21 @@ if("${UR_HIP_PLATFORM}" STREQUAL "AMD")
     # Import HIP runtime library
     add_library(rocmdrv SHARED IMPORTED GLOBAL)
 
-    set_target_properties(
-    rocmdrv PROPERTIES
-        IMPORTED_LOCATION                    "${UR_HIP_LIB_DIR}/libamdhip64.so"
-        INTERFACE_INCLUDE_DIRECTORIES        "${HIP_HEADERS}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_HEADERS}"
-    )
+    if(WIN32)
+      set_target_properties(
+      rocmdrv PROPERTIES
+          IMPORTED_IMPLIB                      "${UR_HIP_LIB_DIR}/amdhip64.lib"
+          INTERFACE_INCLUDE_DIRECTORIES        "${HIP_HEADERS}"
+          INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_HEADERS}"
+      )
+    else()
+      set_target_properties(
+      rocmdrv PROPERTIES
+          IMPORTED_LOCATION                    "${UR_HIP_LIB_DIR}/libamdhip64.so"
+          INTERFACE_INCLUDE_DIRECTORIES        "${HIP_HEADERS}"
+          INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_HEADERS}"
+      )
+    endif()
 
     if(UR_ENABLE_COMGR)
         set(UR_COMGR_VERSION5_HEADER "${UR_HIP_INCLUDE_DIR}/amd_comgr/amd_comgr.h")

unified-runtime/source/adapters/hip/context.cpp

@@ -61,7 +61,7 @@ urContextGetInfo(ur_context_handle_t hContext, ur_context_info_t propName,
 
   UrReturnHelper ReturnValue(propSize, pPropValue, pPropSizeRet);
 
-  switch (uint32_t{propName}) {
+  switch (propName) {
   case UR_CONTEXT_INFO_NUM_DEVICES:
     return ReturnValue(static_cast<uint32_t>(hContext->Devices.size()));
   case UR_CONTEXT_INFO_DEVICES:

unified-runtime/source/adapters/hip/device.cpp

@@ -13,6 +13,7 @@
 #include "context.hpp"
 #include "event.hpp"
 
+#include <array>
 #include <hip/hip_runtime.h>
 #include <sstream>
 

unified-runtime/source/adapters/hip/kernel.hpp

@@ -11,6 +11,7 @@
 
 #include <ur_api.h>
 
+#include <array>
 #include <atomic>
 #include <cassert>
 #include <numeric>

unified-runtime/source/adapters/level_zero/image_common.cpp

@@ -753,7 +753,7 @@ ur_result_t urBindlessImagesImportExternalSemaphoreExp(
 
   ZE2UR_CALL(UrPlatform->ZeExternalSemaphoreExt.zexImportExternalSemaphoreExp,
              (hDevice->ZeDevice, (ze_external_semaphore_ext_desc_t *)&SemDesc,
-             (ze_external_semaphore_ext_handle_t *)&ExtSemaphoreHandle));
+              (ze_external_semaphore_ext_handle_t *)&ExtSemaphoreHandle));
   *phExternalSemaphoreHandle =
       (ur_exp_external_semaphore_handle_t)ExtSemaphoreHandle;