From d872930773b5f7deda6e51fca28a044b208aafbb Mon Sep 17 00:00:00 2001
From: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
Date: Fri, 26 May 2023 12:17:54 -0700
Subject: [PATCH] [SYCL][UR][L0] Fix some CI errors

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
---
 sycl/plugins/unified_runtime/CMakeLists.txt            |  4 ++--
 sycl/plugins/unified_runtime/pi2ur.hpp                 | 10 ++++++++--
 .../ur/adapters/level_zero/ur_level_zero_device.cpp    |  1 +
 .../ur/adapters/level_zero/ur_level_zero_mem.cpp       |  2 ++
 .../ur/adapters/level_zero/ur_level_zero_platform.cpp  |  2 ++
 .../ur/adapters/level_zero/ur_level_zero_program.cpp   |  5 ++++-
 .../ur/adapters/level_zero/ur_level_zero_usm.cpp       |  2 ++
 7 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
index a7b8a1e8e8b31..ba04012a5caee 100755
--- a/sycl/plugins/unified_runtime/CMakeLists.txt
+++ b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -3,8 +3,8 @@
 if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_DIR)
   include(FetchContent)
 
-  set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  set(UNIFIED_RUNTIME_TAG 620ddb1e8bb1f5ef6cc775edf79ba4674057fe2e)
+  set(UNIFIED_RUNTIME_REPO "https://github.com/jandres742/unified-runtime.git")
+  set(UNIFIED_RUNTIME_TAG c4570a25e3493454ab6c4cd0192f270962f77a3c)
 
   message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
   FetchContent_Declare(unified-runtime
diff --git a/sycl/plugins/unified_runtime/pi2ur.hpp b/sycl/plugins/unified_runtime/pi2ur.hpp
index 4a1ca333e0977..f4d36fc199c52 100644
--- a/sycl/plugins/unified_runtime/pi2ur.hpp
+++ b/sycl/plugins/unified_runtime/pi2ur.hpp
@@ -1137,6 +1137,9 @@ inline pi_result piContextCreate(const pi_context_properties *Properties,
                                                    const void *PrivateInfo,
                                                    size_t CB, void *UserData),
                                  void *UserData, pi_context *RetContext) {
+  std::ignore = Properties;
+  std::ignore = PFnNotify;
+  std::ignore = UserData;
   auto UrDevices = reinterpret_cast<const ur_device_handle_t *>(Devices);
 
   ur_context_handle_t *UrContext =
@@ -1213,8 +1216,8 @@ inline pi_result piContextGetInfo(pi_context Context, pi_context_info ParamName,
     ContextInfoType = UR_CONTEXT_INFO_REFERENCE_COUNT;
     break;
   }
-  case PI_EXT_ONEAPI_CONTEXT_INFO_USM_FILL2D_SUPPORT: {
-  case PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMSET2D_SUPPORT:
+  case PI_EXT_ONEAPI_CONTEXT_INFO_USM_FILL2D_SUPPORT:
+  case PI_EXT_ONEAPI_CONTEXT_INFO_USM_MEMSET2D_SUPPORT: {
     ContextInfoType = UR_CONTEXT_INFO_USM_FILL2D_SUPPORT;
     break;
   }
@@ -2337,6 +2340,7 @@ inline pi_result piextUSMHostAlloc(void **ResultPtr, pi_context Context,
                                    pi_usm_mem_properties *Properties,
                                    size_t Size, pi_uint32 Alignment) {
 
+  std::ignore = Properties;
   ur_context_handle_t UrContext =
       reinterpret_cast<ur_context_handle_t>(Context);
   ur_usm_desc_t USMDesc{};
@@ -2744,6 +2748,7 @@ inline pi_result piextUSMDeviceAlloc(void **ResultPtr, pi_context Context,
                                      pi_usm_mem_properties *Properties,
                                      size_t Size, pi_uint32 Alignment) {
 
+  std::ignore = Properties;
   ur_context_handle_t UrContext =
       reinterpret_cast<ur_context_handle_t>(Context);
   auto UrDevice = reinterpret_cast<ur_device_handle_t>(Device);
@@ -2762,6 +2767,7 @@ inline pi_result piextUSMSharedAlloc(void **ResultPtr, pi_context Context,
                                      pi_usm_mem_properties *Properties,
                                      size_t Size, pi_uint32 Alignment) {
 
+  std::ignore = Properties;
   if (Properties && *Properties != 0) {
     PI_ASSERT(*(Properties) == PI_MEM_ALLOC_FLAGS && *(Properties + 2) == 0,
               PI_ERROR_INVALID_VALUE);
diff --git a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_device.cpp b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_device.cpp
index 7b95bb9bf5b1a..db97445d64d6d 100644
--- a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_device.cpp
+++ b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_device.cpp
@@ -1180,6 +1180,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceSelectBinary(
                         ///< array of binaries. If a suitable binary was not
                         ///< found the function returns ${X}_INVALID_BINARY.
 ) {
+  std::ignore = Device;
   // TODO: this is a bare-bones implementation for choosing a device image
   // that would be compatible with the targeted device. An AOT-compiled
   // image is preferred over SPIR-V for known devices (i.e. Intel devices)
diff --git a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_mem.cpp b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_mem.cpp
index 1974f6052ff04..d5f8493ee119f 100644
--- a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_mem.cpp
+++ b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_mem.cpp
@@ -1236,6 +1236,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueUSMPrefetch(
         *OutEvent ///< [in,out][optional] return an event object that identifies
                   ///< this particular command instance.
 ) {
+  std::ignore = Flags;
   // Lock automatically releases when this goes out of scope.
   std::scoped_lock<ur_shared_mutex> lock(Queue->Mutex);
 
@@ -1826,6 +1827,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferPartition(
     ur_mem_handle_t
         *RetMem ///< [out] pointer to the handle of sub buffer created
 ) {
+  std::ignore = BufferCreateType;
   UR_ASSERT(Buffer && !Buffer->isImage() &&
                 !(static_cast<_ur_buffer *>(Buffer))->isSubBuffer(),
             UR_RESULT_ERROR_INVALID_MEM_OBJECT);
diff --git a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_platform.cpp b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_platform.cpp
index db7570d795b3e..36bbb2a84e1f2 100644
--- a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_platform.cpp
+++ b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_platform.cpp
@@ -290,6 +290,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urPlatformGetApiVersion(
     ur_platform_handle_t Driver, ///< [in] handle of the platform
     ur_api_version_t *Version    ///< [out] api version
 ) {
+  std::ignore = Driver;
   *Version = UR_API_VERSION_0_6;
   return UR_RESULT_SUCCESS;
 }
@@ -550,6 +551,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urPlatformGetBackendOption(
         *PlatformOption ///< [out] returns the correct platform specific
                         ///< compiler option based on the frontend option.
 ) {
+  std::ignore = Platform;
   using namespace std::literals;
   if (FrontendOption == nullptr) {
     return UR_RESULT_SUCCESS;
diff --git a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_program.cpp b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_program.cpp
index 6604ca073bc6a..6f17105eb9242 100644
--- a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_program.cpp
+++ b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_program.cpp
@@ -54,6 +54,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramCreateWithIL(
     ur_program_handle_t
         *Program ///< [out] pointer to handle of program object created.
 ) {
+  std::ignore = Properties;
   try {
     ur_program_handle_t_ *UrProgram =
         new ur_program_handle_t_(ur_program_handle_t_::IL, Context, IL, Length);
@@ -78,6 +79,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramCreateWithBinary(
     ur_program_handle_t
         *Program ///< [out] pointer to handle of Program object created.
 ) {
+  std::ignore = Device;
+  std::ignore = Properties;
   // In OpenCL, clCreateProgramWithBinary() can be used to load any of the
   // following: "program executable", "compiled program", or "library of
   // compiled programs".  In addition, the loaded program can be either
@@ -191,7 +194,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramCompile(
     const char *Options ///< [in][optional] pointer to build options
                         ///< null-terminated string.
 ) {
-
+  std::ignore = Context;
   std::scoped_lock<ur_shared_mutex> Guard(Program->Mutex);
 
   // It's only valid to compile a program created from IL (we don't support
diff --git a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_usm.cpp b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_usm.cpp
index 9f215d06d85a8..5266d896e4030 100644
--- a/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_usm.cpp
+++ b/sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero_usm.cpp
@@ -632,6 +632,7 @@ ur_result_t USMDeviceAllocImpl(void **ResultPtr, ur_context_handle_t Context,
                                ur_device_handle_t Device,
                                ur_usm_device_mem_flags_t *Flags, size_t Size,
                                uint32_t Alignment) {
+  std::ignore = Flags;
   // TODO: translate PI properties to Level Zero flags
   ZeStruct<ze_device_mem_alloc_desc_t> ZeDesc;
   ZeDesc.flags = 0;
@@ -693,6 +694,7 @@ ur_result_t USMSharedAllocImpl(void **ResultPtr, ur_context_handle_t Context,
 ur_result_t USMHostAllocImpl(void **ResultPtr, ur_context_handle_t Context,
                              ur_usm_host_mem_flags_t *Flags, size_t Size,
                              uint32_t Alignment) {
+  std::ignore = Flags;
   // TODO: translate PI properties to Level Zero flags
   ZeStruct<ze_host_mem_alloc_desc_t> ZeHostDesc;
   ZeHostDesc.flags = 0;