From fca3176ec1eeea018db1d96e057ce477faa05319 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 15 Aug 2019 08:21:03 +0800 Subject: igc: build for native too * Use clang and lld for native builds to remain in sync with clang layer. * fix the license field to point to correct block of license in source file. * Include patches to ignore warnings being marked as errors when building with clang and to fix an issue with inclusion of debug functions when NDEBUG is defined. Signed-off-by: Anuj Mittal --- .../files/0001-comment-out-dump-functions.patch | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-comment-out-dump-functions.patch (limited to 'dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-comment-out-dump-functions.patch') diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-comment-out-dump-functions.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-comment-out-dump-functions.patch new file mode 100644 index 00000000..c9128a0a --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-comment-out-dump-functions.patch @@ -0,0 +1,86 @@ +From f56b781c244347158467a01aef65d2787afd1366 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Sat, 17 Aug 2019 21:25:06 +0800 +Subject: [PATCH] comment out dump functions + +Otherwise it leads to errors when linking with lld: + +| ld.lld: error: undefined symbol: llvm::Value::dump() const +| >>> referenced by PreRAScheduler.cpp:252 (build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.10-r0/git/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp:252) +| >>> PreRAScheduler.cpp.o:(IGC::PreRAScheduler::dumpDDGContents()) in archive IGC/Release/libCompiler.a +| +| ld.lld: error: undefined symbol: llvm::Value::dump() const +| >>> referenced by PreRAScheduler.cpp:855 (build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.10-r0/git/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp:855) +| >>> PreRAScheduler.cpp.o:(IGC::PreRAScheduler::dumpPriorityQueueContents()) in archive IGC/Release/libCompiler.a +| +| ld.lld: error: undefined symbol: llvm::Value::dump() const +| >>> referenced by PreRAScheduler.cpp:876 (build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.10-r0/git/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp:876) +| >>> PreRAScheduler.cpp.o:(IGC::PreRAScheduler::dumpPriorityQueueContents()) in archive IGC/Release/libCompiler.a +| +| ld.lld: error: undefined symbol: llvm::Value::dump() const +| >>> referenced by PreRAScheduler.cpp:888 (build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.10-r0/git/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp:888) +| >>> PreRAScheduler.cpp.o:(IGC::PreRAScheduler::dumpPriorityQueueContents()) in archive IGC/Release/libCompiler.a +| +| ld.lld: error: undefined symbol: llvm::Value::dump() const +| >>> referenced by PreRAScheduler.cpp:902 (build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.10-r0/git/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp:902) +| >>> PreRAScheduler.cpp.o:(IGC::PreRAScheduler::dumpPriorityQueueContents()) in archive IGC/Release/libCompiler.a +| clang-8: error: linker command failed with exit code 1 (use -v to see invocation) +| ninja: build stopped: subcommand failed. + +Upstream-Status: Submitted [https://github.com/intel/intel-graphics-compiler/pull/105] + +Signed-off-by: Anuj Mittal +--- + IGC/Compiler/CISACodeGen/PreRAScheduler.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp b/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp +index 587e491..4effa80 100644 +--- a/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp ++++ b/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp +@@ -178,8 +178,10 @@ namespace IGC{ + AU.addRequired(); + } + ++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) + void dumpDDGContents(); + void dumpPriorityQueueContents(); ++#endif + + void clearDDG(); + +@@ -228,6 +230,7 @@ IGC_INITIALIZE_PASS_DEPENDENCY(RegisterEstimator) + IGC_INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass) + IGC_INITIALIZE_PASS_END(PreRAScheduler, PASS_FLAG, PASS_DESC, PASS_CFG_ONLY, PASS_ANALYSIS) + ++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) + void PreRAScheduler::dumpDDGContents() + { + IGC_SET_FLAG_VALUE(PrintToConsole, 1); +@@ -259,6 +262,7 @@ void PreRAScheduler::dumpDDGContents() + + IGC_SET_FLAG_VALUE(PrintToConsole, 0); + } ++#endif + + void PreRAScheduler::clearDDG() + { +@@ -841,6 +845,7 @@ bool PreRAScheduler::ScheduleReadyNodes( + return Changed; + } + ++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) + void PreRAScheduler::dumpPriorityQueueContents() + { + llvm::PriorityQueue, PreRAScheduler::OrderByLatency> longLatencyQueueCopy = longLatencyDelaySortedReadyQueue; +@@ -912,6 +917,7 @@ void PreRAScheduler::dumpPriorityQueueContents() + + IGC_SET_FLAG_VALUE(PrintToConsole, 0); + } ++#endif + + bool PreRAScheduler::runOnFunction(Function &F) { + CodeGenContext *ctx = getAnalysis().getCodeGenContext(); +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf