summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2022-12-07 15:12:33 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2022-12-07 15:12:33 +0800
commitde59d48ad2ce88ebe331a8355e742fce7c3b428c (patch)
tree75c8369a3bc9eaca6a8f1ac58695b973525596ef
parentd01bcf8747bb311111b85d6d0bb872308a6e6a02 (diff)
downloadmeta-intel-de59d48ad2ce88ebe331a8355e742fce7c3b428c.tar.gz
intel-graphics-compiler: fix build issues with LLVM12
Fixes: /git/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp:412:31: error: ‘experimental_vector_reduce_or’ is not a member of ‘llvm::Intrinsic’; did you mean ‘experimental_vector_insert’? [2022-12-06T21:01:52.813Z] | 412 | Intrinsic::experimental_vector_reduce_or; [2022-12-06T21:01:52.813Z] | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [2022-12-06T21:01:52.813Z] | | experimental_vector_insert Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-build-with-llvm12.patch29
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-build-with-llvm12.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-build-with-llvm12.patch
new file mode 100644
index 00000000..fb29c940
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-build-with-llvm12.patch
@@ -0,0 +1,29 @@
1The condition should be checking for <= 11 since the change is available
2in LLVM12:
3https://github.com/llvm/llvm-project/commit/322d0afd875df66b36e4810a2b95c20a8f22ab9b
4
5Upstream-Status: Submitted
6Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
7
8diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
9index 363d622c2..bbb04be30 100644
10--- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
11+++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
12@@ -395,7 +395,7 @@ public:
13 return GenXIntrinsic::getGenXIntrinsicID(V) ==
14 GenXIntrinsic::genx_all ||
15 CI->getIntrinsicID() ==
16-#if LLVM_VERSION_MAJOR <= 12
17+#if LLVM_VERSION_MAJOR <= 11
18 Intrinsic::experimental_vector_reduce_and;
19 #else
20 Intrinsic::vector_reduce_and;
21@@ -408,7 +408,7 @@ public:
22 if (const CallInst *CI = dyn_cast<CallInst>(V))
23 return GenXIntrinsic::getGenXIntrinsicID(V) ==
24 GenXIntrinsic::genx_any || CI->getIntrinsicID() ==
25-#if LLVM_VERSION_MAJOR <= 12
26+#if LLVM_VERSION_MAJOR <= 11
27 Intrinsic::experimental_vector_reduce_or;
28 #else
29 Intrinsic::vector_reduce_or;
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb
index 4cfe7133..e5a3f858 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam
17 file://c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch \ 17 file://c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch \
18 file://d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch \ 18 file://d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch \
19 file://e09e752949e7af0231884d1b11ea907e3e8b1611.patch \ 19 file://e09e752949e7af0231884d1b11ea907e3e8b1611.patch \
20 file://fix-build-with-llvm12.patch \
20 " 21 "
21 22
22SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" 23SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"