sys-devel/DPC++: add 2021.12

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

3 files changed, 454 insertions, 0 deletions

diff --git a/sys-devel/DPC++/DPC++-2021.12.ebuild b/sys-devel/DPC++/DPC++-2021.12.ebuild
new file mode 100644
index 000000000..e8101c7c6
--- /dev/null
+++ b/sys-devel/DPC++/DPC++-2021.12.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-any-r1
+DOCS_BUILDER="doxygen"
+DOCS_DIR="build/docs"
+DOCS_CONFIG_NAME="doxygen.cfg"
+DOCS_DEPEND="
+	media-gfx/graphviz
+	virtual/latex-base
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/myst_parser[${PYTHON_USEDEP}]
+	')
+"
+inherit docs
+
+# We cannot unbundle this because it has to be compiled with the clang/llvm
+# that we are building here. Otherwise we run into problems running the compiler.
+CPU_EMUL_PV="2022-08-22"
+VC_INTR_PV="0.8.1" # Newer versions cause compile failure
+
+DESCRIPTION="oneAPI Data Parallel C++ compiler"
+HOMEPAGE="https://github.com/intel/llvm"
+SRC_URI="
+	https://github.com/intel/llvm/archive/refs/tags/${PV//./-}.tar.gz -> ${P}.tar.gz
+	https://github.com/intel/vc-intrinsics/archive/refs/tags/v${VC_INTR_PV}.tar.gz -> ${P}-vc-intrinsics-${VC_INTR_PV}.tar.gz
+	esimd_emulator? ( https://github.com/intel/cm-cpu-emulation/archive/refs/tags/v${CPU_EMUL_PV}.tar.gz -> ${P}-cm-cpu-emulation-${CPU_EMUL_PV}.tar.gz )
+"
+S="${WORKDIR}/llvm-${PV//./-}"
+CMAKE_USE_DIR="${S}/llvm"
+BUILD_DIR="${S}/build"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+IUSE="cuda hip test esimd_emulator ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="
+	?? ( cuda hip )
+	cuda? ( llvm_targets_NVPTX )
+	hip? ( llvm_targets_AMDGPU )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/level-zero:=
+	dev-libs/opencl-icd-loader
+	dev-util/opencl-headers
+	dev-util/spirv-headers
+	dev-util/spirv-tools
+	media-libs/libva
+	sys-devel/libtool
+	esimd_emulator? ( dev-libs/libffi:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	hip? ( dev-util/hip:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-libs.patch"
+)
+
+src_configure() {
+	# Extracted from buildbot/configure.py
+	local mycmakeargs=(
+		-DLLVM_ENABLE_ASSERTIONS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_EXTERNAL_PROJECTS="sycl;llvm-spirv;opencl;libdevice;xpti;xptifw"
+		-DLLVM_EXTERNAL_SYCL_SOURCE_DIR="${S}/sycl"
+		-DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR="${S}/llvm-spirv"
+		-DLLVM_EXTERNAL_XPTI_SOURCE_DIR="${S}/xpti"
+		-DXPTI_SOURCE_DIR="${S}/xpti"
+		-DLLVM_EXTERNAL_XPTIFW_SOURCE_DIR="${S}/xptifw"
+		-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR="${S}/libdevice"
+		-DLLVM_ENABLE_PROJECTS="clang;sycl;llvm-spirv;opencl;libdevice;xpti;xptifw"
+		-DLLVM_BUILD_TOOLS=ON
+		-DSYCL_ENABLE_WERROR=OFF
+		-DSYCL_INCLUDE_TESTS="$(usex test)"
+		-DCLANG_INCLUDE_TESTS="$(usex test)"
+		-DLLVM_INCLUDE_TESTS="$(usex test)"
+		-DLLVM_SPIRV_INCLUDE_TESTS="$(usex test)"
+		-DLLVM_ENABLE_DOXYGEN="$(usex doc)"
+		-DLLVM_ENABLE_SPHINX="$(usex doc)"
+		-DLLVM_BUILD_DOCS="$(usex doc)"
+		-DSYCL_ENABLE_XPTI_TRACING=ON
+		-DLLVM_ENABLE_LLD=OFF
+		-DXPTI_ENABLE_WERROR=OFF
+		-DSYCL_BUILD_PI_ESIMD_EMULATOR="$(usex esimd_emulator)"
+		-DSYCL_BUILD_PI_CUDA="$(usex cuda)"
+		-DSYCL_BUILD_PI_HIP="$(usex hip)"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr"
+		-DLEVEL_ZERO_LIBRARY="${ESYSROOT}/usr/lib64/libze_loader.so"
+		-DLEVEL_ZERO_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DLLVMGenXIntrinsics_SOURCE_DIR="${WORKDIR}/vc-intrinsics-${VC_INTR_PV}"
+		-DSYCL_CLANG_EXTRA_FLAGS="${CXXFLAGS}"
+		# The sycl part of the build system insists on installing during compiling
+		# Install it to some temporary directory
+		-DCMAKE_INSTALL_PREFIX="${BUILD_DIR}/install"
+		-DCMAKE_INSTALL_MANDIR="${BUILD_DIR}/install/share/man"
+		-DCMAKE_INSTALL_INFODIR="${BUILD_DIR}/install/share/info"
+		-DCMAKE_INSTALL_DOCDIR="${BUILD_DIR}/install/share/doc/${PF}"
+	)
+
+	if use hip; then
+		mycmakeargs+=(
+			-DSYCL_BUILD_PI_HIP_PLATFORM=AMD
+			-DLIBCLC_GENERATE_REMANGLED_VARIANTS=ON
+			-DLIBCLC_TARGETS_TO_BUILD=";amdgcn--;amdgcn--amdhsa"
+		)
+	fi
+
+	if use cuda; then
+		mycmakeargs+=(
+			-DLIBCLC_GENERATE_REMANGLED_VARIANTS=ON
+			-DLIBCLC_TARGETS_TO_BUILD=";nvptx64--;nvptx64--nvidiacl"
+		)
+	fi
+
+	if use esimd_emulator; then
+		mycmakeargs+=(
+			-DLibFFI_INCLUDE_DIR="${ESYSROOT}/usr/lib64/libffi/include"
+			-DUSE_LOCAL_CM_EMU_SOURCE="${WORKDIR}/cm-cpu-emulation-${CPU_EMUL_PV}"
+		)
+	fi
+
+	if use doc; then
+		mycmakeargs+=( -DSPHINX_WARNINGS_AS_ERRORS=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	# Build sycl (this also installs some stuff already)
+	cmake_build deploy-sycl-toolchain
+
+	use doc && cmake_build doxygen-sycl
+
+	# Install all other files into the same temporary directory
+	cmake_build install
+}
+
+src_test() {
+	cmake_build check
+}
+
+src_install() {
+	einstalldocs
+
+	local LLVM_INTEL_DIR="/usr/lib/llvm/intel"
+	dodir "${LLVM_INTEL_DIR}"
+
+	# Copy our temporary directory to the image directory
+	mv "${BUILD_DIR}/install"/* "${ED}/${LLVM_INTEL_DIR}" || die
+
+	# Copied from llvm ebuild, put env file last so we don't overwrite main llvm/clang
+	newenvd - "60llvm-intel" <<-_EOF_
+		PATH="${EPREFIX}${LLVM_INTEL_DIR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}${LLVM_INTEL_DIR}/bin"
+		MANPATH="${EPREFIX}${LLVM_INTEL_DIR}/share/man"
+		LDPATH="${EPREFIX}${LLVM_INTEL_DIR}/lib:${EPREFIX}${LLVM_INTEL_DIR}/lib64"
+	_EOF_
+}
diff --git a/sys-devel/DPC++/Manifest b/sys-devel/DPC++/Manifest
index 9527a6642..7e18cbad4 100644
--- a/sys-devel/DPC++/Manifest
+++ b/sys-devel/DPC++/Manifest
@@ -1,3 +1,6 @@
+DIST DPC++-2021.12-cm-cpu-emulation-2022-08-22.tar.gz 328563 BLAKE2B 86dfbf9163e77675227eb1db2242edf0de6e3f6be45ddfc1077d4cfb83e997f4839f2abb4e15688f4e657c263a0102d7fda627d6c57f1bcc2582560f3fdb5664 SHA512 fabd973739c17c3c702d8ea1345df165a272053fe7c6564fb81f00a3a316e1ed69d4fdbd73f408841600cf9705e31fc688c6d88e7b095e8f97b1090b3ecd8ccc
+DIST DPC++-2021.12-vc-intrinsics-0.8.1.tar.gz 138462 BLAKE2B 0f86f5fbeb7931a564eb598d527fd67e96489d0f2e7dba7166ffa468470022eff05e150877c3dd380ad003beb8651a0ac9ffe9c3dceeae6552c46b5f3e00aa64 SHA512 9763f1b624121694d6880ca3ffdf2e344ce3ed1a39c1c1e7dc06195b79acccce5e3d86032bba5c0de440376821c383f8ff59fdd57b0ae93fede17595b0fe0b42
+DIST DPC++-2021.12.tar.gz 160365844 BLAKE2B c741afc109ceb9d1b5e62e1299d400b4009979621363e173cded514ed9417e4728ad2079f7f74f3ff8038a898950aca7157a60bb9d9017e8e3c453990d301481 SHA512 7128f325d5f68fb408c14a595612fdde45e69f3d60807fd68888f4715a96976fd8881fb5421177fab5add84a1d717ec136ba47f78e2211a4c7db33d9e40b7060
 DIST DPC++-2022.09-cm-cpu-emulation-2022-08-22.tar.gz 328563 BLAKE2B 86dfbf9163e77675227eb1db2242edf0de6e3f6be45ddfc1077d4cfb83e997f4839f2abb4e15688f4e657c263a0102d7fda627d6c57f1bcc2582560f3fdb5664 SHA512 fabd973739c17c3c702d8ea1345df165a272053fe7c6564fb81f00a3a316e1ed69d4fdbd73f408841600cf9705e31fc688c6d88e7b095e8f97b1090b3ecd8ccc
 DIST DPC++-2022.09-vc-intrinsics-0.8.1.tar.gz 138462 BLAKE2B 0f86f5fbeb7931a564eb598d527fd67e96489d0f2e7dba7166ffa468470022eff05e150877c3dd380ad003beb8651a0ac9ffe9c3dceeae6552c46b5f3e00aa64 SHA512 9763f1b624121694d6880ca3ffdf2e344ce3ed1a39c1c1e7dc06195b79acccce5e3d86032bba5c0de440376821c383f8ff59fdd57b0ae93fede17595b0fe0b42
 DIST DPC++-2022.09.tar.gz 171848301 BLAKE2B 48f57fee53370135b25a4e5f27926375fe9e4b707909f5841afa4c0d27a53932404f066db6384b8e8c327f1328cd00339e1c055935eb38fca2a8ce34f3556727 SHA512 f17ac91d4ec03c067595abd8355a54484c2cd8b79bb8b1ed8c90fabd8d83b73cce0271a8b3aa26e2c92e8083a2b3cf145c7e78b68e568c3cb036c80b8a4f9e12
diff --git a/sys-devel/DPC++/files/DPC++-2021.12-system-libs.patch b/sys-devel/DPC++/files/DPC++-2021.12-system-libs.patch
new file mode 100644
index 000000000..a9d7f468f
--- /dev/null
+++ b/sys-devel/DPC++/files/DPC++-2021.12-system-libs.patch
@@ -0,0 +1,274 @@
+diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
+index ad6fc3327..f68e18b51 100644
+--- a/opencl/CMakeLists.txt
++++ b/opencl/CMakeLists.txt
+@@ -23,29 +23,8 @@ set(OCL_LOADER_REPO
+ set(OCL_HEADERS_TAG 23710f1b99186065c1768fc3098ba681adc0f253)
+ set(OCL_LOADER_TAG 5f8249691ec8c25775789498951f8e9eb62c201d)
+ 
+-# OpenCL Headers
+-if(NOT OpenCL_HEADERS)
+-  message(STATUS "Will fetch OpenCL headers from ${OCL_HEADERS_REPO}")
+-
+-  FetchContent_Declare(ocl-headers
+-    GIT_REPOSITORY    ${OCL_HEADERS_REPO}
+-    GIT_TAG           ${OCL_HEADERS_TAG}
+-  )
+-else()
+-  message(STATUS "OpenCL headers are added manually ${OpenCL_HEADERS}")
+-
+-  FetchContent_Declare(ocl-headers
+-    URL               ${OpenCL_HEADERS}
+-  )
+-endif()
+-
+-FetchContent_MakeAvailable(ocl-headers)
+-FetchContent_GetProperties(ocl-headers)
+ set(OpenCL_INCLUDE_DIR
+-  ${ocl-headers_SOURCE_DIR} CACHE PATH "Path to OpenCL Headers")
+-
+-target_compile_definitions(Headers INTERFACE -DCL_TARGET_OPENCL_VERSION=220)
+-add_library(OpenCL-Headers ALIAS Headers)
++  /usr/include CACHE PATH "Path to OpenCL Headers")
+ 
+ # OpenCL Library (ICD Loader)
+ 
+@@ -57,25 +36,4 @@ set(OPENCL_ICD_LOADER_HEADERS_DIR
+ # library.
+ set(BUILD_SHARED_LIBS ON)
+ 
+-if(NOT OpenCL_LIBRARY_SRC)
+-  message(STATUS "Will fetch OpenCL ICD Loader from ${OCL_LOADER_REPO}")
+-
+-  FetchContent_Declare(ocl-icd
+-    GIT_REPOSITORY    ${OCL_LOADER_REPO}
+-    GIT_TAG           ${OCL_LOADER_TAG}
+-  )
+-else()
+-  # TODO: add possibility to use prebuilt OpenCL library rather than building
+-  #       together with llvm.
+-  message(STATUS
+-    "OpenCL ICD Loader sources added manually ${OpenCL_LIBRARY_SRC}")
+-
+-  FetchContent_Declare(ocl-icd
+-    URL               ${OpenCL_LIBRARY_SRC}
+-  )
+-endif()
+-
+-FetchContent_MakeAvailable(ocl-icd)
+-add_library(OpenCL-ICD ALIAS OpenCL)
+-
+ add_subdirectory(opencl-aot)
+diff --git a/opencl/opencl-aot/CMakeLists.txt b/opencl/opencl-aot/CMakeLists.txt
+index ff905fd88..5232fe7a6 100644
+--- a/opencl/opencl-aot/CMakeLists.txt
++++ b/opencl/opencl-aot/CMakeLists.txt
+@@ -19,5 +19,4 @@ endif()
+ 
+ target_link_libraries(${OPENCL_AOT_PROJECT_NAME}
+   PRIVATE
+-    OpenCL-Headers
+-    OpenCL-ICD)
++    OpenCL)
+diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
+index 0894e7413..5645799a8 100644
+--- a/sycl/CMakeLists.txt
++++ b/sycl/CMakeLists.txt
+@@ -103,7 +103,7 @@ file(COPY ${OpenCL_INCLUDE_DIR}/CL
+ # Include OpenCL Headers into final bundle.
+ install(DIRECTORY ${OpenCL_INCLUDE_DIR}/CL
+         DESTINATION ${SYCL_INCLUDE_DIR}/sycl
+-        COMPONENT OpenCL-Headers)
++        COMPONENT OpenCL)
+ 
+ option(SYCL_BUILD_PI_CUDA
+   "Enables the CUDA backend for the Plugin Interface" OFF)
+@@ -295,7 +295,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
+      sycl-post-link
+      sycl-ls
+      clang-resource-headers
+-     OpenCL-Headers
++     OpenCL
+      opencl-aot
+      sycl-headers
+      sycl-headers-extras
+@@ -306,8 +306,8 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
+      ${XPTIFW_LIBS}
+ )
+ 
+-if(OpenCL_INSTALL_KHRONOS_ICD_LOADER AND TARGET OpenCL-ICD)
+-  list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS OpenCL-ICD)
++if(OpenCL_INSTALL_KHRONOS_ICD_LOADER AND TARGET OpenCL)
++  list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS OpenCL)
+ endif()
+ 
+ if(SYCL_BUILD_PI_CUDA)
+diff --git a/sycl/cmake/modules/AddSYCLUnitTest.cmake b/sycl/cmake/modules/AddSYCLUnitTest.cmake
+index 030ff6139..235522b58 100644
+--- a/sycl/cmake/modules/AddSYCLUnitTest.cmake
++++ b/sycl/cmake/modules/AddSYCLUnitTest.cmake
+@@ -31,7 +31,7 @@ macro(add_sycl_unittest test_dirname link_variant)
+   target_link_libraries(${test_dirname}
+     PRIVATE
+       LLVMTestingSupport
+-      OpenCL-Headers
++      OpenCL
+       ${SYCL_LINK_LIBS}
+     )
+   target_include_directories(${test_dirname}
+diff --git a/sycl/plugins/cuda/CMakeLists.txt b/sycl/plugins/cuda/CMakeLists.txt
+index ff6dd8bc6..260b10268 100644
+--- a/sycl/plugins/cuda/CMakeLists.txt
++++ b/sycl/plugins/cuda/CMakeLists.txt
+@@ -41,7 +41,7 @@ target_include_directories(pi_cuda
+ 
+ target_link_libraries(pi_cuda
+   PRIVATE
+-    OpenCL-Headers
++    OpenCL
+     cudadrv
+ )
+ 
+diff --git a/sycl/plugins/esimd_emulator/CMakeLists.txt b/sycl/plugins/esimd_emulator/CMakeLists.txt
+index 4ce9e1ff5..5b6cbf1bf 100755
+--- a/sycl/plugins/esimd_emulator/CMakeLists.txt
++++ b/sycl/plugins/esimd_emulator/CMakeLists.txt
+@@ -40,6 +40,7 @@ if (DEFINED CM_LOCAL_SOURCE_DIR)
+       INSTALL_DIR       ${CMAKE_CURRENT_BINARY_DIR}/cm-emu_install
+       CMAKE_ARGS        -DLIBVA_INSTALL_PATH=/usr
+                         -D__SYCL_EXPLICIT_SIMD_PLUGIN__=true
++                        -DLibFFI_INCLUDE_DIR=${LibFFI_INCLUDE_DIR}
+                         -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+       BUILD_BYPRODUCTS  ${LIBCM} ${LIBIGFXCMRT_EMU}
+     )
+@@ -123,7 +124,7 @@ else()
+   )
+ endif()
+ 
+-add_dependencies(pi_esimd_emulator OpenCL-Headers)
++add_dependencies(pi_esimd_emulator OpenCL)
+ add_dependencies(pi_esimd_emulator cm-emu)
+ add_dependencies(sycl-toolchain pi_esimd_emulator)
+ 
+diff --git a/sycl/plugins/hip/CMakeLists.txt b/sycl/plugins/hip/CMakeLists.txt
+index 7b3d9c395..e696ceeb0 100644
+--- a/sycl/plugins/hip/CMakeLists.txt
++++ b/sycl/plugins/hip/CMakeLists.txt
+@@ -17,7 +17,7 @@ add_library(pi_hip SHARED
+ )
+ add_dependencies(sycl-toolchain pi_hip)
+ set_target_properties(pi_hip PROPERTIES LINKER_LANGUAGE CXX)
+-target_link_libraries(pi_hip PUBLIC OpenCL-Headers)
++target_link_libraries(pi_hip PUBLIC OpenCL)
+ 
+ # Setup include directories
+ target_include_directories(pi_hip
+diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
+index f4e6a48bc..f674c6a57 100755
+--- a/sycl/plugins/level_zero/CMakeLists.txt
++++ b/sycl/plugins/level_zero/CMakeLists.txt
+@@ -48,7 +48,7 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
+                LOG_BUILD 1
+                LOG_INSTALL 1
+     STEP_TARGETS      configure,build,install
+-    DEPENDS           OpenCL-Headers
++    DEPENDS           OpenCL
+     BUILD_BYPRODUCTS ${LEVEL_ZERO_LOADER}
+   )
+   ExternalProject_Add_Step(level-zero-loader llvminstall
+@@ -82,7 +82,7 @@ else()
+       COMMAND
+ 	  ${CMAKE_COMMAND} -E copy ${LEVEL_ZERO_LIBRARY_SRC} ${LLVM_LIBRARY_OUTPUT_INTDIR}
+       COMMAND
+-	  ${CMAKE_COMMAND} -E copy_directory ${LEVEL_ZERO_INCLUDE_DIR} ${LLVM_BINARY_DIR}/include/sycl
++	  ${CMAKE_COMMAND} -E copy_directory ${LEVEL_ZERO_INCLUDE_DIR}/level_zero ${LLVM_BINARY_DIR}/include/sycl/level_zero
+       DEPENDS
+ 	  ${LEVEL_ZERO_LIBRARY}
+           ${LEVEL_ZERO_INCLUDE_DIR}
+@@ -140,7 +140,7 @@ add_dependencies(sycl-toolchain pi_level_zero)
+ target_link_libraries(pi_level_zero
+   PRIVATE
+     "${LEVEL_ZERO_LOADER}"
+-    OpenCL-Headers
++    OpenCL
+ )
+ 
+ if (UNIX)
+diff --git a/sycl/plugins/opencl/CMakeLists.txt b/sycl/plugins/opencl/CMakeLists.txt
+index d3d5c3a4c..d08809c99 100644
+--- a/sycl/plugins/opencl/CMakeLists.txt
++++ b/sycl/plugins/opencl/CMakeLists.txt
+@@ -25,8 +25,7 @@ target_include_directories(pi_opencl PRIVATE "${sycl_inc_dir}")
+ #link pi_opencl with OpenCL headers and ICD Loader.
+ target_link_libraries(pi_opencl
+   PRIVATE
+-    OpenCL-Headers
+-    OpenCL-ICD
++    OpenCL
+ )
+ if (MSVC)
+   # by defining __SYCL_BUILD_SYCL_DLL, we can use __declspec(dllexport)
+diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt
+index 46f33bdb4..6e65cd6a8 100644
+--- a/sycl/source/CMakeLists.txt
++++ b/sycl/source/CMakeLists.txt
+@@ -76,14 +76,14 @@ function(add_sycl_rt_library LIB_NAME)
+   )
+   #TODO: Remove dependency on icd loader and opencl headers.
+   target_link_libraries(${LIB_OBJ_NAME}
+-    PRIVATE OpenCL-Headers
++    PRIVATE OpenCL
+   )
+ 
+   find_package(Threads REQUIRED)
+ 
+   target_link_libraries(${LIB_NAME}
+     PRIVATE
+-      OpenCL-ICD
++      OpenCL
+       ${CMAKE_DL_LIBS}
+       ${CMAKE_THREAD_LIBS_INIT}
+     PUBLIC
+diff --git a/sycl/tools/CMakeLists.txt b/sycl/tools/CMakeLists.txt
+index a4f567482..7af557fd2 100644
+--- a/sycl/tools/CMakeLists.txt
++++ b/sycl/tools/CMakeLists.txt
+@@ -20,9 +20,8 @@ endif()
+ 
+ target_link_libraries(get_device_count_by_type
+   PRIVATE
+-    OpenCL-Headers
++    OpenCL
+     LevelZeroLoader::Headers
+-    OpenCL-ICD
+     ${LEVEL_ZERO_LIBRARY}
+     # The CUDA and HIP for NVIDA plugins need cudadrv
+     $<$<OR:$<BOOL:${SYCL_BUILD_PI_CUDA}>,$<AND:$<BOOL:${SYCL_BUILD_PI_HIP}>,$<STREQUAL:${SYCL_BUILD_PI_HIP_PLATFORM},NVIDIA>>>:cudadrv>
+diff --git a/sycl/tools/pi-trace/CMakeLists.txt b/sycl/tools/pi-trace/CMakeLists.txt
+index e305fd22d..5aea609ff 100644
+--- a/sycl/tools/pi-trace/CMakeLists.txt
++++ b/sycl/tools/pi-trace/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ add_library(pi_trace SHARED pi_trace.cpp)
+ target_compile_definitions(pi_trace PRIVATE XPTI_CALLBACK_API_EXPORTS)
+ target_link_libraries(pi_trace PRIVATE xptifw)
+-if (TARGET OpenCL-Headers)
+-  target_link_libraries(pi_trace PRIVATE OpenCL-Headers)
++if (TARGET OpenCL)
++  target_link_libraries(pi_trace PRIVATE OpenCL)
+ endif()
+ 
+ target_include_directories(pi_trace PRIVATE
+diff --git a/sycl/tools/sycl-ls/CMakeLists.txt b/sycl/tools/sycl-ls/CMakeLists.txt
+index f5909cf49..f9c52e3a3 100644
+--- a/sycl/tools/sycl-ls/CMakeLists.txt
++++ b/sycl/tools/sycl-ls/CMakeLists.txt
+@@ -11,7 +11,7 @@ endif()
+ target_link_libraries(sycl-ls
+   PRIVATE
+     ${sycl_lib}
+-    OpenCL-Headers
++    OpenCL
+ )
+ install(TARGETS sycl-ls
+   RUNTIME DESTINATION "bin" COMPONENT sycl-ls)