Redesign and correct building of BiFModule

Corrected the cmake setup of BiFModule and simplified.

Author: lwesiers

IGC/BiFManager/BiFManagerCommon.cpp

@@ -41,3 +41,4 @@ void CollectBuiltinsPass::visitCallInst(llvm::CallInst &callInst) {
     }
   }
 }
+

IGC/BiFManager/BiFManagerCommon.hpp

@@ -69,6 +69,7 @@ class BiFManagerCommon {
   static size_t getHash(const std::string &FlagName);
 
 protected:
+
   inline static const std::string bifMark = "igc_bif";
 
   llvm::LLVMContext &Context;

IGC/BiFManager/BiFManagerTool.cpp

@@ -58,7 +58,6 @@ void BiFManagerTool::writeHashMapSingle(llvm::raw_fd_ostream &fileDataHeader, Bi
     std::string funcName = *rec_i;
     std::string funcKey;
     funcKey = funcName;
-
     auto listOfDependency = ListOfFunctions->operator[](funcKey);
 
     std::string record = "\n        // bif func: " + funcName;
@@ -91,8 +90,7 @@ void BiFManagerTool::writeHashMap(llvm::raw_fd_ostream &fileDataHeader, BiFDicti
   for (auto rec_i = ListOfFunctions->begin(); rec_i != ListOfFunctions->end(); ++rec_i) {
     const auto &record_inst = *rec_i;
     const std::string &funcName =
-        record_inst.first;
-
+    record_inst.first;
     auto funcNameSize = funcName.size();
 
     if (sortBySizeNameFunc.find(funcNameSize) == sortBySizeNameFunc.end()) {
@@ -398,6 +396,7 @@ void BiFManagerTool::generateSplitedBiFModules(llvm::Module *pMainModule) {
     mpm.add(createStripDeadPrototypesPass()); // Remove dead func decls.
 
     mpm.run(*kernelM.get());
+
     BiFSections[setData.first] = (std::move(kernelM));
   }
 }

IGC/BiFManager/CMakeLists.txt

@@ -32,7 +32,7 @@ add_library("${IGC_BUILD__PROJ__BiFManager}"
     "${CMAKE_CURRENT_SOURCE_DIR}/../AdaptorOCL/OCL/LoadBuffer.cpp"
 )
 
-add_dependencies("${IGC_BUILD__PROJ__BiFManager}" "${IGC_BUILD__PROJ__BiFManagerSplitTask}")
+add_dependencies("${IGC_BUILD__PROJ__BiFManager}" "${IGC_BUILD__PROJ__BiFModuleCache_OCL}")
 target_include_directories("${IGC_BUILD__PROJ__BiFManager}" PRIVATE ${IGC_BUILD__BIF_DIR})
 
 

IGC/BiFManager/main.cpp

@@ -31,6 +31,7 @@ SPDX-License-Identifier: MIT
 #include <string>
 #include <list>
 #include <fstream>
+#include <sstream>
 
 using namespace std;
 using namespace llvm;
@@ -63,18 +64,38 @@ int main(int argc, char *argv[]) {
     std::unique_ptr<llvm::MemoryBuffer> genericBufferPtr(FileOrErr.get().release());
     Expected<std::unique_ptr<Module>> M = llvm::parseBitcodeFile(genericBufferPtr->getMemBufferRef(), Context);
     if (llvm::Error EC = M.takeError()) {
-      Err.print("Unable to Parse bitcode", errs());
+      std::stringstream stringBuilder("");
+      stringBuilder << "[BiFManager] - Unable to Parse bitcode:";
+      llvm::handleAllErrors(std::move(EC),
+        [&](llvm::ErrorInfoBase &EIB) {
+          stringBuilder << EIB.message();
+        });
+      Err.print(stringBuilder.str().c_str(), errs());
     }
     return M;
   };
-  printf("[BiFManager] - Start loading modules\n");
-
   auto ModuleMain = LoadModule(&InputBCFilename);
-  printf("[BiFManager] - Loaded Main module\n");
+  if(ModuleMain)
+    printf("[BiFManager] - Loaded Main module\n");
+  else {
+    printf("[BiFManager] - Problem with loading Main module\n");
+    return -13;
+  }
+
   auto Module32 = LoadModule(&InputBC32Filename);
-  printf("[BiFManager] - Loaded Size32 module\n");
+  if(Module32)
+    printf("[BiFManager] - Loaded Size32 module\n");
+  else {
+    printf("[BiFManager] - Problem with loading Size32 module\n");
+    return -13;
+  }
   auto Module64 = LoadModule(&InputBC64Filename);
-  printf("[BiFManager] - Loaded Size64 module\n");
+  if(Module64)
+    printf("[BiFManager] - Loaded Size64 module\n");
+  else {
+    printf("[BiFManager] - Problem with loading Size64 module\n");
+    return -13;
+  }
 
   IGC::BiFManager::BiFManagerTool bif(Context);
   bif.MakeBiFPackage(&(*ModuleMain.get()), &(*Module32.get()), &(*Module64.get()));