Refactor removing dead code for LLVM versions < 14

Refactor removing dead code for LLVM versions < 14

Author: pepla

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

@@ -388,10 +388,8 @@ bool CGen8OpenCLProgram::GetZEBinary(llvm::raw_pwrite_stream &programBinary, uns
           }
         } else {
           linkErr.str(); // Flush contents to the associated string
-
           linkOut.str(); // Flush contents to the associated string
           linkErrStr.append(linkOutStr);
-
           if (!linkErrStr.empty()) {
             if (ctx) {
               ctx->EmitError(linkErrStr.c_str(), nullptr);

IGC/Compiler/CISACodeGen/PushAnalysis.cpp

@@ -389,15 +389,9 @@ bool PushAnalysis::IsSafeToPushNonStaticBufferLoad(llvm::Instruction *inst) {
   bool searchForRetBBBeforeDiscard = false;
   BasicBlock *retBB = m_PDT->getRootNode()->getBlock();
   if (!retBB) {
-#if LLVM_VERSION_MAJOR <= 10
-    auto &roots = m_PDT->getRoots();
-    IGC_ASSERT_MESSAGE(roots.size() == 1, "Unexpected multiple roots");
-    retBB = roots[0];
-#else
     auto roots = m_PDT->root_begin();
     IGC_ASSERT_MESSAGE(m_PDT->root_size() == 1, "Unexpected multiple roots");
     retBB = *roots;
-#endif
   }
 
   for (auto &II : m_pFunction->getEntryBlock()) {

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -659,7 +659,6 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
   if (!isOptDisabled && ctx.m_instrTypes.hasLoadStore && IGC_IS_FLAG_DISABLED(DisableMemOpt) &&
       !ctx.getModuleMetaData()->disableMemOptforNegativeOffsetLoads) {
 
-
     if ((ctx.type == ShaderType::RAYTRACING_SHADER || ctx.hasSyncRTCalls()) &&
         IGC_IS_FLAG_DISABLED(DisablePrepareLoadsStores)) {
       mpm.add(createPrepareLoadsStoresPass());
@@ -728,7 +727,6 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
     if (allowIPConstProp) {
       mpm.add(createIPSCCPPass());
     }
-
     mpm.add(createDeadCodeEliminationPass());
     mpm.add(createCFGSimplificationPass());
   }

IGC/Compiler/CISACodeGen/helper.cpp

@@ -2948,11 +2948,7 @@ void RecursivelyDeleteDeadInstructions(Instruction *I, const TargetLibraryInfo *
 void RecursivelyDeleteDeadInstructions(const SmallVectorImpl<Instruction *> &DeadInsts, const TargetLibraryInfo *TLI,
                                        MemorySSAUpdater *MSSAU,
                                        const std::function<void(Value *)> &AboutToDeleteCallback) {
-#if LLVM_VERSION_MAJOR < 11
-  SmallVector<Instruction *, 16> trivialDeadInsts;
-#else
   SmallVector<WeakTrackingVH, 16> trivialDeadInsts;
-#endif
   for (auto II : DeadInsts) {
     Instruction &I = *II;
     IGC_ASSERT(I.use_empty() && "Instructions with uses are not dead.");
@@ -2983,11 +2979,7 @@ void RecursivelyDeleteDeadInstructions(const SmallVectorImpl<Instruction *> &Dea
   }
 
   if (!trivialDeadInsts.empty()) {
-#if LLVM_VERSION_MAJOR < 13
-    RecursivelyDeleteTriviallyDeadInstructions(trivialDeadInsts, TLI, MSSAU);
-#else
     RecursivelyDeleteTriviallyDeadInstructions(trivialDeadInsts, TLI, MSSAU, AboutToDeleteCallback);
-#endif
   }
 }
 

IGC/Compiler/Optimizer/CodeAssumption.cpp

@@ -238,11 +238,7 @@ bool CodeAssumption::addAssumption(Function *F, AssumptionCache *AC) {
           // Register assumption
           if (AC) {
             AC->registerAssumption(
-#if LLVM_VERSION_MAJOR < 13
-                assumeInst
-#else
                 dyn_cast<AssumeInst>(assumeInst)
-#endif
             );
           }
 

IGC/Compiler/Optimizer/IGCInstCombiner/IGCInstructionCombining.hpp

@@ -17,11 +17,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Transforms/InstCombine/InstCombine.h"
 
 namespace IGC {
-#if LLVM_VERSION_MAJOR <= 10
-inline llvm::FunctionPass *createIGCInstructionCombiningPass() { return llvm::createInstructionCombiningPass(false); }
-#else
 inline llvm::FunctionPass *createIGCInstructionCombiningPass() { return llvm::createInstructionCombiningPass(); }
-#endif
 } // namespace IGC
 
 #endif // IGC_INSTCOMBINE_INSTCOMBINE_H

IGC/Compiler/Optimizer/OpenCLPasses/BfloatFuncs/BfloatFuncsResolution.cpp

@@ -66,14 +66,6 @@ void BfloatFuncsResolution::visitCallInst(CallInst &CI) {
   if (!DName.startswith("__builtin_bf16"))
     return;
 
-#if LLVM_VERSION_MAJOR < 14
-  m_ctx->EmitError("__builtin_bf16* function was used with unsupported IGC "
-                   "version (LLVM version < 14)",
-                   &CI);
-  return;
-}
-#else
-
   m_builder->SetInsertPoint(&CI);
 
   m_changed = true;
@@ -309,7 +301,6 @@ void BfloatFuncsResolution::handleMath(llvm::CallInst &CI, llvm::Intrinsic::ID O
   CI.replaceAllUsesWith(Res);
   m_instructionsToRemove.push_back(&CI);
 }
-#endif // LLVM_VERSION_MAJOR < 14
 /*
 Supported functions list:
 

IGC/Compiler/Optimizer/OpenCLPasses/GEPLoopStrengthReduction/GEPLoopStrengthReduction.cpp

@@ -1191,12 +1191,6 @@ bool RegisterPressureTracker::fitsPressureThreshold(ReductionCandidateGroup &C)
 
 void RegisterPressureTracker::updatePressure(ReductionCandidateGroup &C, SCEVExpander &E) {
 
-#if LLVM_VERSION_MAJOR < 14
-  BBsToUpdate.clear();
-  Function *F = C.getLoop()->getLoopPreheader()->getParent();
-  RPE.rerunLivenessAnalysis(*F);
-  return;
-#else
 
   // Refresh all BBs in loop.
   BBsToUpdate.insert(C.getLoop()->getBlocks().begin(), C.getLoop()->getBlocks().end());
@@ -1254,7 +1248,6 @@ void RegisterPressureTracker::updatePressure(ReductionCandidateGroup &C, SCEVExp
     RPE.rerunLivenessAnalysis(*F, &BBsToUpdate);
     BBsToUpdate.clear();
   }
-#endif // LLVM_VERSION_MAJOR
 }
 
 bool Reducer::reduce(SmallVectorImpl<ReductionCandidateGroup> &Candidates) {
@@ -1319,12 +1312,8 @@ void Reducer::cleanup(ReductionCandidateGroup &C) {
   // Delete GEP instructions together with index calculations. Inform Register
   // Pressure Estimator about removed instructions.
   for (auto *GEP : C.getReduced()) {
-#if LLVM_VERSION_MAJOR < 14
-    RecursivelyDeleteTriviallyDeadInstructions(GEP);
-#else
     RecursivelyDeleteTriviallyDeadInstructions(GEP, nullptr, nullptr,
                                                [&](Value *V) { RPT.trackDeletedInstruction(V); });
-#endif
   }
 }
 

IGC/Compiler/Optimizer/OpenCLPasses/JointMatrixFuncsResolutionPass/JointMatrixFuncsResolutionPass.cpp

@@ -2861,11 +2861,7 @@ DIType *getOrCreateType(Type *T, Module *M) {
   if (T->isPointerTy()) {
 
     uint align = 0;
-#if LLVM_VERSION_MAJOR < 10
-    align = IGCLLVM::getPrefTypeAlign(Layout, T);
-#else
     align = IGCLLVM::getPrefTypeAlign(Layout, T).value();
-#endif
 
     std::optional<unsigned int> opt(std::nullopt);
     diType = Builder.createPointerType(nullptr, Layout.getPointerTypeSizeInBits(T), align * CHAR_BIT,

IGC/Compiler/Optimizer/OpenCLPasses/KernelFunctionCloning/KernelFunctionCloning.cpp

@@ -144,12 +144,7 @@ bool KernelFunctionCloning::runOnModule(Module &M) {
         continue;
       }
       IGCLLVM::CallSite *call = nullptr;
-#if LLVM_VERSION_MAJOR < 11
-      IGCLLVM::CallSite callSite(U);
-      call = &callSite;
-#else
       call = dyn_cast<IGCLLVM::CallSite>(U);
-#endif
       if (!call)
         continue;
       KernelsToClone.push_back(&F);
@@ -180,12 +175,7 @@ bool KernelFunctionCloning::runOnModule(Module &M) {
     // function clone at the callsites.
     for (auto &U : originalKernelFunctionUsers) {
       IGCLLVM::CallSite *call = nullptr;
-#if LLVM_VERSION_MAJOR < 11
-      IGCLLVM::CallSite callSite(U);
-      call = &callSite;
-#else
       call = dyn_cast<IGCLLVM::CallSite>(U);
-#endif
       if (!call)
         continue;