diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2019-11-14 13:54:29 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-12-27 10:01:59 +0800 |
commit | 6dd594fba5e1320183006f01702f5af939196337 (patch) | |
tree | 1e3339a82c621aa2e55e07f95a835b0983f5bd38 /dynamic-layers | |
parent | fafa2218c4a2cc5765b0e23eaebdacd56180d98a (diff) | |
download | meta-intel-6dd594fba5e1320183006f01702f5af939196337.tar.gz |
intel-graphics-compiler: upgrade 1.0.11 -> 1.0.2714.1
Dropped patch which is already merged in this release.
More details can be found at:
https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.2714.1
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Fix-for-buildbreak-when-using-clang-9-compiler.patch | 405 | ||||
-rw-r--r-- | dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.2714.1.bb (renamed from dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11.bb) | 5 |
2 files changed, 2 insertions, 408 deletions
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Fix-for-buildbreak-when-using-clang-9-compiler.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Fix-for-buildbreak-when-using-clang-9-compiler.patch deleted file mode 100644 index 4af8c17e..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Fix-for-buildbreak-when-using-clang-9-compiler.patch +++ /dev/null | |||
@@ -1,405 +0,0 @@ | |||
1 | From 598038626dd2c10b96308347718f26cfa3dc509c Mon Sep 17 00:00:00 2001 | ||
2 | From: "Wesierski, Lukasz" <lukasz.wesierski@intel.com> | ||
3 | Date: Mon, 9 Sep 2019 09:11:20 -0700 | ||
4 | Subject: [PATCH 4/4] Fix for buildbreak when using clang-9 compiler | ||
5 | |||
6 | Fixes #106 | ||
7 | Fxies #111 | ||
8 | |||
9 | Change-Id: I291bf03c31b1786a00b8bc2c6d23c5adb8b72e73 | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/intel/intel-graphics-compiler/commit/a332238b46e9fa9e06265d18eb877d095015e6fb] | ||
12 | |||
13 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
14 | --- | ||
15 | IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVEntry.h | 4 + | ||
16 | .../SPIRV/libSPIRV/SPIRVInstruction.h | 18 +-- | ||
17 | IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVModule.cpp | 136 +++++++++--------- | ||
18 | IGC/AdaptorOCL/cif/cif/export/registry.h | 3 +- | ||
19 | IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | 4 +- | ||
20 | visa/CISA.l | 2 +- | ||
21 | visa/CMakeLists.txt | 6 +- | ||
22 | 7 files changed, 89 insertions(+), 84 deletions(-) | ||
23 | |||
24 | diff --git a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVEntry.h b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVEntry.h | ||
25 | index 7a2ba855..307ba3f3 100644 | ||
26 | --- a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVEntry.h | ||
27 | +++ b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVEntry.h | ||
28 | @@ -129,8 +129,12 @@ class SPIRVExtInst; | ||
29 | void decode(std::istream &I) { getDecoder(I) >> x >> y;} | ||
30 | #define _SPIRV_DEF_DEC3(x,y,z) \ | ||
31 | void decode(std::istream &I) { getDecoder(I) >> x >> y >> z;} | ||
32 | +#define _SPIRV_DEF_DEC3_OVERRIDE(x,y,z) \ | ||
33 | + void decode(std::istream &I) override { getDecoder(I) >> x >> y >> z;} | ||
34 | #define _SPIRV_DEF_DEC4(x,y,z,u) \ | ||
35 | void decode(std::istream &I) { getDecoder(I) >> x >> y >> z >> u;} | ||
36 | +#define _SPIRV_DEF_DEC4_OVERRIDE(x,y,z,u) \ | ||
37 | + void decode(std::istream &I) override { getDecoder(I) >> x >> y >> z >> u;} | ||
38 | #define _SPIRV_DEF_DEC5(x,y,z,u,v) \ | ||
39 | void decode(std::istream &I) { getDecoder(I) >> x >> y >> z >> u >> v;} | ||
40 | #define _SPIRV_DEF_DEC6(x,y,z,u,v,w) \ | ||
41 | diff --git a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h | ||
42 | index 9f4e9d1f..bb85fd04 100644 | ||
43 | --- a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h | ||
44 | +++ b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h | ||
45 | @@ -727,10 +727,10 @@ public: | ||
46 | return getValue(ConditionId); | ||
47 | } | ||
48 | SPIRVLabel *getTrueLabel() const { | ||
49 | - return get<SPIRVLabel>(TrueLabelId); | ||
50 | + return SPIRVEntry::get<SPIRVLabel>(TrueLabelId); | ||
51 | } | ||
52 | SPIRVLabel *getFalseLabel() const { | ||
53 | - return get<SPIRVLabel>(FalseLabelId); | ||
54 | + return SPIRVEntry::get<SPIRVLabel>(FalseLabelId); | ||
55 | } | ||
56 | protected: | ||
57 | void setWordCount(SPIRVWord TheWordCount) { | ||
58 | @@ -940,7 +940,7 @@ public: | ||
59 | SPIRVEntry::setWordCount(TheWordCount); | ||
60 | LoopControlParameters.resize(TheWordCount - FixedWordCount); | ||
61 | } | ||
62 | - _SPIRV_DEF_DEC4(MergeBlock, ContinueTarget, LoopControl, | ||
63 | + _SPIRV_DEF_DEC4_OVERRIDE(MergeBlock, ContinueTarget, LoopControl, | ||
64 | LoopControlParameters) | ||
65 | |||
66 | protected: | ||
67 | @@ -1120,7 +1120,7 @@ public: | ||
68 | |||
69 | SPIRVFunctionCallGeneric(SPIRVModule *BM, SPIRVWord ResId, SPIRVType *TheType, | ||
70 | const std::vector<SPIRVWord> &TheArgs) | ||
71 | - : SPIRVInstruction(TheArgs.size() + FixedWordCount, OC, TheType, ResId, | ||
72 | + : SPIRVInstruction(TheArgs.size() + FixedWordCount, OC, TheType, ResId, NULL, | ||
73 | BM), | ||
74 | Args(TheArgs) {} | ||
75 | SPIRVFunctionCallGeneric():SPIRVInstruction(OC) {} | ||
76 | @@ -1152,7 +1152,7 @@ class SPIRVFunctionCall: | ||
77 | public: | ||
78 | SPIRVFunctionCall():FunctionId(SPIRVID_INVALID) {} | ||
79 | SPIRVFunction *getFunction()const { | ||
80 | - return get<SPIRVFunction>(FunctionId); | ||
81 | + return SPIRVEntry::get<SPIRVFunction>(FunctionId); | ||
82 | } | ||
83 | _SPIRV_DEF_DEC4(Type, Id, FunctionId, Args) | ||
84 | void validate()const; | ||
85 | @@ -1169,8 +1169,8 @@ public: | ||
86 | const std::vector<SPIRVWord>& TheArgs, | ||
87 | SPIRVBasicBlock* BB); | ||
88 | SPIRVFunctionPointerCallINTEL() : CalledValueId(SPIRVID_INVALID) {} | ||
89 | - SPIRVValue* getCalledValue() const { return get<SPIRVValue>(CalledValueId); } | ||
90 | - _SPIRV_DEF_DEC4(Type, Id, CalledValueId, Args) | ||
91 | + SPIRVValue* getCalledValue() const { return SPIRVEntry::get<SPIRVValue>(CalledValueId); } | ||
92 | + _SPIRV_DEF_DEC4_OVERRIDE(Type, Id, CalledValueId, Args) | ||
93 | void validate() const override; | ||
94 | bool isOperandLiteral(unsigned Index) const { return false; } | ||
95 | CapVec getRequiredCapability() const override { | ||
96 | @@ -1188,8 +1188,8 @@ public: | ||
97 | SPIRVFunctionPointerINTEL(SPIRVId TheId, SPIRVType* TheType, | ||
98 | SPIRVFunction* TheFunction, SPIRVBasicBlock* BB); | ||
99 | SPIRVFunctionPointerINTEL() : SPIRVInstruction(OC), TheFunction(SPIRVID_INVALID) {} | ||
100 | - SPIRVFunction* getFunction() const { return get<SPIRVFunction>(TheFunction); } | ||
101 | - _SPIRV_DEF_DEC3(Type, Id, TheFunction) | ||
102 | + SPIRVFunction* getFunction() const { return SPIRVEntry::get<SPIRVFunction>(TheFunction); } | ||
103 | + _SPIRV_DEF_DEC3_OVERRIDE(Type, Id, TheFunction) | ||
104 | void validate() const override; | ||
105 | bool isOperandLiteral(unsigned Index) const { return false; } | ||
106 | CapVec getRequiredCapability() const override { | ||
107 | diff --git a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVModule.cpp b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVModule.cpp | ||
108 | index 353341b5..74ab6e93 100644 | ||
109 | --- a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVModule.cpp | ||
110 | +++ b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVModule.cpp | ||
111 | @@ -94,126 +94,126 @@ public: | ||
112 | virtual ~SPIRVModuleImpl(); | ||
113 | |||
114 | // Object query functions | ||
115 | - bool exist(SPIRVId) const; | ||
116 | - bool exist(SPIRVId, SPIRVEntry **) const; | ||
117 | + bool exist(SPIRVId) const override; | ||
118 | + bool exist(SPIRVId, SPIRVEntry **) const override; | ||
119 | SPIRVId getId(SPIRVId Id = SPIRVID_INVALID, unsigned Increment = 1); | ||
120 | - virtual SPIRVEntry *getEntry(SPIRVId Id) const; | ||
121 | + virtual SPIRVEntry *getEntry(SPIRVId Id) const override; | ||
122 | virtual void addUnknownStructField( | ||
123 | - SPIRVTypeStruct*, unsigned idx, SPIRVId id); | ||
124 | - virtual void resolveUnknownStructFields(); | ||
125 | - bool hasDebugInfo() const | ||
126 | + SPIRVTypeStruct*, unsigned idx, SPIRVId id) override; | ||
127 | + virtual void resolveUnknownStructFields() override; | ||
128 | + bool hasDebugInfo() const override | ||
129 | { | ||
130 | return getCompilationUnit() != nullptr; | ||
131 | } | ||
132 | |||
133 | // Error handling functions | ||
134 | - SPIRVErrorLog &getErrorLog() { return ErrLog;} | ||
135 | - SPIRVErrorCode getError(std::string &ErrMsg) { return ErrLog.getError(ErrMsg);} | ||
136 | + SPIRVErrorLog &getErrorLog() override { return ErrLog;} | ||
137 | + SPIRVErrorCode getError(std::string &ErrMsg) override { return ErrLog.getError(ErrMsg);} | ||
138 | |||
139 | // Module query functions | ||
140 | - SPIRVAddressingModelKind getAddressingModel() { return AddrModel;} | ||
141 | - SPIRVExtInstSetKind getBuiltinSet(SPIRVId SetId) const; | ||
142 | - const SPIRVCapSet &getCapability() const { return CapSet;} | ||
143 | - const std::string &getCompileFlag() const { return CompileFlag;} | ||
144 | - std::string &getCompileFlag() { return CompileFlag;} | ||
145 | - void setCompileFlag(const std::string &options) { CompileFlag = options; } | ||
146 | - bool isSpecConstant(SPIRVWord spec_id) const { | ||
147 | + SPIRVAddressingModelKind getAddressingModel() override { return AddrModel;} | ||
148 | + SPIRVExtInstSetKind getBuiltinSet(SPIRVId SetId) const override; | ||
149 | + const SPIRVCapSet &getCapability() const override { return CapSet;} | ||
150 | + const std::string &getCompileFlag() const override { return CompileFlag;} | ||
151 | + std::string &getCompileFlag() override { return CompileFlag;} | ||
152 | + void setCompileFlag(const std::string &options) override { CompileFlag = options; } | ||
153 | + bool isSpecConstant(SPIRVWord spec_id) const override { | ||
154 | if(SCMap) | ||
155 | return SCMap->find(spec_id) != SCMap->end(); | ||
156 | else | ||
157 | return false; | ||
158 | } | ||
159 | - uint64_t getSpecConstant(SPIRVWord spec_id) { | ||
160 | + uint64_t getSpecConstant(SPIRVWord spec_id) override { | ||
161 | spirv_assert(isSpecConstant(spec_id) && "Specialization constant was not specialized!"); | ||
162 | return SCMap->at(spec_id); | ||
163 | } | ||
164 | - void setSpecConstantMap(SPIRVSpecConstantMap *specConstants) { SCMap = specConstants; } | ||
165 | - std::set<std::string> &getExtension() { return SPIRVExt;} | ||
166 | - SPIRVFunction *getFunction(unsigned I) const { return FuncVec[I];} | ||
167 | - SPIRVVariable *getVariable(unsigned I) const { return VariableVec[I];} | ||
168 | - virtual SPIRVValue *getValue(SPIRVId TheId) const; | ||
169 | - virtual std::vector<SPIRVValue *> getValues(const std::vector<SPIRVId>&)const; | ||
170 | - virtual std::vector<SPIRVId> getIds(const std::vector<SPIRVEntry *>&)const; | ||
171 | - virtual std::vector<SPIRVId> getIds(const std::vector<SPIRVValue *>&)const; | ||
172 | - virtual SPIRVType *getValueType(SPIRVId TheId)const; | ||
173 | + void setSpecConstantMap(SPIRVSpecConstantMap *specConstants) override { SCMap = specConstants; } | ||
174 | + std::set<std::string> &getExtension() override { return SPIRVExt;} | ||
175 | + SPIRVFunction *getFunction(unsigned I) const override { return FuncVec[I];} | ||
176 | + SPIRVVariable *getVariable(unsigned I) const override { return VariableVec[I];} | ||
177 | + virtual SPIRVValue *getValue(SPIRVId TheId) const override; | ||
178 | + virtual std::vector<SPIRVValue *> getValues(const std::vector<SPIRVId>&)const override; | ||
179 | + virtual std::vector<SPIRVId> getIds(const std::vector<SPIRVEntry *>&)const override; | ||
180 | + virtual std::vector<SPIRVId> getIds(const std::vector<SPIRVValue *>&)const override; | ||
181 | + virtual SPIRVType *getValueType(SPIRVId TheId)const override; | ||
182 | virtual std::vector<SPIRVType *> getValueTypes(const std::vector<SPIRVId>&) | ||
183 | - const; | ||
184 | - SPIRVMemoryModelKind getMemoryModel() { return MemoryModel;} | ||
185 | - virtual SPIRVConstant* getLiteralAsConstant(unsigned Literal); | ||
186 | - unsigned getNumEntryPoints(SPIRVExecutionModelKind EM) const { | ||
187 | + const override; | ||
188 | + SPIRVMemoryModelKind getMemoryModel() override { return MemoryModel;} | ||
189 | + virtual SPIRVConstant* getLiteralAsConstant(unsigned Literal) override; | ||
190 | + unsigned getNumEntryPoints(SPIRVExecutionModelKind EM) const override{ | ||
191 | auto Loc = EntryPointVec.find(EM); | ||
192 | if (Loc == EntryPointVec.end()) | ||
193 | return 0; | ||
194 | return Loc->second.size(); | ||
195 | } | ||
196 | - SPIRVFunction *getEntryPoint(SPIRVExecutionModelKind EM, unsigned I) const { | ||
197 | + SPIRVFunction *getEntryPoint(SPIRVExecutionModelKind EM, unsigned I) const override { | ||
198 | auto Loc = EntryPointVec.find(EM); | ||
199 | if (Loc == EntryPointVec.end()) | ||
200 | return nullptr; | ||
201 | spirv_assert(I < Loc->second.size()); | ||
202 | return get<SPIRVFunction>(Loc->second[I]); | ||
203 | } | ||
204 | - unsigned getNumFunctions() const { return FuncVec.size();} | ||
205 | - unsigned getNumVariables() const { return VariableVec.size();} | ||
206 | - SpvSourceLanguage getSourceLanguage(SPIRVWord * Ver = nullptr) const { | ||
207 | + unsigned getNumFunctions() const override { return FuncVec.size();} | ||
208 | + unsigned getNumVariables() const override { return VariableVec.size();} | ||
209 | + SpvSourceLanguage getSourceLanguage(SPIRVWord * Ver = nullptr) const override { | ||
210 | if (Ver) | ||
211 | *Ver = SrcLangVer; | ||
212 | return SrcLang; | ||
213 | } | ||
214 | - std::set<std::string> &getSourceExtension() { return SrcExtension;} | ||
215 | - bool isEntryPoint(SPIRVExecutionModelKind, SPIRVId EP) const; | ||
216 | + std::set<std::string> &getSourceExtension() override { return SrcExtension;} | ||
217 | + bool isEntryPoint(SPIRVExecutionModelKind, SPIRVId EP) const override; | ||
218 | const std::string &getModuleProcessed() const { return ModuleProcessed; } | ||
219 | - const std::vector<SPIRVString *> &getStringVec() const { return StringVec; } | ||
220 | + const std::vector<SPIRVString *> &getStringVec() const override { return StringVec; } | ||
221 | |||
222 | // Module changing functions | ||
223 | - bool importBuiltinSet(const std::string &, SPIRVId *); | ||
224 | - bool importBuiltinSetWithId(const std::string &, SPIRVId); | ||
225 | - void optimizeDecorates(); | ||
226 | - void setAddressingModel(SPIRVAddressingModelKind AM) { AddrModel = AM;} | ||
227 | - void setAlignment(SPIRVValue *, SPIRVWord); | ||
228 | - void setMemoryModel(SPIRVMemoryModelKind MM) { MemoryModel = MM;} | ||
229 | - void setName(SPIRVEntry *E, const std::string &Name); | ||
230 | - void setSourceLanguage(SpvSourceLanguage Lang, SPIRVWord Ver) { | ||
231 | + bool importBuiltinSet(const std::string &, SPIRVId *) override; | ||
232 | + bool importBuiltinSetWithId(const std::string &, SPIRVId) override; | ||
233 | + void optimizeDecorates() override; | ||
234 | + void setAddressingModel(SPIRVAddressingModelKind AM) override { AddrModel = AM;} | ||
235 | + void setAlignment(SPIRVValue *, SPIRVWord) override; | ||
236 | + void setMemoryModel(SPIRVMemoryModelKind MM) override { MemoryModel = MM;} | ||
237 | + void setName(SPIRVEntry *E, const std::string &Name) override; | ||
238 | + void setSourceLanguage(SpvSourceLanguage Lang, SPIRVWord Ver) override { | ||
239 | SrcLang = Lang; | ||
240 | SrcLangVer = Ver; | ||
241 | } | ||
242 | - void setModuleProcessed(const std::string& MP) { | ||
243 | + void setModuleProcessed(const std::string& MP) override { | ||
244 | ModuleProcessed = MP; | ||
245 | } | ||
246 | |||
247 | // Object creation functions | ||
248 | template<class T> void addTo(std::vector<T *> &V, SPIRVEntry *E); | ||
249 | - virtual SPIRVEntry *addEntry(SPIRVEntry *E); | ||
250 | - virtual SPIRVString *getString(const std::string &Str); | ||
251 | + virtual SPIRVEntry *addEntry(SPIRVEntry *E) override; | ||
252 | + virtual SPIRVString *getString(const std::string &Str) override; | ||
253 | virtual SPIRVMemberName *addMemberName(SPIRVTypeStruct *ST, | ||
254 | - SPIRVWord MemberNumber, const std::string &Name); | ||
255 | + SPIRVWord MemberNumber, const std::string &Name) override; | ||
256 | virtual SPIRVLine *addLine(SPIRVString *FileName, SPIRVWord Line, | ||
257 | - SPIRVWord Column); | ||
258 | - virtual void addCapability(SPIRVCapabilityKind); | ||
259 | - virtual const SPIRVDecorateGeneric *addDecorate(const SPIRVDecorateGeneric *); | ||
260 | - virtual SPIRVDecorationGroup *addDecorationGroup(); | ||
261 | - virtual SPIRVDecorationGroup *addDecorationGroup(SPIRVDecorationGroup *Group); | ||
262 | + SPIRVWord Column) override; | ||
263 | + virtual void addCapability(SPIRVCapabilityKind) override; | ||
264 | + virtual const SPIRVDecorateGeneric *addDecorate(const SPIRVDecorateGeneric *) override; | ||
265 | + virtual SPIRVDecorationGroup *addDecorationGroup() override; | ||
266 | + virtual SPIRVDecorationGroup *addDecorationGroup(SPIRVDecorationGroup *Group) override; | ||
267 | virtual SPIRVGroupDecorate *addGroupDecorate(SPIRVDecorationGroup *Group, | ||
268 | - const std::vector<SPIRVEntry *> &Targets); | ||
269 | + const std::vector<SPIRVEntry *> &Targets) override; | ||
270 | virtual SPIRVGroupDecorateGeneric *addGroupDecorateGeneric( | ||
271 | - SPIRVGroupDecorateGeneric *GDec); | ||
272 | + SPIRVGroupDecorateGeneric *GDec) override; | ||
273 | virtual SPIRVGroupMemberDecorate *addGroupMemberDecorate( | ||
274 | - SPIRVDecorationGroup *Group, const std::vector<SPIRVEntry *> &Targets); | ||
275 | + SPIRVDecorationGroup *Group, const std::vector<SPIRVEntry *> &Targets) override; | ||
276 | virtual void addEntryPoint(SPIRVExecutionModelKind ExecModel, | ||
277 | - SPIRVId EntryPoint); | ||
278 | - virtual SPIRVForward *addForward(SPIRVType *Ty); | ||
279 | - virtual SPIRVForward *addForward(SPIRVId, SPIRVType *Ty); | ||
280 | - virtual SPIRVFunction *addFunction(SPIRVFunction *); | ||
281 | - virtual SPIRVFunction *addFunction(SPIRVTypeFunction *, SPIRVId); | ||
282 | - virtual SPIRVEntry *replaceForward(SPIRVForward *, SPIRVEntry *); | ||
283 | + SPIRVId EntryPoint) override; | ||
284 | + virtual SPIRVForward *addForward(SPIRVType *Ty) override; | ||
285 | + virtual SPIRVForward *addForward(SPIRVId, SPIRVType *Ty) override; | ||
286 | + virtual SPIRVFunction *addFunction(SPIRVFunction *) override; | ||
287 | + virtual SPIRVFunction *addFunction(SPIRVTypeFunction *, SPIRVId) override; | ||
288 | + virtual SPIRVEntry *replaceForward(SPIRVForward *, SPIRVEntry *) override; | ||
289 | |||
290 | // Type creation functions | ||
291 | template<class T> T * addType(T *Ty); | ||
292 | - virtual SPIRVTypeInt *addIntegerType(unsigned BitWidth); | ||
293 | + virtual SPIRVTypeInt *addIntegerType(unsigned BitWidth) override; | ||
294 | |||
295 | // Constant creation functions | ||
296 | - virtual SPIRVValue *addConstant(SPIRVValue *); | ||
297 | - virtual SPIRVValue *addConstant(SPIRVType *, uint64_t); | ||
298 | + virtual SPIRVValue *addConstant(SPIRVValue *) override; | ||
299 | + virtual SPIRVValue *addConstant(SPIRVType *, uint64_t) override; | ||
300 | |||
301 | virtual SPIRVInstruction *addLoopMergeInst( | ||
302 | SPIRVId MergeBlock, SPIRVId ContinueTarget, | ||
303 | @@ -226,7 +226,7 @@ public: | ||
304 | addInstruction(SPIRVInstruction *Inst, SPIRVBasicBlock *BB, | ||
305 | SPIRVInstruction *InsertBefore = nullptr); | ||
306 | |||
307 | - virtual SPIRVExtInst* getCompilationUnit() const | ||
308 | + virtual SPIRVExtInst* getCompilationUnit() const override | ||
309 | { | ||
310 | for (auto& item : IdEntryMap) | ||
311 | { | ||
312 | @@ -242,7 +242,7 @@ public: | ||
313 | return nullptr; | ||
314 | } | ||
315 | |||
316 | - virtual std::vector<SPIRVExtInst*> getGlobalVars() | ||
317 | + virtual std::vector<SPIRVExtInst*> getGlobalVars() override | ||
318 | { | ||
319 | std::vector<SPIRVExtInst*> globalVars; | ||
320 | |||
321 | @@ -260,7 +260,7 @@ public: | ||
322 | return globalVars; | ||
323 | } | ||
324 | |||
325 | - virtual std::vector<SPIRVValue*> parseSpecConstants() | ||
326 | + virtual std::vector<SPIRVValue*> parseSpecConstants() override | ||
327 | { | ||
328 | std::vector<SPIRVValue*> specConstants; | ||
329 | |||
330 | diff --git a/IGC/AdaptorOCL/cif/cif/export/registry.h b/IGC/AdaptorOCL/cif/cif/export/registry.h | ||
331 | index a2b893c2..1571a698 100644 | ||
332 | --- a/IGC/AdaptorOCL/cif/cif/export/registry.h | ||
333 | +++ b/IGC/AdaptorOCL/cif/cif/export/registry.h | ||
334 | @@ -50,7 +50,8 @@ namespace Helpers { | ||
335 | struct EntryPointInterfaceBase{ | ||
336 | EntryPointInterfaceBase(){ | ||
337 | } | ||
338 | - | ||
339 | + virtual ~EntryPointInterfaceBase() = default; | ||
340 | + | ||
341 | virtual ICIF * Create(Version_t version, ICIF * parent) const = 0; | ||
342 | virtual InterfaceId_t GetFirstIncompatible(CIF::CompatibilityDataHandle handle) const = 0; | ||
343 | virtual void GetSupportedVersions(Version_t &verMin, Version_t &verMax) const = 0; | ||
344 | diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
345 | index ebad9b3d..3bde1151 100644 | ||
346 | --- a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
347 | +++ b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp | ||
348 | @@ -301,7 +301,7 @@ namespace FCL | ||
349 | std::string dumpPath = "c:\\Intel\\IGC\\"; // default if something goes wrong | ||
350 | char custom_dir[256]; | ||
351 | FCLReadIGCRegistry("DumpToCustomDir", custom_dir, sizeof(custom_dir)); | ||
352 | - if (custom_dir != nullptr && strlen(custom_dir) > 0) | ||
353 | + if (strlen(custom_dir) > 0) | ||
354 | { | ||
355 | dumpPath = custom_dir; | ||
356 | } | ||
357 | @@ -321,7 +321,7 @@ namespace FCL | ||
358 | std::string dumpPath = "/tmp/IntelIGC/"; // default if something goes wrong | ||
359 | char custom_dir[256]; | ||
360 | FCLReadIGCRegistry("DumpToCustomDir", custom_dir, sizeof(custom_dir)); | ||
361 | - if (custom_dir != nullptr && strlen(custom_dir) > 0) | ||
362 | + if (strlen(custom_dir) > 0) | ||
363 | { | ||
364 | dumpPath = custom_dir; | ||
365 | } | ||
366 | diff --git a/visa/CISA.l b/visa/CISA.l | ||
367 | index def21e4b..27532695 100644 | ||
368 | --- a/visa/CISA.l | ||
369 | +++ b/visa/CISA.l | ||
370 | @@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
371 | #pragma warning(default: 4005) | ||
372 | #endif | ||
373 | |||
374 | -#include "CISA.tab.h" | ||
375 | +#include "CISA.tab.hpp" | ||
376 | |||
377 | #ifdef _DEBUG | ||
378 | #define TRACE(str) fprintf(yyout, str); ECHO; fprintf(yyout, "\n") | ||
379 | diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt | ||
380 | index 11d1bf53..551e4edb 100644 | ||
381 | --- a/visa/CMakeLists.txt | ||
382 | +++ b/visa/CMakeLists.txt | ||
383 | @@ -105,8 +105,8 @@ endif() | ||
384 | # Set up the bison and flex targets. These commands will set up commands to generate the appropriate | ||
385 | # source files from the input grammars. It will also set up the dependencies correctly for any | ||
386 | # library or executable that uses the generated source | ||
387 | -BISON_TARGET(CISAParser CISA.y ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.c COMPILE_FLAGS "-vt -p CISA") | ||
388 | -FLEX_TARGET(CISAScanner CISA.l ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.c COMPILE_FLAGS "-PCISA ${WIN_FLEX_FLAG}") | ||
389 | +BISON_TARGET(CISAParser CISA.y ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp COMPILE_FLAGS "-vt -p CISA") | ||
390 | +FLEX_TARGET(CISAScanner CISA.l ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp COMPILE_FLAGS "-PCISA ${WIN_FLEX_FLAG}") | ||
391 | ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser) | ||
392 | |||
393 | add_custom_target(CISAScanner_target DEPENDS ${FLEX_CISAScanner_OUTPUTS} ${BISON_CISAParser_OUTPUTS}) | ||
394 | @@ -134,7 +134,7 @@ include_directories(${Jitter_inc_dirs}) | ||
395 | |||
396 | # Tell cmake to generate code to compile the flex and bison generated source as c++ rather than c | ||
397 | # (due to the fact that they are .c files rather than .cpp) | ||
398 | -set_source_files_properties( CISA.tab.c lex.CISA.c PROPERTIES LANGUAGE CXX ) | ||
399 | +set_source_files_properties( CISA.tab.cpp lex.CISA.cpp PROPERTIES LANGUAGE CXX ) | ||
400 | |||
401 | set(LocalScheduler_SOURCES | ||
402 | LocalScheduler/Dependencies_G4IR.cpp | ||
403 | -- | ||
404 | 2.17.1 | ||
405 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.2714.1.bb index 297f4491..7070223d 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.2714.1.bb | |||
@@ -7,13 +7,12 @@ LICENSE = "MIT & BSD-3-Clause" | |||
7 | LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ | 7 | LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ |
8 | file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=25;md5=4abf1738ff96b18e34186eb763e28eeb" | 8 | file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=25;md5=4abf1738ff96b18e34186eb763e28eeb" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https \ | 10 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;branch=releases/igc-1.0.2714 \ |
11 | file://0001-skip-execution-of-ElfPackager.patch \ | 11 | file://0001-skip-execution-of-ElfPackager.patch \ |
12 | file://0002-comment-out-dump-functions.patch \ | 12 | file://0002-comment-out-dump-functions.patch \ |
13 | file://0003-Fix-for-buildbreak-when-using-clang-9-compiler.patch \ | ||
14 | " | 13 | " |
15 | 14 | ||
16 | SRCREV = "5f96c6db35ffa238fd84314c99a53e6708322d65" | 15 | SRCREV = "710e6273dd1698e8b11763e9ff74c0dd57dddb83" |
17 | 16 | ||
18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
19 | 18 | ||