Merge branch 'main' into review/yang/misalign_access

Author: AllanZyne

source/adapters/level_zero/CMakeLists.txt

@@ -42,7 +42,7 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
         set(UR_LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
     endif()
     if (UR_LEVEL_ZERO_LOADER_TAG STREQUAL "")
-        set(UR_LEVEL_ZERO_LOADER_TAG v1.16.1)
+        set(UR_LEVEL_ZERO_LOADER_TAG v1.17.0)
     endif()
 
     # Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104

source/adapters/level_zero/common.cpp

@@ -229,6 +229,14 @@ template <> ze_structure_type_t getZeStructureType<ze_command_queue_desc_t>() {
 template <> ze_structure_type_t getZeStructureType<ze_image_desc_t>() {
   return ZE_STRUCTURE_TYPE_IMAGE_DESC;
 }
+template <>
+ze_structure_type_t getZeStructureType<ze_image_bindless_exp_desc_t>() {
+  return ZE_STRUCTURE_TYPE_BINDLESS_IMAGE_EXP_DESC;
+}
+template <>
+ze_structure_type_t getZeStructureType<ze_image_pitched_exp_desc_t>() {
+  return ZE_STRUCTURE_TYPE_PITCHED_IMAGE_EXP_DESC;
+}
 template <> ze_structure_type_t getZeStructureType<ze_module_desc_t>() {
   return ZE_STRUCTURE_TYPE_MODULE_DESC;
 }

source/adapters/level_zero/image.cpp

@@ -99,6 +99,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urSamplerCreate(
 
   try {
     ur_sampler_handle_t_ *UrSampler = new ur_sampler_handle_t_(ZeSampler);
+    UrSampler->ZeSamplerDesc = ZeSamplerDesc;
     *Sampler = reinterpret_cast<ur_sampler_handle_t>(UrSampler);
   } catch (const std::bad_alloc &) {
     return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;

source/adapters/level_zero/sampler.cpp

@@ -16,4 +16,6 @@ struct ur_sampler_handle_t_ : _ur_object {
 
   // Level Zero sampler handle.
   ze_sampler_handle_t ZeSampler;
+
+  ZeStruct<ze_sampler_desc_t> ZeSamplerDesc;
 };

source/adapters/level_zero/sampler.hpp

@@ -90,7 +90,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     // TODO : Populate return string accordingly - e.g. cl_khr_fp16,
     // cl_khr_fp64, cl_khr_int64_base_atomics,
     // cl_khr_int64_extended_atomics
-    return ReturnValue("cl_khr_fp64 ");
+    return ReturnValue("cl_khr_fp16, cl_khr_fp64 ");
   case UR_DEVICE_INFO_VERSION:
     return ReturnValue("0.1");
   case UR_DEVICE_INFO_COMPILER_AVAILABLE:

source/adapters/native_cpu/device.cpp

@@ -17,12 +17,12 @@ namespace logger {
 Logger create_logger(std::string logger_name, bool skip_prefix = false,
                      bool skip_linebreak = false);
 
-inline Logger &get_logger(std::string name = "common") {
-    static Logger logger = create_logger(std::move(name));
+inline Logger &get_logger(const char *name = "common") {
+    static Logger logger = create_logger(name);
     return logger;
 }
 
-inline void init(std::string name) { get_logger(std::move(name)); }
+inline void init(const std::string &name) { get_logger(name.c_str()); }
 
 template <typename... Args>
 inline void debug(const char *format, Args &&...args) {

source/common/logger/ur_logger.hpp

@@ -2,11 +2,12 @@ urProgramBuildTest.BuildFailure/NVIDIA_CUDA_BACKEND___{{.*}}_
 {{OPT}}urProgramCreateWithILTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
 {{OPT}}urProgramCreateWithILTest.SuccessWithProperties/NVIDIA_CUDA_BACKEND___{{.*}}
 {{OPT}}urProgramCreateWithILTest.BuildInvalidProgram/NVIDIA_CUDA_BACKEND___{{.*}}
+# This test flakily fails
 {{OPT}}urProgramGetBuildInfoSingleTest.LogIsNullTerminated/NVIDIA_CUDA_BACKEND___{{.*}}
-{{OPT}}urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
-{{OPT}}urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
-{{OPT}}urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
-{{OPT}}urProgramGetInfoSingleTest.NumDevicesMatchesDeviceArray/NVIDIA_CUDA_BACKEND___{{.*}}
+# CUDA doesn't expose kernel numbers or names
+urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROGRAM_INFO_NUM_KERNELS
+urProgramGetInfoTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_PROGRAM_INFO_KERNEL_NAMES
+
 {{OPT}}urProgramSetSpecializationConstantsTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}
 {{OPT}}urProgramSetSpecializationConstantsTest.UseDefaultValue/NVIDIA_CUDA_BACKEND___{{.*}}
 urProgramSetMultipleSpecializationConstantsTest.MultipleCalls/NVIDIA_CUDA_BACKEND___{{.*}}