[Mlir-commits] [mlir] [MLIR] Update FindSyclRuntime.cmake to handle SYCL library path chang… (PR #75861)

Sang Ik Lee llvmlistbot at llvm.org
Mon Dec 18 13:49:24 PST 2023


https://github.com/silee2 created https://github.com/llvm/llvm-project/pull/75861

…e introduced by oneAPI DPC++ compiler 2024.0

>From 564394ec23831d95333535d83c82657cce382b9a Mon Sep 17 00:00:00 2001
From: "Lee, Sang Ik" <sang.ik.lee at intel.com>
Date: Mon, 18 Dec 2023 21:46:09 +0000
Subject: [PATCH] [MLIR] Update FindSyclRuntime.cmake to handle SYCL library
 path change introduced by oneAPI DPC++ compiler 2024.0

---
 mlir/cmake/modules/FindSyclRuntime.cmake | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mlir/cmake/modules/FindSyclRuntime.cmake b/mlir/cmake/modules/FindSyclRuntime.cmake
index 38b065a3f284c2..9e6ae040258487 100644
--- a/mlir/cmake/modules/FindSyclRuntime.cmake
+++ b/mlir/cmake/modules/FindSyclRuntime.cmake
@@ -17,10 +17,15 @@ if(NOT DEFINED ENV{CMPLR_ROOT})
     message(WARNING "Please make sure to install Intel DPC++ Compiler and run setvars.(sh/bat)")
     message(WARNING "You can download standalone Intel DPC++ Compiler from https://www.intel.com/content/www/us/en/developer/articles/tool/oneapi-standalone-components.html#compilers")
 else()
-    if(LINUX OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
-        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/linux")
-    elseif(WIN32)
-        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/windows")
+    get_filename_component(ONEAPI_VER "$ENV{CMPLR_ROOT}" NAME)
+    if(ONEAPI_VER VERSION_LESS 2024.0)
+        if(LINUX OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
+            set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/linux")
+        elseif(WIN32)
+            set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}/windows")
+        endif()
+    else()
+        set(SyclRuntime_ROOT "$ENV{CMPLR_ROOT}")
     endif()
     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include")
     list(APPEND SyclRuntime_INCLUDE_DIRS "${SyclRuntime_ROOT}/include/sycl")



More information about the Mlir-commits mailing list