Add merge fixes for adapters third bump

omarahmed1111 · omarahmed1111 · commit 21e7c46d8bb9 · 2023-11-17T11:36:16.000Z
diff --git a/include/ur_print.hpp b/include/ur_print.hpp
@@ -17,8 +17,6 @@
 #include <bitset>
 #include <ostream>
 
-namespace ur {
-namespace print {
 namespace details {
 template <typename T>
 struct is_handle : std::false_type {};
@@ -15865,7 +15863,6 @@ inline ur_result_t printPtr(std::ostream &os, const T *ptr) {
     return UR_RESULT_SUCCESS;
 }
 } // namespace details
-} // namespace print
 
 namespace extras {
 ///////////////////////////////////////////////////////////////////////////////
@@ -15876,8 +15873,6 @@ namespace extras {
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
 ///         - `NULL == params`
 UR_APIEXPORT inline ur_result_t UR_APICALL printFunctionParams(std::ostream &os, ur_function_t function, const void *params) {
-    using namespace print;
-
     if (!params) {
         return UR_RESULT_ERROR_INVALID_NULL_POINTER;
     }
@@ -16441,6 +16436,5 @@ UR_APIEXPORT inline ur_result_t UR_APICALL printFunctionParams(std::ostream &os,
     return UR_RESULT_SUCCESS;
 }
 } // namespace extras
-} // namespace ur
 
 #endif /* UR_PRINT_HPP */
diff --git a/scripts/templates/print.hpp.mako b/scripts/templates/print.hpp.mako
@@ -108,8 +108,6 @@ def findMemberType(_item):
     %endif
 </%def>
 
-namespace ${x} {
-namespace print {
 ## API functions declarations #################################################
 namespace details {
 template <typename T> struct is_handle : std::false_type {};
@@ -436,7 +434,6 @@ template <typename T> inline ${x}_result_t printPtr(std::ostream &os, const T *p
     return ${X}_RESULT_SUCCESS;
 }
 } // namespace details
-} // namespace print
 
 namespace extras {
 ///////////////////////////////////////////////////////////////////////////////
@@ -447,8 +444,6 @@ namespace extras {
 ///     - ::${X}_RESULT_ERROR_INVALID_NULL_POINTER
 ///         - `NULL == params`
 ${X}_APIEXPORT inline ${x}_result_t ${X}_APICALL printFunctionParams(std::ostream &os, ur_function_t function, const void *params) {
-    using namespace print;
-
     if (!params) {
         return ${X}_RESULT_ERROR_INVALID_NULL_POINTER;
     }
@@ -466,6 +461,5 @@ ${X}_APIEXPORT inline ${x}_result_t ${X}_APICALL printFunctionParams(std::ostrea
     return ${X}_RESULT_SUCCESS;
 }
 } // namespace extras
-} // namespace ${x}
 
 #endif /* ${X}_PRINT_HPP */
diff --git a/source/adapters/adapter.def.in b/source/adapters/adapter.def.in
@@ -13,6 +13,7 @@ EXPORTS
 	urGetPhysicalMemProcAddrTable
 	urGetPlatformProcAddrTable
 	urGetProgramProcAddrTable
+	urGetProgramExpProcAddrTable
 	urGetQueueProcAddrTable
 	urGetSamplerProcAddrTable
 	urGetUSMProcAddrTable
diff --git a/source/adapters/adapter.map.in b/source/adapters/adapter.map.in
@@ -13,6 +13,7 @@
 		urGetPhysicalMemProcAddrTable;
 		urGetPlatformProcAddrTable;
 		urGetProgramProcAddrTable;
+		urGetProgramExpProcAddrTable;
 		urGetQueueProcAddrTable;
 		urGetSamplerProcAddrTable;
 		urGetUSMProcAddrTable;
diff --git a/source/adapters/cuda/ur_interface_loader.cpp b/source/adapters/cuda/ur_interface_loader.cpp
@@ -412,6 +412,20 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
   return UR_RESULT_SUCCESS;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetProgramExpProcAddrTable(
+    ur_api_version_t version, ur_program_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  pDdiTable->pfnBuildExp = nullptr;
+  pDdiTable->pfnCompileExp = nullptr;
+  pDdiTable->pfnLinkExp = nullptr;
+
+  return UR_RESULT_SUCCESS;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/adapters/hip/ur_interface_loader.cpp b/source/adapters/hip/ur_interface_loader.cpp
@@ -366,6 +366,20 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
   return UR_RESULT_SUCCESS;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetProgramExpProcAddrTable(
+    ur_api_version_t version, ur_program_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  pDdiTable->pfnBuildExp = nullptr;
+  pDdiTable->pfnCompileExp = nullptr;
+  pDdiTable->pfnLinkExp = nullptr;
+
+  return UR_RESULT_SUCCESS;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/adapters/level_zero/ur_interface_loader.cpp b/source/adapters/level_zero/ur_interface_loader.cpp
@@ -458,6 +458,20 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
 
   return UR_RESULT_SUCCESS;
 }
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetProgramExpProcAddrTable(
+    ur_api_version_t version, ur_program_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  pDdiTable->pfnBuildExp = nullptr;
+  pDdiTable->pfnCompileExp = nullptr;
+  pDdiTable->pfnLinkExp = nullptr;
+
+  return UR_RESULT_SUCCESS;
+}
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/adapters/native_cpu/ur_interface_loader.cpp b/source/adapters/native_cpu/ur_interface_loader.cpp
@@ -401,4 +401,18 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
 
   return UR_RESULT_SUCCESS;
 }
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetProgramExpProcAddrTable(
+    ur_api_version_t version, ur_program_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  pDdiTable->pfnBuildExp = nullptr;
+  pDdiTable->pfnCompileExp = nullptr;
+  pDdiTable->pfnLinkExp = nullptr;
+
+  return UR_RESULT_SUCCESS;
+}
 } // extern "C"
diff --git a/source/adapters/opencl/event.cpp b/source/adapters/opencl/event.cpp
@@ -220,13 +220,13 @@ urEventSetCallback(ur_event_handle_t hEvent, ur_execution_info_t execStatus,
 
   cl_int CallbackType = 0;
   switch (execStatus) {
-  case UR_EXECUTION_INFO_EXECUTION_INFO_SUBMITTED:
+  case UR_EXECUTION_INFO_SUBMITTED:
     CallbackType = CL_SUBMITTED;
     break;
-  case UR_EXECUTION_INFO_EXECUTION_INFO_RUNNING:
+  case UR_EXECUTION_INFO_RUNNING:
     CallbackType = CL_RUNNING;
     break;
-  case UR_EXECUTION_INFO_EXECUTION_INFO_COMPLETE:
+  case UR_EXECUTION_INFO_COMPLETE:
     CallbackType = CL_COMPLETE;
     break;
   default:
diff --git a/source/adapters/opencl/ur_interface_loader.cpp b/source/adapters/opencl/ur_interface_loader.cpp
@@ -403,6 +403,19 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
   return UR_RESULT_SUCCESS;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetProgramExpProcAddrTable(
+    ur_api_version_t version, ur_program_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  pDdiTable->pfnBuildExp = nullptr;
+  pDdiTable->pfnCompileExp = nullptr;
+  pDdiTable->pfnLinkExp = nullptr;
+
+  return UR_RESULT_SUCCESS;
+}
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/common/logger/ur_sinks.hpp b/source/common/logger/ur_sinks.hpp
@@ -16,7 +16,6 @@
 #include "ur_print.hpp"
 
 namespace logger {
-using namespace ur::print;
 
 class Sink {
   public:
diff --git a/test/conformance/device/device_adapter_hip.match b/test/conformance/device/device_adapter_hip.match
@@ -1,5 +1,2 @@
-urDeviceCreateWithNativeHandleTest.Success
-urDeviceGetTest.InvalidValueNumEntries
+{{OPT}}urDeviceCreateWithNativeHandleTest.Success
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
-urDeviceGetInfoTest.Success/UR_DEVICE_INFO_SUPPORTED_PARTITIONS
-urDeviceGetInfoTest.Success/UR_DEVICE_INFO_PARTITION_TYPE
diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero.match b/test/conformance/enqueue/enqueue_adapter_level_zero.match
@@ -1,2 +1,3 @@
 {{OPT}}urEnqueueDeviceGetGlobalVariableReadTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
-Segmentation fault
+{{OPT}}urEnqueueEventsWaitTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+{{Segmentation fault|Aborted}}
diff --git a/test/conformance/kernel/kernel_adapter_level_zero.match b/test/conformance/kernel/kernel_adapter_level_zero.match
@@ -1 +1,16 @@
+urKernelGetInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_NUM_REGS
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_FUNCTION_NAME
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_NUM_ARGS
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_REFERENCE_COUNT
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_CONTEXT
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_PROGRAM
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_ATTRIBUTES
+urKernelGetInfoTest.InvalidSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_KERNEL_INFO_NUM_REGS
+urKernelSetArgLocalTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgMemObjTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgPointerTest.SuccessHost/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgPointerTest.SuccessDevice/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgPointerTest.SuccessShared/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgPointerNegativeTest.InvalidNullHandleKernel/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+urKernelSetArgPointerNegativeTest.InvalidKernelArgumentIndex/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 Segmentation fault
diff --git a/test/conformance/memory/memory_adapter_hip.match b/test/conformance/memory/memory_adapter_hip.match
@@ -1,8 +1,4 @@
 urMemBufferCreateWithNativeHandleTest.Success/AMD_HIP_BACKEND___{{.*}}_
-urMemGetInfoTest.InvalidNullPointerParamValue/AMD_HIP_BACKEND___{{.*}}___UR_MEM_INFO_SIZE
-urMemGetInfoTest.InvalidNullPointerParamValue/AMD_HIP_BACKEND___{{.*}}___UR_MEM_INFO_CONTEXT
-urMemGetInfoTest.InvalidNullPointerPropSizeRet/AMD_HIP_BACKEND___{{.*}}___UR_MEM_INFO_SIZE
-urMemGetInfoTest.InvalidNullPointerPropSizeRet/AMD_HIP_BACKEND___{{.*}}___UR_MEM_INFO_CONTEXT
 {{OPT}}urMemImageCreateTest.InvalidSize/AMD_HIP_BACKEND___{{.*}}_
 {{OPT}}urMemImageGetInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_IMAGE_INFO_ROW_PITCH
 {{OPT}}urMemImageGetInfoTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_IMAGE_INFO_SLICE_PITCH
diff --git a/test/conformance/memory/memory_adapter_level_zero.match b/test/conformance/memory/memory_adapter_level_zero.match
@@ -2,9 +2,5 @@ urMemBufferCreateTest.InvalidBufferSizeZero/Intel_R__oneAPI_Unified_Runtime_over
 urMemBufferPartitionTest.InvalidBufferSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
 urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
-urMemGetInfoTest.InvalidNullPointerParamValue/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
-urMemGetInfoTest.InvalidNullPointerParamValue/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_CONTEXT
-urMemGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
-urMemGetInfoTest.InvalidNullPointerPropSizeRet/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_CONTEXT
 urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
 {{Segmentation fault|Aborted}}
diff --git a/test/conformance/queue/queue_adapter_cuda.match b/test/conformance/queue/queue_adapter_cuda.match
@@ -1,3 +0,0 @@
-urQueueCreateWithNativeHandleTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
-urQueueGetInfoTestWithInfoParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_QUEUE_INFO_DEVICE_DEFAULT
-urQueueGetInfoTestWithInfoParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_QUEUE_INFO_SIZE
diff --git a/test/loader/loader_lifetime/urLoaderInit.cpp b/test/loader/loader_lifetime/urLoaderInit.cpp
@@ -17,7 +17,7 @@ INSTANTIATE_TEST_SUITE_P(
                       UR_DEVICE_INIT_FLAG_FPGA | UR_DEVICE_INIT_FLAG_VPU),
     [](const ::testing::TestParamInfo<ur_device_init_flags_t> &info) {
         std::stringstream ss;
-        ur::print::details::printFlag<ur_device_init_flag_t>(ss, info.param);
+        details::printFlag<ur_device_init_flag_t>(ss, info.param);
         return GTestSanitizeString(ss.str());
     });
 
diff --git a/test/unit/utils/params.cpp b/test/unit/utils/params.cpp
@@ -405,7 +405,6 @@ typedef Types<UrLoaderInitParamsNoFlags, UrLoaderInitParamsInvalidFlags,
     Implementations;
 
 using ::testing::MatchesRegex;
-using namespace ur::print;
 
 TYPED_TEST_SUITE(ParamsTest, Implementations, );
 
diff --git a/tools/urinfo/utils.hpp b/tools/urinfo/utils.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "ur_api.h"
-#include "ur_params.hpp"
+#include "ur_print.hpp"
 #include <algorithm>
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/urtrace/collector.cpp b/tools/urtrace/collector.cpp
@@ -331,7 +331,7 @@ XPTI_CALLBACK_API void trace_cb(uint16_t trace_type, xpti::trace_event_data_t *,
     if (cli_args.no_args) {
         args_str << "...";
     } else {
-        ur::extras::printFunctionParams(
+        extras::printFunctionParams(
             args_str, (enum ur_function_t)args->function_id, args->args_data);
     }
 
