Drop LLVM 8 API wrappers

Drop leftover wrappers from the llvmWrapper module, refactor call sites accordingly. `llvm::createLoopUnrollPass()` API deserves special attention - at the LLVM 8 times, the assumption had been that the signature may keep changing with each new version, yet it's turned out not to be the case.
intel · Jul 24, 2023 · bc85f1a · bc85f1a
1 parent 8357241
commit bc85f1a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 100 deletions.
diff --git a/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp b/IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp
@@ -583,20 +583,12 @@ class SPIRVToLLVMDbgTran {
           return type->getSizeInBits();
       else if (auto DITy = dyn_cast_or_null<llvm::DIDerivedType>(type))
       {
-#if LLVM_VERSION_MAJOR == 8
-          auto baseType = DITy->getBaseType().resolve();
-#else
           auto baseType = DITy->getBaseType();
-#endif
           return getSizeInBits(baseType);
       }
       else if (auto CTy = dyn_cast_or_null<llvm::DICompositeType>(type))
       {
-#if LLVM_VERSION_MAJOR == 8
-          auto baseType = CTy->getBaseType().resolve();
-#else
           auto baseType = CTy->getBaseType();
-#endif
           return getSizeInBits(baseType);
       }
 

diff --git a/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp
@@ -146,7 +146,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/Transforms/IPO/FunctionAttrs.h>
 #include <llvm/Transforms/Utils.h>
 #include <llvm/Transforms/Scalar/InstSimplifyPass.h>
-#include <llvmWrapper/Transforms/Scalar.h>
+#include <llvm/Transforms/Scalar.h>
 #include <llvm/Bitcode/BitcodeWriter.h>
 #include <llvm/Transforms/InstCombine/InstCombine.h>
 #include "common/LLVMWarningsPop.hpp"
@@ -440,7 +440,8 @@ void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSignature
 
         if (LoopUnrollThreshold > 0 && (ctx.m_tempCount < 64))
         {
-            mpm.add(IGCLLVM::createLoopUnrollPass(2, LoopUnrollThreshold, -1, 1));
+            mpm.add(llvm::createLoopUnrollPass(2, false, false,
+                        LoopUnrollThreshold, -1, 1, -1, -1, -1));
         }
 
         mpm.add(createBarrierNoopPass());
@@ -1411,7 +1412,8 @@ void OptimizeIR(CodeGenContext* const pContext)
                      !disableLoopUnrollStage1)
                     || hasIndexTemp)
                 {
-                    mpm.add(IGCLLVM::createLoopUnrollPass());
+                    mpm.add(llvm::createLoopUnrollPass(2, false, false, -1, -1,
+                                                       -1, -1, -1, -1));
                 }
 
                 // Due to what looks like a bug in LICM, we need to break the LoopPassManager between
@@ -1427,7 +1429,8 @@ void OptimizeIR(CodeGenContext* const pContext)
                 // Second unrolling with the same threshold.
                 if (LoopUnrollThreshold > 0 && !IGC_IS_FLAG_ENABLED(DisableLoopUnroll))
                 {
-                    mpm.add(IGCLLVM::createLoopUnrollPass());
+                    mpm.add(llvm::createLoopUnrollPass(2, false, false, -1, -1,
+                                                       -1, -1, -1, -1));
                 }
 
                 mpm.add(llvm::createLoopLoadEliminationPass());
@@ -1596,7 +1599,8 @@ void OptimizeIR(CodeGenContext* const pContext)
                          !disableLoopUnrollStage1)
                         || hasIndexTemp)
                     {
-                        mpm.add(IGCLLVM::createLoopUnrollPass());
+                        mpm.add(llvm::createLoopUnrollPass(2, false, false, -1, -1,
+                                                           -1, -1, -1, -1));
                     }
                 }
 

diff --git a/IGC/Compiler/CustomLoopOpt.cpp b/IGC/Compiler/CustomLoopOpt.cpp
@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/Transforms/Utils/Cloning.h>
 #include <llvm/Transforms/Utils/BasicBlockUtils.h>
-#include <llvmWrapper/Transforms/Utils/LoopUtils.h>
+#include <llvm/Transforms/Utils/LoopUtils.h>
 #include "common/LLVMWarningsPop.hpp"
 #include "common/LLVMUtils.h"
 #include "Compiler/CISACodeGen/ShaderCodeGen.hpp"
@@ -882,7 +882,7 @@ bool LoopCanonicalization::processOneLoop(Loop* L, DominatorTree* DT, LoopInfo*
     // Does the loop already have a preheader?  If so, don't insert one.
     BasicBlock* Preheader = L->getLoopPreheader();
     if (!Preheader) {
-        Preheader = IGCLLVM::InsertPreheaderForLoop(L, DT, LI, PreserveLCSSA);
+        Preheader = InsertPreheaderForLoop(L, DT, LI, nullptr, PreserveLCSSA);
         if (Preheader) {
             changed = true;
         }

diff --git a/IGC/Compiler/Legalizer/InstExpander.h b/IGC/Compiler/Legalizer/InstExpander.h
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
 
 #include "TypeLegalizer.h"
 #include "common/LLVMWarningsPush.hpp"
-#include "llvmWrapper/IR/InstVisitor.h"
+#include "llvm/IR/InstVisitor.h"
 #include "common/LLVMWarningsPop.hpp"
 
 namespace IGC {

diff --git a/IGC/Compiler/Legalizer/InstLegalChecker.h b/IGC/Compiler/Legalizer/InstLegalChecker.h
@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
 #include "TypeLegalizer.h"
 #include "common/LLVMWarningsPush.hpp"
 #include "llvm/Config/llvm-config.h"
-#include "llvmWrapper/IR/InstVisitor.h"
+#include "llvm/IR/InstVisitor.h"
 #include "common/LLVMWarningsPop.hpp"
 
 namespace IGC {

diff --git a/IGC/Compiler/Legalizer/InstPromoter.h b/IGC/Compiler/Legalizer/InstPromoter.h
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
 
 #include "TypeLegalizer.h"
 #include "common/LLVMWarningsPush.hpp"
-#include "llvmWrapper/IR/InstVisitor.h"
+#include "llvm/IR/InstVisitor.h"
 #include "common/LLVMWarningsPop.hpp"
 
 namespace IGC {

diff --git a/IGC/Compiler/Legalizer/InstScalarizer.h b/IGC/Compiler/Legalizer/InstScalarizer.h
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
 
 #include "TypeLegalizer.h"
 #include "common/LLVMWarningsPush.hpp"
-#include "llvmWrapper/IR/InstVisitor.h"
+#include "llvm/IR/InstVisitor.h"
 #include "common/LLVMWarningsPop.hpp"
 
 namespace IGC {

diff --git a/IGC/PCH/llvm.h b/IGC/PCH/llvm.h
@@ -105,6 +105,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/IR/GVMaterializer.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/InstIterator.h"
+#include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/IR/LegacyPassManager.h"
@@ -191,6 +192,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Scalar/GVN.h"
 #include "llvm/Transforms/Scalar/InstSimplifyPass.h"
+#include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/FunctionComparator.h"
@@ -220,7 +222,6 @@ SPDX-License-Identifier: MIT
 #include "llvmWrapper/IR/Function.h"
 #include "llvmWrapper/IR/InstrTypes.h"
 #include "llvmWrapper/IR/Instructions.h"
-#include "llvmWrapper/IR/InstVisitor.h"
 #include "llvmWrapper/IR/IntrinsicInst.h"
 #include "llvmWrapper/IR/Intrinsics.h"
 #include "llvmWrapper/IR/IRBuilder.h"
@@ -244,7 +245,6 @@ SPDX-License-Identifier: MIT
 #include "llvmWrapper/Support/YAMLParser.h"
 #include "llvmWrapper/Target/TargetMachine.h"
 #include "llvmWrapper/Transforms/InstCombine/InstCombineWorklist.h"
-#include "llvmWrapper/Transforms/Scalar.h"
 #include "llvmWrapper/Transforms/Utils/Cloning.h"
 #include "llvmWrapper/Transforms/Utils/Local.h"
 #include "llvmWrapper/Transforms/Utils/LoopUtils.h"
@@ -282,7 +282,6 @@ SPDX-License-Identifier: MIT
 // #include "llvm/IR/GlobalValue.h" - uses llvmWrapper
 // #include "llvm/IR/InstrTypes.h" - uses llvmWrapper
 // #include "llvm/IR/Instructions.h" - uses llvmWrapper
-// #include "llvm/IR/InstVisitor.h" - uses llvmWrapper
 // #include "llvm/IR/IntrinsicInst.h" - uses llvmWrapper
 // #include "llvm/IR/Intrinsics.h" - uses llvmWrapper
 // #include "llvm/IR/IRBuilder.h" - uses llvmWrapper
@@ -303,7 +302,6 @@ SPDX-License-Identifier: MIT
 // #include "llvm/Support/SystemUtils.h" - uses llvmWrapper
 // #include "llvm/Target/TargetMachine.h" - uses llvmWrapper
 // #include "llvm/Transforms/InstCombine/InstCombineWorklist.h" - uses llvmWrapper
-// #include "llvm/Transforms/Scalar.h" - uses llvmWrapper
 // #include "llvm/Transforms/Utils/Cloning.h" - uses llvmWrapper
 // #include "llvm/Transforms/Utils/Local.h" - uses llvmWrapper
 // #include "llvm/Transforms/Utils/LoopUtils.h" - uses llvmWrapper

diff --git a/IGC/WrapperLLVM/CMakeLists.txt b/IGC/WrapperLLVM/CMakeLists.txt
@@ -40,7 +40,6 @@ set(IGC_WrapperLLVM_HDR
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/Function.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/InstrTypes.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/Instructions.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/InstVisitor.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/IntrinsicInst.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/Intrinsics.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/IR/IRBuilder.h"
@@ -62,7 +61,6 @@ set(IGC_WrapperLLVM_HDR
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/YAMLParser.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Target/TargetMachine.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/InstCombine/InstCombineWorklist.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/Cloning.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/LoopUtils.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/Local.h"

diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstVisitor.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstVisitor.h
diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/Module.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/Module.h
@@ -17,16 +17,15 @@ SPDX-License-Identifier: MIT
 
 namespace IGCLLVM
 {
-#if LLVM_VERSION_MAJOR == 8
-    using llvm::Module;
-#else
+    // TODO: Clean up obsolete uses at call sites
     class Module : public llvm::Module
     {
         public:
             Module(llvm::StringRef ModuleID, llvm::LLVMContext& C)
             : llvm::Module(ModuleID, C)
             {}
 
+        // TODO: Delete getOrInsertFunction wrappers
         inline llvm::Value* getOrInsertFunction(llvm::StringRef Name, llvm::FunctionType *Ty)
         {
             return llvm::Module::getOrInsertFunction(Name, Ty).getCallee();
@@ -36,6 +35,7 @@ namespace IGCLLVM
             return llvm::Module::getOrInsertFunction(Name, Ty, attributeList).getCallee();
         }
 
+        // TODO: Refactor to use the LLVM 12+ signature at call sites
         inline llvm::StructType* getTypeByName(llvm::StringRef Name)
         {
 #if LLVM_VERSION_MAJOR < 12
@@ -46,8 +46,8 @@ namespace IGCLLVM
         }
 
     };
-#endif
 
+    // TODO: Refactor to use the LLVM 12+ signature at call sites
     inline llvm::StructType *getTypeByName(llvm::Module &M, llvm::StringRef Name)
     {
 #if LLVM_VERSION_MAJOR < 12

diff --git a/IGC/WrapperLLVM/include/llvmWrapper/Transforms/Scalar.h b/IGC/WrapperLLVM/include/llvmWrapper/Transforms/Scalar.h
diff --git a/IGC/WrapperLLVM/include/llvmWrapper/Transforms/Utils/LoopUtils.h b/IGC/WrapperLLVM/include/llvmWrapper/Transforms/Utils/LoopUtils.h
@@ -15,16 +15,6 @@ SPDX-License-Identifier: MIT
 
 namespace IGCLLVM
 {
-#if LLVM_VERSION_MAJOR == 8
-    using llvm::InsertPreheaderForLoop;
-#else
-    inline llvm::BasicBlock *InsertPreheaderForLoop(llvm::Loop *L, llvm::DominatorTree *DT, llvm::LoopInfo *LI,
-                                   bool PreserveLCSSA)
-    {
-        return llvm::InsertPreheaderForLoop(L, DT, LI, nullptr, PreserveLCSSA);
-    }
-#endif
-
     inline bool isInnermost(llvm::Loop *L) {
 #if LLVM_VERSION_MAJOR >= 12
         return L->isInnermost();