CodeGenContext changes wrt LLVMContext

Do not leak LLVMContext in InitLLVMContextWrapper
Recreate LLVMContext in resetOnRetry

Author: jaladreips

IGC/Compiler/CodeGenContext.cpp

@@ -321,7 +321,7 @@ LLVMContextWrapper::LLVMContextWrapper(bool createResourceDimTypes) : m_UserAddr
   if (WA_OpaquePointersCL && WA_OpaquePointersCL->getNumOccurrences() > 0) {
     IGC_IsPointerModeAlreadySet = true;
   }
-  
+
   if (IGC::canOverwriteLLVMCtxPtrMode(basePtr, IGC_IsPointerModeAlreadySet)) {
     bool enableOpaquePointers = AreOpaquePointersEnabled();
     IGCLLVM::setOpaquePointers(basePtr, enableOpaquePointers);
@@ -389,6 +389,9 @@ void CodeGenContext::print(llvm::raw_ostream &stream) const {
 }
 
 void CodeGenContext::initLLVMContextWrapper(bool createResourceDimTypes) {
+  if (llvmCtxWrapper)
+    llvmCtxWrapper->Release();
+
   llvmCtxWrapper = new LLVMContextWrapper(createResourceDimTypes);
   llvmCtxWrapper->AddRef();
 }
@@ -704,7 +707,16 @@ void CodeGenContext::EmitWarning(const char *warningstr, const llvm::Value *cont
 
 CompOptions &CodeGenContext::getCompilerOption() { return getModuleMetaData()->compOpt; }
 
-void CodeGenContext::resetOnRetry() { m_tempCount = 0; }
+void CodeGenContext::resetOnRetry(bool isSubmodule) {
+
+  m_tempCount = 0;
+
+  if (isSubmodule)
+    return;
+
+  clear();
+  initLLVMContextWrapper();
+}
 
 int32_t CodeGenContext::getNumThreadsPerEU() const { return -1; }
 

IGC/Compiler/CodeGenPublic.h

@@ -1021,7 +1021,7 @@ class CodeGenContext {
   inline const std::string GetErrorAndWarning() { return GetWarning() + GetError(); }
 
   CompOptions &getCompilerOption();
-  virtual void resetOnRetry();
+  virtual void resetOnRetry(bool isSubmodule = false);
   virtual int32_t getNumThreadsPerEU() const;
   virtual uint32_t getExpGRFSize() const;
   virtual uint32_t getNumGRFPerThread(bool returnDefault = true);