[Bf-blender-cvs] [16938ab7d49] blender-v3.3-release: Update DPC++ to 20220812

Sergey Sharybin noreply at git.blender.org
Tue Aug 30 11:24:43 CEST 2022


Commit: 16938ab7d4956a1cb6a3501a0c0671ac56ba781e
Author: Sergey Sharybin
Date:   Tue Aug 30 11:23:35 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB16938ab7d4956a1cb6a3501a0c0671ac56ba781e

Update DPC++ to 20220812

This was already done in the libraries SVN, just the build system
changes got forgotten to be committed.

===================================================================

M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/patches/dpcpp.diff

===================================================================

diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index d0bcdc21b20..9dd6d3273cf 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -503,9 +503,9 @@ set(LEVEL_ZERO_HASH c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb
 set(LEVEL_ZERO_HASH_TYPE SHA256)
 set(LEVEL_ZERO_FILE level-zero-${LEVEL_ZERO_VERSION}.tar.gz)
 
-set(DPCPP_VERSION 20220620)
+set(DPCPP_VERSION 20220812)
 set(DPCPP_URI https://github.com/intel/llvm/archive/refs/tags/sycl-nightly/${DPCPP_VERSION}.tar.gz)
-set(DPCPP_HASH a5f41abd5229d28afa92cbd8a5d8d786ee698bf239f722929fd686276bad692c)
+set(DPCPP_HASH 0e3c95346c295f5cf80f3a42d80b1c49481955898530242636ddc002627248d6)
 set(DPCPP_HASH_TYPE SHA256)
 set(DPCPP_FILE DPCPP-${DPCPP_VERSION}.tar.gz)
 
diff --git a/build_files/build_environment/patches/dpcpp.diff b/build_files/build_environment/patches/dpcpp.diff
index 9dbe032de0c..4a65a6c6cf0 100644
--- a/build_files/build_environment/patches/dpcpp.diff
+++ b/build_files/build_environment/patches/dpcpp.diff
@@ -1,21 +1,3 @@
-diff -Naur external_dpcpp.orig/sycl/source/CMakeLists.txt external_dpcpp/sycl/source/CMakeLists.txt
---- external_dpcpp.orig/sycl/source/CMakeLists.txt      2022-05-20 04:19:45.067771362 +0000
-+++ external_dpcpp/sycl/source/CMakeLists.txt   2022-05-20 04:21:49.708025048 +0000
-@@ -66,10 +66,10 @@
-     target_compile_options(${LIB_OBJ_NAME} PUBLIC
-                            -fvisibility=hidden -fvisibility-inlines-hidden)
-     set(linker_script "${CMAKE_CURRENT_SOURCE_DIR}/ld-version-script.txt")
--    set(abi_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/abi_replacements_linux.txt")
--    target_link_libraries(
--      ${LIB_NAME} PRIVATE "-Wl,${abi_linker_script}")
--    set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${abi_linker_script})
-+#    set(abi_linker_script "${CMAKE_CURRENT_SOURCE_DIR}/abi_replacements_linux.txt")
-+#    target_link_libraries(
-+#      ${LIB_NAME} PRIVATE "-Wl,${abi_linker_script}")
-+#    set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${abi_linker_script})
-     target_link_libraries(
-         ${LIB_NAME} PRIVATE "-Wl,--version-script=${linker_script}")
-     set_target_properties(${LIB_NAME} PROPERTIES LINK_DEPENDS ${linker_script})
 diff -Naur llvm-sycl-nightly-20220501.orig\opencl/CMakeLists.txt llvm-sycl-nightly-20220501\opencl/CMakeLists.txt
 --- llvm-sycl-nightly-20220501.orig/opencl/CMakeLists.txt       2022-04-29 13:47:11 -0600
 +++ llvm-sycl-nightly-20220501/opencl/CMakeLists.txt    2022-05-21 15:25:06 -0600



More information about the Bf-blender-cvs mailing list