3 files changed, 21 insertions, 105 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-skip-execution-of-ElfPackager.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-skip-execution-of-ElfPackager.patch
index 3f3e1d49..65342d9c 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-skip-execution-of-ElfPackager.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-skip-execution-of-ElfPackager.patch
@@ -1,7 +1,7 @@
-From 4e903a6914d5124d616cf085e30e8cbaa20afb77 Mon Sep 17 00:00:00 2001
+From 5501fab763aa2b11437fbdb19e07a11157a7d3e6 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 12 Jun 2019 14:10:23 +0800
-Subject: [PATCH 1/4] skip execution of ElfPackager
+Date: Thu, 6 Feb 2020 14:56:56 +0800
+Subject: [PATCH] skip execution of ElfPackager
 
 ElfPackager adds the ability to convert llvm bitcode into elf files for
 easier partitioning. Skip for now until we start building a native
@@ -12,25 +12,29 @@ Upstream-Status: Inappropriate [configuration specific]
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- IGC/ElfPackager/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ IGC/ElfPackager/CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/IGC/ElfPackager/CMakeLists.txt b/IGC/ElfPackager/CMakeLists.txt
-index d9487aeb..bc728ada 100644
+index 563ac9d6..c6c74ce9 100644
 --- a/IGC/ElfPackager/CMakeLists.txt
 +++ b/IGC/ElfPackager/CMakeLists.txt
-@@ -71,10 +71,10 @@ include_directories (
+@@ -71,12 +71,12 @@ include_directories (
    ${IGC_SOURCE_DIR}/AdaptorOCL/CLElfLib/
  )
  
--add_custom_command(TARGET ${IGC_BUILD__PROJ__ElfPackager}
--                   POST_BUILD
--                   COMMAND $<TARGET_FILE:${IGC_BUILD__PROJ__ElfPackager}> -includeSizet -funcList ${CMAKE_CURRENT_SOURCE_DIR}/function_bin.txt ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc ${IGC_BUILD__BIF_DIR}/igdclbif.bin
--                  )
-+#add_custom_command(TARGET ${IGC_BUILD__PROJ__ElfPackager}
-+#                   POST_BUILD
-+#                   COMMAND $<TARGET_FILE:${IGC_BUILD__PROJ__ElfPackager}> -includeSizet -funcList ${CMAKE_CURRENT_SOURCE_DIR}/function_bin.txt ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc ${IGC_BUILD__BIF_DIR}/igdclbif.bin
-+#                  )
+-if(NOT ANDROID)
+-  add_custom_command(TARGET ${IGC_BUILD__PROJ__ElfPackager}
+-                     POST_BUILD
+-                     COMMAND $<TARGET_FILE:${IGC_BUILD__PROJ__ElfPackager}> -includeSizet -funcList ${CMAKE_CURRENT_SOURCE_DIR}/function_bin.txt ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc ${IGC_BUILD__BIF_DIR}/igdclbif.bin
+-                    )
+-endif()
++#if(NOT ANDROID)
++#  add_custom_command(TARGET ${IGC_BUILD__PROJ__ElfPackager}
++#                     POST_BUILD
++#                     COMMAND $<TARGET_FILE:${IGC_BUILD__PROJ__ElfPackager}> -includeSizet -funcList ${CMAKE_CURRENT_SOURCE_DIR}/function_bin.txt ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc ${IGC_BUILD__BIF_DIR}/igdclbif.bin
++#                    )
++#endif()
  
  
  add_dependencies("${IGC_BUILD__PROJ__ElfPackager}" "${IGC_BUILD__PROJ__BiFModule_OCL}")
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0002-comment-out-dump-functions.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0002-comment-out-dump-functions.patch
deleted file mode 100644
index 517dc36f..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0002-comment-out-dump-functions.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 15a23e549636626cf32b062a5308a29cc53ce360 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 21 Aug 2019 17:29:00 +0800
-Subject: [PATCH 2/4] 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 <anuj.mittal@intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- 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 62e89c0c..ba01af01 100644
---- a/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp
-+++ b/IGC/Compiler/CISACodeGen/PreRAScheduler.cpp
-@@ -178,8 +178,10 @@ namespace IGC {
-             AU.addRequired<RegisterEstimator>();
-         }
- 
-+#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<Node*, std::vector<Node*>, 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<CodeGenContextWrapper>().getCodeGenContext();
--- 
-2.17.1
-
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.2714.1.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3151.bb
index 7070223d..d4827283 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.2714.1.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3151.bb
@@ -7,12 +7,11 @@ LICENSE = "MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
                     file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=25;md5=4abf1738ff96b18e34186eb763e28eeb"
 
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;branch=releases/igc-1.0.2714 \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
            file://0001-skip-execution-of-ElfPackager.patch \
-           file://0002-comment-out-dump-functions.patch \
           "
 
-SRCREV = "710e6273dd1698e8b11763e9ff74c0dd57dddb83"
+SRCREV = "ee341708a3d95738e942b6d3c5cd25b1f4b430f1"
 
 S = "${WORKDIR}/git"