summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/clang-layer
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2022-12-07 21:57:58 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2022-12-07 21:58:27 +0800
commitd72944f14c9d41b9c64419dcbc0ad7332d208f86 (patch)
treee8db9e5cd145922ad962ddff77449f84aa9d13ef /dynamic-layers/clang-layer
parentde59d48ad2ce88ebe331a8355e742fce7c3b428c (diff)
downloadmeta-intel-d72944f14c9d41b9c64419dcbc0ad7332d208f86.tar.gz
intel-graphics-compiler: refresh patches
Fixes fuzz warnings: | WARNING: intel-graphics-compiler-1.0.12812.9-r0 do_patch: Fuzz detected: | | Applying patch c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch | patching file IGC/BiFModule/CMakeLists.txt | patching file IGC/CMakeLists.txt | patching file IGC/Compiler/CodeGenContext.cpp | Hunk #1 succeeded at 232 (offset 1 line). | patching file IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | patching file IGC/VectorCompiler/lib/BiF/CMakeLists.txt | Hunk #2 succeeded at 110 with fuzz 2. | patching file IGC/cmake/igc_llvm.cmake Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer')
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch9
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch21
2 files changed, 14 insertions, 16 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
index 24367f19..8fb5ce45 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -1,4 +1,4 @@
1From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001 1From cfc8d6775cc213bdc0c938c20167d74f6aeb310a Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 19 May 2022 22:50:09 +0800 3Date: Thu, 19 May 2022 22:50:09 +0800
4Subject: [PATCH] fix tblgen 4Subject: [PATCH] fix tblgen
@@ -8,10 +8,10 @@ Subject: [PATCH] fix tblgen
8 1 file changed, 1 insertion(+), 1 deletion(-) 8 1 file changed, 1 insertion(+), 1 deletion(-)
9 9
10diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake 10diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
11index 89c03fc49..85be9ae08 100644 11index 96e3b0d11..b48c91ff4 100644
12--- a/IGC/cmake/igc_llvm.cmake 12--- a/IGC/cmake/igc_llvm.cmake
13+++ b/IGC/cmake/igc_llvm.cmake 13+++ b/IGC/cmake/igc_llvm.cmake
14@@ -48,7 +48,7 @@ else() 14@@ -52,7 +52,7 @@ else()
15 set(LLVM_OPT_EXE "opt" CACHE STRING "") 15 set(LLVM_OPT_EXE "opt" CACHE STRING "")
16 16
17 set(LLVM_TABLEGEN_EXE "llvm-tblgen") 17 set(LLVM_TABLEGEN_EXE "llvm-tblgen")
@@ -20,6 +20,3 @@ index 89c03fc49..85be9ae08 100644
20 if(DEFINED LLVM_TABLEGEN) 20 if(DEFINED LLVM_TABLEGEN)
21 set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN}) 21 set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
22 else() 22 else()
23--
242.35.3
25
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch
index 750a0494..5f9527b3 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch
@@ -1,7 +1,7 @@
1From c707d1e2244aec988bdd5d2a7473ef3a32a5bac7 Mon Sep 17 00:00:00 2001 1From cce0d22ebba79075792e6f30c597d8d29d946e8c Mon Sep 17 00:00:00 2001
2From: Artem Gindinson <artem.gindinson@intel.com> 2From: Artem Gindinson <artem.gindinson@intel.com>
3Date: Thu, 17 Nov 2022 18:51:03 +0000 3Date: Thu, 17 Nov 2022 18:51:03 +0000
4Subject: [PATCH] Disable opaque pointers in IGC stack for LLVM 15+ 4Subject: [PATCH] Disable opaque pointers in IGC stack for LLVM 15+
5 5
6While IGC is a long way from supporting opaque pointers, LLVM 15 has them 6While IGC is a long way from supporting opaque pointers, LLVM 15 has them
7enabled by default. Enforce typed pointers explicitly within all LLVM 7enabled by default. Enforce typed pointers explicitly within all LLVM
@@ -9,6 +9,7 @@ pipelines employed by our stack (unless CMake instructs otherwise).
9 9
10Upstream-Status: Backport 10Upstream-Status: Backport
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12
12--- 13---
13 IGC/BiFModule/CMakeLists.txt | 4 ++-- 14 IGC/BiFModule/CMakeLists.txt | 4 ++--
14 IGC/CMakeLists.txt | 4 ++++ 15 IGC/CMakeLists.txt | 4 ++++
@@ -19,7 +20,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
19 6 files changed, 39 insertions(+), 4 deletions(-) 20 6 files changed, 39 insertions(+), 4 deletions(-)
20 21
21diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt 22diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt
22index 60fc5cf8d7d..e87288ca6da 100644 23index 60fc5cf8d..e87288ca6 100644
23--- a/IGC/BiFModule/CMakeLists.txt 24--- a/IGC/BiFModule/CMakeLists.txt
24+++ b/IGC/BiFModule/CMakeLists.txt 25+++ b/IGC/BiFModule/CMakeLists.txt
25@@ -251,7 +251,7 @@ function(igc_bif_build_bc) 26@@ -251,7 +251,7 @@ function(igc_bif_build_bc)
@@ -41,7 +42,7 @@ index 60fc5cf8d7d..e87288ca6da 100644
41 COMMENT "BiF: \"${_outBcFileName}\": Optmizing output .bc." 42 COMMENT "BiF: \"${_outBcFileName}\": Optmizing output .bc."
42 ) 43 )
43diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt 44diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
44index 930a552121c..66ea2a3b5ca 100644 45index 930a55212..66ea2a3b5 100644
45--- a/IGC/CMakeLists.txt 46--- a/IGC/CMakeLists.txt
46+++ b/IGC/CMakeLists.txt 47+++ b/IGC/CMakeLists.txt
47@@ -275,6 +275,10 @@ endif() 48@@ -275,6 +275,10 @@ endif()
@@ -56,10 +57,10 @@ index 930a552121c..66ea2a3b5ca 100644
56 57
57 set(IGC_OPTION__BIF_SRC_OCL_DIR "${IGC_SOURCE_DIR}/BiFModule" 58 set(IGC_OPTION__BIF_SRC_OCL_DIR "${IGC_SOURCE_DIR}/BiFModule"
58diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp 59diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp
59index 4abd6e4bf4a..0058571cd27 100644 60index fc04b5d84..fe1773b85 100644
60--- a/IGC/Compiler/CodeGenContext.cpp 61--- a/IGC/Compiler/CodeGenContext.cpp
61+++ b/IGC/Compiler/CodeGenContext.cpp 62+++ b/IGC/Compiler/CodeGenContext.cpp
62@@ -231,6 +231,9 @@ namespace IGC 63@@ -232,6 +232,9 @@ namespace IGC
63 { 64 {
64 CreateResourceDimensionTypes(*this); 65 CreateResourceDimensionTypes(*this);
65 } 66 }
@@ -70,7 +71,7 @@ index 4abd6e4bf4a..0058571cd27 100644
70 71
71 void LLVMContextWrapper::AddRef() 72 void LLVMContextWrapper::AddRef()
72diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp 73diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
73index ef0e5cacd96..c26bfcea74c 100644 74index 4a6fb40dd..f9b308503 100644
74--- a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp 75--- a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
75+++ b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp 76+++ b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
76@@ -1494,6 +1494,10 @@ namespace TC 77@@ -1494,6 +1494,10 @@ namespace TC
@@ -85,7 +86,7 @@ index ef0e5cacd96..c26bfcea74c 100644
85 86
86 std::string extensions; 87 std::string extensions;
87diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 88diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
88index 3181a13403c..6235fc1d21e 100644 89index b2e56e091..77f397f79 100644
89--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 90--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
90+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 91+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
91@@ -90,7 +90,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) 92@@ -90,7 +90,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
@@ -104,10 +105,10 @@ index 3181a13403c..6235fc1d21e 100644
104- COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} 105- COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
105+ COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} 106+ COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
106 COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}" 107 COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
107 DEPENDS opt ${BIF_CMCL_BC_PATH}) 108 DEPENDS ${BIF_CMCL_BC_PATH})
108 set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) 109 set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
109diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake 110diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
110index c0f74dcea14..96e3b0d1117 100644 111index c0f74dcea..96e3b0d11 100644
111--- a/IGC/cmake/igc_llvm.cmake 112--- a/IGC/cmake/igc_llvm.cmake
112+++ b/IGC/cmake/igc_llvm.cmake 113+++ b/IGC/cmake/igc_llvm.cmake
113@@ -69,6 +69,30 @@ list(TRANSFORM LLVM_INCLUDE_DIRS PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLA 114@@ -69,6 +69,30 @@ list(TRANSFORM LLVM_INCLUDE_DIRS PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLA