Signed-off-by: Dongwon Kim <[email protected]> --- .../igc/files/0001-llvm-link-external.patch | 29 +++++++++++++++++++ .../0004-find-external-llvm-tblgen.patch | 13 ++++----- ...b => intel-graphics-compiler_1.0.10395.bb} | 11 +++++-- 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch rename dynamic-layers/clang-layer/recipes-opencl/igc/{intel-graphics-compiler_1.0.8744.bb => intel-graphics-compiler_1.0.10395.bb} (79%)
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch new file mode 100644 index 00000000..e0800f6f --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch @@ -0,0 +1,29 @@ +From 0088e843be66ed5f11388a9ef57f364a2a236584 Mon Sep 17 00:00:00 2001 +From: Dongwon Kim <[email protected]> +Date: Tue, 1 Mar 2022 17:05:01 -0800 +Subject: [PATCH] llvm-link external + +Signed-off-by: Dongwon Kim <[email protected]> +--- + IGC/cmake/igc_llvm.cmake | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake +index 80c83d4e0..85f7dda3d 100644 +--- a/IGC/cmake/igc_llvm.cmake ++++ b/IGC/cmake/igc_llvm.cmake +@@ -29,7 +29,10 @@ if(LLVM_TABLEGEN_EXE-NOTFOUND) + message(FATAL_ERROR "[VC] llvm-tblgen is not found") + endif() + +-set(LLVM_LINK_EXE "llvm-link" CACHE STRING "") ++find_program(LLVM_LINK_EXE "llvm-link") ++if(LLVM_LINK_EXE-NOTFOUND) ++ message(FATAL_ERROR "[VC] llvm-link is not found") ++endif() + + include(AddLLVM) + include(TableGen) +-- +2.20.1 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch index 79f79976..98278459 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch @@ -1,16 +1,15 @@ -From c9fe51ec555fadd098cfc98804ce91b1cf3029d4 Mon Sep 17 00:00:00 2001 +From ac19bd37abccb697cc5fc9647be48de14185e9a2 Mon Sep 17 00:00:00 2001 From: Dongwon Kim <[email protected]> -Date: Thu, 19 Aug 2021 08:28:03 -0700 -Subject: [PATCH 4/5] find external llvm-tblgen +Date: Tue, 1 Mar 2022 15:23:36 -0800 +Subject: [PATCH] find external llvm-tblgen new -Upstream-Status: Pending Signed-off-by: Dongwon Kim <[email protected]> --- IGC/cmake/igc_llvm.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake -index 541793f21..bc82922b1 100644 +index 038a9ce3e..80c83d4e0 100644 --- a/IGC/cmake/igc_llvm.cmake +++ b/IGC/cmake/igc_llvm.cmake @@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH @@ -23,8 +22,8 @@ index 541793f21..bc82922b1 100644 + message(FATAL_ERROR "[VC] llvm-tblgen is not found") +endif() - include(AddLLVM) - include(TableGen) + set(LLVM_LINK_EXE "llvm-link" CACHE STRING "") + -- 2.20.1 diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.8744.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb similarity index 79% rename from dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.8744.bb rename to dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb index 8a09934d..c3d9f10b 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.8744.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb @@ -6,18 +6,23 @@ hardware architecture." LICENSE = "MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=23;md5=4a985f2545dd5a846e205b1e60a51cd9 \ - file://NOTICES.txt;md5=db621145dfb627436bc90ad600386801" + file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \ git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=master \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ file://0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch \ file://0003-Improve-Reproducibility-for-src-package.patch \ file://0004-find-external-llvm-tblgen.patch \ file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ + file://0001-llvm-link-external.patch \ " -SRCREV_igc = "3ba8dde8c414a0e47df58b1bba12a64f8ba2089e" -SRCREV_vc = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872" +SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7" +SRCREV_vc = "5066d947985dd0c5107765daec5f24f735f3259a" +SRCREV_spirv-tools = "eeb973f5020a5f0e92ad6da879bc4df9f5985a1c" +SRCREV_spirv-headers = "ae217c17809fadb232ec94b29304b4afcd417bb4" # Used to replace with relative path in reproducibility patch export B -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7452): https://lists.yoctoproject.org/g/meta-intel/message/7452 Mute This Topic: https://lists.yoctoproject.org/mt/89531997/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
