diff options
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch | 21 |
1 files changed, 11 insertions, 10 deletions
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 @@ | |||
1 | From c707d1e2244aec988bdd5d2a7473ef3a32a5bac7 Mon Sep 17 00:00:00 2001 | 1 | From cce0d22ebba79075792e6f30c597d8d29d946e8c Mon Sep 17 00:00:00 2001 |
2 | From: Artem Gindinson <artem.gindinson@intel.com> | 2 | From: Artem Gindinson <artem.gindinson@intel.com> |
3 | Date: Thu, 17 Nov 2022 18:51:03 +0000 | 3 | Date: Thu, 17 Nov 2022 18:51:03 +0000 |
4 | Subject: [PATCH] Disable opaque pointers in IGC stack for LLVM 15+ | 4 | Subject: [PATCH] Disable opaque pointers in IGC stack for LLVM 15+ |
5 | 5 | ||
6 | While IGC is a long way from supporting opaque pointers, LLVM 15 has them | 6 | While IGC is a long way from supporting opaque pointers, LLVM 15 has them |
7 | enabled by default. Enforce typed pointers explicitly within all LLVM | 7 | enabled by default. Enforce typed pointers explicitly within all LLVM |
@@ -9,6 +9,7 @@ pipelines employed by our stack (unless CMake instructs otherwise). | |||
9 | 9 | ||
10 | Upstream-Status: Backport | 10 | Upstream-Status: Backport |
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 11 | Signed-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 | ||
21 | diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt | 22 | diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt |
22 | index 60fc5cf8d7d..e87288ca6da 100644 | 23 | index 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 | ) |
43 | diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt | 44 | diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt |
44 | index 930a552121c..66ea2a3b5ca 100644 | 45 | index 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" |
58 | diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp | 59 | diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp |
59 | index 4abd6e4bf4a..0058571cd27 100644 | 60 | index 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() |
72 | diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | 73 | diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp |
73 | index ef0e5cacd96..c26bfcea74c 100644 | 74 | index 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; |
87 | diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 88 | diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt |
88 | index 3181a13403c..6235fc1d21e 100644 | 89 | index 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) |
109 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake | 110 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake |
110 | index c0f74dcea14..96e3b0d1117 100644 | 111 | index 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 |