Rebase and fix format

- Add changes to fix tests after

[SYCL] Add Unified Runtime plugin and route to it with SYCL_PREFER_UR
intel#9232

Signed-off-by: Jaime Arteaga <[email protected]>

Author: Jaime Arteaga

sycl/plugins/unified_runtime/pi2ur.hpp

@@ -426,7 +426,6 @@ inline pi_result fixupInfoValueTypes(size_t ParamValueSizeUR,
   return PI_SUCCESS;
 }
 
-
 inline ur_result_t
 mapPIMetadataToUR(const pi_device_binary_property *pi_metadata,
                   ur_program_metadata_t *ur_metadata) {
@@ -455,7 +454,10 @@ namespace pi2ur {
 
 inline pi_result piTearDown(void *PluginParameter) {
   std::ignore = PluginParameter;
-  HANDLE_ERRORS(urTearDown(nullptr));
+  // TODO: Dont check for errors in urTearDown, since
+  // when using Level Zero plugin, the second urTearDown
+  // will fail as ur_loader.so has already been unloaded,
+  urTearDown(nullptr);
   return PI_SUCCESS;
 }
 
@@ -1379,7 +1381,6 @@ inline pi_result piextQueueGetNativeHandle(pi_queue Queue,
   return PI_SUCCESS;
 }
 
-
 inline pi_result piextQueueGetNativeHandle2(pi_queue Queue,
                                             pi_native_handle *NativeHandle,
                                             int32_t *NativeHandleDesc) {
@@ -1388,7 +1389,6 @@ inline pi_result piextQueueGetNativeHandle2(pi_queue Queue,
   return pi2ur::piextQueueGetNativeHandle(Queue, NativeHandle);
 }
 
-
 inline pi_result piQueueRelease(pi_queue Queue) {
   PI_ASSERT(Queue, PI_ERROR_INVALID_QUEUE);
 
@@ -2920,7 +2920,6 @@ inline pi_result piextUSMEnqueueFill2D(pi_queue Queue, void *Ptr, size_t Pitch,
                                        const pi_event *EventsWaitList,
                                        pi_event *Event) {
 
-
   auto hQueue = reinterpret_cast<ur_queue_handle_t>(Queue);
   auto phEventWaitList =
       reinterpret_cast<const ur_event_handle_t *>(EventsWaitList);
@@ -2931,7 +2930,6 @@ inline pi_result piextUSMEnqueueFill2D(pi_queue Queue, void *Ptr, size_t Pitch,
                                    phEventWaitList, phEvent));
 
   return PI_SUCCESS;
-
 }
 
 inline pi_result piextUSMEnqueueMemset2D(pi_queue Queue, void *Ptr,
@@ -3504,7 +3502,6 @@ inline pi_result piEnqueueEventsWait(pi_queue Queue,
   return PI_SUCCESS;
 }
 
-
 inline pi_result
 piextEnqueueReadHostPipe(pi_queue queue, pi_program program,
                          const char *pipe_symbol, pi_bool blocking, void *ptr,

sycl/plugins/unified_runtime/pi_unified_runtime.cpp

@@ -84,6 +84,15 @@ piContextCreate(const pi_context_properties *Properties, pi_uint32 NumDevices,
                                 UserData, RetContext);
 }
 
+__SYCL_EXPORT pi_result piContextGetInfo(pi_context Context,
+                                         pi_context_info ParamName,
+                                         size_t ParamValueSize,
+                                         void *ParamValue,
+                                         size_t *ParamValueSizeRet) {
+  return pi2ur::piContextGetInfo(Context, ParamName, ParamValueSize, ParamValue,
+                                 ParamValueSizeRet);
+}
+
 __SYCL_EXPORT pi_result piContextRelease(pi_context Context) {
   return pi2ur::piContextRelease(Context);
 }
@@ -1045,6 +1054,7 @@ __SYCL_EXPORT pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_API(piContextCreate)
   _PI_API(piContextRelease)
   _PI_API(piContextRetain)
+  _PI_API(piContextGetInfo)
   _PI_API(piextContextSetExtendedDeleter)
   _PI_API(piextContextGetNativeHandle)
   _PI_API(piextContextCreateWithNativeHandle)

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero.cpp

@@ -11,7 +11,6 @@
 #include <string.h>
 
 #include "ur_level_zero.hpp"
-  
 
 // Define the static class field
 std::mutex ZeCall::GlobalLock;

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_common.hpp

@@ -16,7 +16,6 @@
 #include <unordered_map>
 #include <vector>
 
- 
 #include <ur/ur.hpp>
 #include <ur_api.h>
 #include <ze_api.h>

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_context.hpp

@@ -15,7 +15,6 @@
 #include <unordered_set>
 #include <vector>
 
- 
 #include <ur/ur.hpp>
 #include <ur_api.h>
 #include <ze_api.h>

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_device.hpp

@@ -15,7 +15,6 @@
 #include <unordered_map>
 #include <vector>
 
- 
 #include <ur/ur.hpp>
 #include <ur_api.h>
 #include <ze_api.h>

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_event.cpp

@@ -11,10 +11,9 @@
 #include <mutex>
 #include <string.h>
 
+#include "ur_level_zero.hpp"
 #include "ur_level_zero_common.hpp"
 #include "ur_level_zero_event.hpp"
-#include "ur_level_zero.hpp"
-  
 
 void printZeEventList(const _ur_ze_event_list_t &UrZeEventList) {
   urPrint("  NumEventsInWaitList %d:", UrZeEventList.Length);

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_event.hpp

@@ -17,7 +17,6 @@
 #include <unordered_map>
 #include <vector>
 
- 
 #include <ur/ur.hpp>
 #include <ur_api.h>
 #include <ze_api.h>

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_kernel.cpp

@@ -8,7 +8,6 @@
 
 #include "ur_level_zero_kernel.hpp"
 #include "ur_level_zero.hpp"
-  
 
 UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
     ur_queue_handle_t Queue,   ///< [in] handle of the queue object
@@ -609,7 +608,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgPointer(
                          ///< holding the argument value. If null then argument
                          ///< value is considered null.
 ) {
-  UR_CALL(urKernelSetArgValue(Kernel, ArgIndex, sizeof(const void *), ArgValue));
+  UR_CALL(
+      urKernelSetArgValue(Kernel, ArgIndex, sizeof(const void *), ArgValue));
   return UR_RESULT_SUCCESS;
 }
 

sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_mem.hpp

@@ -16,7 +16,6 @@
 #include <unordered_map>
 #include <vector>
 
- 
 #include <ur/ur.hpp>
 #include <ur_api.h>
 #include <ze_api.h>