Port Add support to propagate compile flags to device backend compiler

intel#8763

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

Author: Jaime Arteaga

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -61,29 +61,11 @@ pi_result piPluginGetLastError(char **message) {
 // Return '-ze-opt-disable' for frontend_option = -O0.
 // Return '-ze-opt-level=1' for frontend_option = -O1 or -O2.
 // Return '-ze-opt-level=2' for frontend_option = -O3.
-pi_result piPluginGetBackendOption(pi_platform, const char *frontend_option,
+pi_result piPluginGetBackendOption(pi_platform platform,
+                                   const char *frontend_option,
                                    const char **backend_option) {
-  using namespace std::literals;
-  if (frontend_option == nullptr) {
-    return PI_ERROR_INVALID_VALUE;
-  }
-  if (frontend_option == ""sv) {
-    *backend_option = "";
-    return PI_SUCCESS;
-  }
-  if (frontend_option == "-O0"sv) {
-    *backend_option = "-ze-opt-disable";
-    return PI_SUCCESS;
-  }
-  if (frontend_option == "-O1"sv || frontend_option == "-O2"sv) {
-    *backend_option = "-ze-opt-level=1";
-    return PI_SUCCESS;
-  }
-  if (frontend_option == "-O3"sv) {
-    *backend_option = "-ze-opt-level=2";
-    return PI_SUCCESS;
-  }
-  return PI_ERROR_INVALID_VALUE;
+  return pi2ur::piPluginGetBackendOption(platform, frontend_option,
+                                         backend_option);
 }
 
 pi_result piDevicesGet(pi_platform Platform, pi_device_type DeviceType,

sycl/plugins/unified_runtime/CMakeLists.txt

@@ -4,7 +4,7 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D
   include(FetchContent)
 
   set(UNIFIED_RUNTIME_REPO "https://github.com/jandres742/unified-runtime.git")
-  set(UNIFIED_RUNTIME_TAG 6bcd2a224d717cf904568d7311e84e2d057fcbef)
+  set(UNIFIED_RUNTIME_TAG b674dc2b59997d5b6cff462f8c33ee05a2ce0450)
 
   message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
   FetchContent_Declare(unified-runtime

sycl/plugins/unified_runtime/pi2ur.hpp

@@ -506,6 +506,22 @@ inline pi_result piextPluginGetOpaqueData(void *opaque_data_param,
   return PI_ERROR_UNKNOWN;
 }
 
+// Returns plugin specific backend option.
+// Current support is only for optimization options.
+// Return '-ze-opt-disable' for frontend_option = -O0.
+// Return '-ze-opt-level=1' for frontend_option = -O1 or -O2.
+// Return '-ze-opt-level=2' for frontend_option = -O3.
+inline pi_result piPluginGetBackendOption(pi_platform Platform,
+                                          const char *FrontendOption,
+                                          const char **PlatformOption) {
+
+  auto UrPlatform = reinterpret_cast<ur_platform_handle_t>(Platform);
+  HANDLE_ERRORS(
+      urPlatformGetBackendOption(UrPlatform, FrontendOption, PlatformOption));
+
+  return PI_SUCCESS;
+}
+
 // Platform
 ///////////////////////////////////////////////////////////////////////////////
 

sycl/plugins/unified_runtime/pi_unified_runtime.cpp

@@ -981,6 +981,13 @@ __SYCL_EXPORT pi_result piGetDeviceAndHostTimer(pi_device Device,
   return pi2ur::piGetDeviceAndHostTimer(Device, DeviceTime, HostTime);
 }
 
+__SYCL_EXPORT pi_result piPluginGetBackendOption(pi_platform platform,
+                                                 const char *frontend_option,
+                                                 const char **backend_option) {
+  return pi2ur::piPluginGetBackendOption(platform, frontend_option,
+                                         backend_option);
+}
+
 // This interface is not in Unified Runtime currently
 __SYCL_EXPORT pi_result piTearDown(void *PluginParameter) {
   return pi2ur::piTearDown(PluginParameter);
@@ -1025,6 +1032,7 @@ __SYCL_EXPORT pi_result piPluginInit(pi_plugin *PluginInit) {
   _PI_API(piextPlatformCreateWithNativeHandle)
   _PI_API(piextDeviceGetNativeHandle)
   _PI_API(piextDeviceCreateWithNativeHandle)
+  _PI_API(piPluginGetBackendOption)
 
   _PI_API(piContextCreate)
   _PI_API(piContextRelease)

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

@@ -536,3 +536,33 @@ ur_result_t ur_platform_handle_t_::populateDeviceCacheIfNeeded() {
   DeviceCachePopulated = true;
   return UR_RESULT_SUCCESS;
 }
+
+UR_APIEXPORT ur_result_t UR_APICALL urPlatformGetBackendOption(
+    ur_platform_handle_t Platform, ///< [in] handle of the platform instance.
+    const char *FrontendOption, ///< [in] string containing the frontend option.
+    const char *
+        *PlatformOption ///< [out] returns the correct platform specific
+                        ///< compiler option based on the frontend option.
+) {
+  using namespace std::literals;
+  if (FrontendOption == nullptr) {
+    return UR_RESULT_SUCCESS;
+  }
+  if (FrontendOption == ""sv) {
+    *PlatformOption = "";
+    return UR_RESULT_SUCCESS;
+  }
+  if (FrontendOption == "-O0"sv) {
+    *PlatformOption = "-ze-opt-disable";
+    return UR_RESULT_SUCCESS;
+  }
+  if (FrontendOption == "-O1"sv || FrontendOption == "-O2"sv) {
+    *PlatformOption = "-ze-opt-level=1";
+    return UR_RESULT_SUCCESS;
+  }
+  if (FrontendOption == "-O3"sv) {
+    *PlatformOption = "-ze-opt-level=2";
+    return UR_RESULT_SUCCESS;
+  }
+  return UR_RESULT_ERROR_INVALID_VALUE;
+}

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

@@ -180,6 +180,7 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPlatformProcAddrTable(
   pDdiTable->pfnGetNativeHandle = urPlatformGetNativeHandle;
   pDdiTable->pfnCreateWithNativeHandle = urPlatformCreateWithNativeHandle;
   pDdiTable->pfnGetApiVersion = urPlatformGetApiVersion;
+  pDdiTable->pfnGetBackendOption = urPlatformGetBackendOption;
 
   return retVal;
 }