Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package intel-graphics-compiler for openSUSE:Factory checked in at 2023-04-01 19:30:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intel-graphics-compiler (Old) and /work/SRC/openSUSE:Factory/.intel-graphics-compiler.new.9019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "intel-graphics-compiler" Sat Apr 1 19:30:17 2023 rev:3 rq:1075747 version:1.0.13230.7 Changes: -------- --- /work/SRC/openSUSE:Factory/intel-graphics-compiler/intel-graphics-compiler.changes 2023-03-27 18:17:49.435595340 +0200 +++ /work/SRC/openSUSE:Factory/.intel-graphics-compiler.new.9019/intel-graphics-compiler.changes 2023-04-01 19:30:42.556864670 +0200 @@ -1,0 +2,21 @@ +Fri Mar 31 06:37:32 UTC 2023 - Patrik Jakobsson + +- 0001-Use-patch-instead-of-git-to-apply-opencl-clang-patch.patch makes it + possible to build without using git repos. + +------------------------------------------------------------------- +Tue Mar 28 11:11:37 UTC 2023 - Patrik Jakobsson + +- Update opencl_clang to fd68f64b33e67d58f6c36b9e25c31c1178a1962a +- Update spirv-llvm-translator to 4ef524240833abfeee1c5b9fff6b1bd53f4806b3 +- Don't compile with -Wno-dev. It breaks builds on Leap 15.4. + +------------------------------------------------------------------- +Mon Mar 27 13:34:07 UTC 2023 - Patrik Jakobsson + +- Update to version 1.0.13230.7 + * Compile against prebuilt spirv-tools and spirv-headers + * 0001-Preinstalled-SPIRV-Tools-CMakeFile-target-fix.patch fixes cmake + build issue with prebuild spirv-tools + +------------------------------------------------------------------- Old: ---- igc-1.0.8744.tar.gz New: ---- 0001-Preinstalled-SPIRV-Tools-CMakeFile-target-fix.patch 0001-Use-patch-instead-of-git-to-apply-opencl-clang-patch.patch igc-1.0.13230.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intel-graphics-compiler.spec ++++++ --- /var/tmp/diff_new_pack.CNPzar/_old 2023-04-01 19:30:43.796871179 +0200 +++ /var/tmp/diff_new_pack.CNPzar/_new 2023-04-01 19:30:43.804871221 +0200 @@ -17,11 +17,11 @@ %global llvm_commit llvmorg-11.1.0 -%global opencl_clang_commit fd68f64b33e67d58f6c36b9e25c31c1178a1962a -%global spirv_llvm_translator_commit c67e6f26a7285aa753598ef792593ac4a545adf9 -%global vc_intrinsics_commit e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872 +%global opencl_clang_commit 363a5262d8c7cff3fb28f3bdb5d85c8d7e91c1bb +%global spirv_llvm_translator_commit 4ef524240833abfeee1c5b9fff6b1bd53f4806b3 +%global vc_intrinsics_commit v0.11.0 Name: intel-graphics-compiler -Version: 1.0.8744 +Version: 1.0.13230.7 Release: 1%{?dist} Summary: Intel Graphics Compiler for OpenCL License: MIT @@ -34,6 +34,8 @@ Source4: https://github.com/intel/vc-intrinsics/archive/%{vc_intrinsics_commit}/vc-intrinsics.zip Patch0: 0001-llvm-needs-to-include-cstdio-for-gcc13.patch Patch1: 0001-libspriv-needs-to-include-cstdint-for-gcc13.patch +Patch2: 0001-Preinstalled-SPIRV-Tools-CMakeFile-target-fix.patch +Patch3: 0001-Use-patch-instead-of-git-to-apply-opencl-clang-patch.patch BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -41,8 +43,11 @@ BuildRequires: git BuildRequires: make BuildRequires: memory-constraints +BuildRequires: patch BuildRequires: pkgconfig BuildRequires: python3 +BuildRequires: spirv-headers +BuildRequires: spirv-tools-devel BuildRequires: unzip ExclusiveArch: x86_64 @@ -108,7 +113,6 @@ %prep mkdir llvm-project tar -xzf %{_sourcedir}/llvm-project.tar.gz -C llvm-project --strip-components=1 -mv llvm-project/clang llvm-project/llvm/tools/ pushd llvm-project %patch0 -p1 popd @@ -119,6 +123,9 @@ pushd llvm-project/llvm/projects mkdir opencl-clang llvm-spirv tar -xzf %{_sourcedir}/intel-opencl-clang.tar.gz -C opencl-clang --strip-components=1 +pushd opencl-clang +%patch3 -p1 +popd tar -xzf %{_sourcedir}/spirv-llvm-translator.tar.gz -C llvm-spirv --strip-components=1 popd @@ -126,6 +133,7 @@ tar -xzf %{_sourcedir}/igc-%{version}.tar.gz -C igc --strip-components=1 pushd igc %patch1 -p1 +%patch2 -p1 popd %build @@ -135,12 +143,14 @@ pushd build # FIXME: you should use %%cmake macros -export CXXFLAGS="-Wno-nonnull -Wno-dev -fPIE" +export CXXFLAGS="-Wno-nonnull -fPIE" export LDFLAGS="-pie" cmake ../igc \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DINSTALL_SPIRVDLL=0 + -DINSTALL_SPIRVDLL=0 \ + -DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds \ + -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS=ON %make_build popd ++++++ 0001-Preinstalled-SPIRV-Tools-CMakeFile-target-fix.patch ++++++ From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001 From: Jakub Czarnecki Date: Thu, 26 Jan 2023 11:35:03 +0000 Subject: [PATCH] Preinstalled SPIRV-Tools CMakeFile - target fix Added checking if SPIRV-Tools isn't already set as target before adding it as a custom target to avoid errors. --- external/SPIRV-Tools/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt index 9afa5746c..3b768c1b7 100644 --- a/external/SPIRV-Tools/CMakeLists.txt +++ b/external/SPIRV-Tools/CMakeLists.txt @@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME) set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}") set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}") - add_custom_target(SPIRV-Tools) + if(NOT TARGET SPIRV-Tools) + add_custom_target(SPIRV-Tools) + endif() set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}") set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools) -- 2.40.0 ++++++ 0001-Use-patch-instead-of-git-to-apply-opencl-clang-patch.patch ++++++ From f2e998091a0822dfb19e1756273f5d3c81ff8d4a Mon Sep 17 00:00:00 2001 From: Patrik Jakobsson Date: Tue, 28 Mar 2023 10:34:25 +0200 Subject: [PATCH] Use patch instead of git to apply opencl-clang patches Signed-off-by: Patrik Jakobsson --- cmake/modules/CMakeFunctions.cmake | 74 ++++++------------------------ 1 file changed, 14 insertions(+), 60 deletions(-) diff --git a/cmake/modules/CMakeFunctions.cmake b/cmake/modules/CMakeFunctions.cmake index 5a49ac0..0f40f80 100644 --- a/cmake/modules/CMakeFunctions.cmake +++ b/cmake/modules/CMakeFunctions.cmake @@ -101,69 +101,23 @@ function(apply_patches repo_dir patches_dirs base_revision target_branch ret) endif() message(STATUS "[OPENCL-CLANG] Patching repository ${repo_dir}") - # Check if the target branch already exists - execute_process( - COMMAND ${GIT_EXECUTABLE} rev-parse --verify --no-revs -q ${target_branch} - WORKING_DIRECTORY ${repo_dir} - RESULT_VARIABLE patches_needed - ERROR_QUIET - OUTPUT_QUIET - ) - if(patches_needed EQUAL 128) # not a git repo - set(ret_not_git_repo 1) - message(STATUS "[OPENCL-CLANG] Is not a git repo") - elseif(patches_needed) # The target branch doesn't exist - list(SORT patches) - is_valid_revision(${repo_dir} ${base_revision} exists_base_rev) + list(SORT patches) - if(NOT ${exists_base_rev}) - execute_process( # take SHA1 from HEAD - COMMAND ${GIT_EXECUTABLE} rev-parse HEAD - WORKING_DIRECTORY ${repo_dir} - OUTPUT_VARIABLE repo_head - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET - ) - message(STATUS "[OPENCL-CLANG] ref ${base_revision} not exists in repository, using current HEAD:${repo_head}") - set(base_revision ${repo_head}) - endif() - execute_process( # Create the target branch - COMMAND ${GIT_EXECUTABLE} checkout -b ${target_branch} ${base_revision} + foreach(patch ${patches}) + execute_process( # Apply the patch + COMMAND patch -p1 -i ${patch} WORKING_DIRECTORY ${repo_dir} - RESULT_VARIABLE ret_check_out - ERROR_STRIP_TRAILING_WHITESPACE - ERROR_VARIABLE checkout_log - OUTPUT_QUIET - ) - message(STATUS "[OPENCL-CLANG] ${checkout_log} which starts from ref : ${base_revision}") - foreach(patch ${patches}) - is_backport_patch_present(${patch} ${repo_dir} patch_in_branch) - if(${patch_in_branch}) - message(STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching") - else() - execute_process( # Apply the patch - COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace ${patch} - WORKING_DIRECTORY ${repo_dir} - OUTPUT_VARIABLE patching_log - ERROR_QUIET - RESULT_VARIABLE ret_apply_patch - ) - message(STATUS "[OPENCL-CLANG] Not present - ${patching_log}") - if (ret_apply_patch) - break() - endif() - endif() - endforeach(patch) - else() # The target branch already exists - execute_process( # Check it out - COMMAND ${GIT_EXECUTABLE} checkout ${target_branch} - WORKING_DIRECTORY ${repo_dir} - RESULT_VARIABLE ret_check_out - ERROR_QUIET - OUTPUT_QUIET + OUTPUT_VARIABLE patching_log + RESULT_VARIABLE ret_apply_patch ) - endif() - if (NOT (ret_not_git_repo OR ret_check_out OR ret_apply_patch)) + if (ret_apply_patch) + message(STATUS "[OPENCL-CLANG] Failed to apply patch ${patch}") + break() + endif() + message(STATUS "[OPENCL-CLANG] Applied patch ${patch}") + endforeach(patch) + + if (NOT (ret_apply_patch)) set(${ret} True PARENT_SCOPE) else() message(FATAL_ERROR "[OPENCL-CLANG] Failed to apply patch!") -- 2.40.0 ++++++ igc-1.0.8744.tar.gz -> igc-1.0.13230.7.tar.gz ++++++ /work/SRC/openSUSE:Factory/intel-graphics-compiler/igc-1.0.8744.tar.gz /work/SRC/openSUSE:Factory/.intel-graphics-compiler.new.9019/igc-1.0.13230.7.tar.gz differ: char 13, line 1 ++++++ intel-opencl-clang.tar.gz ++++++ ++++ 3533 lines of diff (skipped) ++++++ spirv-llvm-translator.tar.gz ++++++ ++++ 14229 lines of diff (skipped) ++++++ vc-intrinsics.zip ++++++ Binary files /var/tmp/diff_new_pack.CNPzar/_old and /var/tmp/diff_new_pack.CNPzar/_new differ