Force LLVM Legacy Pass Names

Manually adjust legacy pass wrapper names

Author: amielcza

IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp

@@ -39,6 +39,9 @@ SPDX-License-Identifier: MIT
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/Transforms/Utils.h>
 #include <llvm/Analysis/AliasAnalysis.h>
+#include "llvmWrapper/Transforms/Scalar/DeadStoreElimination.h"
+#include "llvmWrapper/Transforms/IPO/GlobalDCE.h"
+
 #include "common/LLVMWarningsPop.hpp"
 
 using namespace llvm;

IGC/AdaptorOCL/UnifyIROCL.cpp

@@ -23,6 +23,7 @@ SPDX-License-Identifier: MIT
 #include <llvm/Analysis/TargetLibraryInfo.h>
 
 #include <llvmWrapper/Transforms/InstCombine/InstCombineWorklist.h>
+#include "llvmWrapper/Transforms/IPO/GlobalDCE.h"
 #include <llvm/Transforms/Utils.h>
 
 #include "common/LLVMWarningsPop.hpp"
@@ -405,7 +406,7 @@ static void CommonOCLBasedPasses(OpenCLProgramContext *pContext) {
       mpm.add(createAlwaysInlinerLegacyPass());
     }
     // The inliner sometimes fails to delete unused functions, this cleans up the remaining mess.
-    mpm.add(createGlobalDCEPass());
+    mpm.add(IGCLLVM::createLegacyWrappedGlobalDCEPass());
 
     // Check after GlobalDCE in case of doubles in dead functions
     mpm.add(new ErrorCheck());

IGC/BiFManager/BiFManagerTool.cpp

@@ -24,6 +24,8 @@ SPDX-License-Identifier: MIT
 #include <llvm/IR/LegacyPassManager.h>
 #include <llvm/Support/FileSystem.h>
 #include <llvm/ADT/Triple.h>
+#include "llvmWrapper/Transforms/IPO/GlobalDCE.h"
+
 #include "common/LLVMWarningsPop.hpp"
 #include "BiFManagerTool.hpp"
 
@@ -391,7 +393,7 @@ void BiFManagerTool::generateSplitedBiFModules(llvm::Module *pMainModule) {
 
     // Do cleanup.
     llvm::legacy::PassManager mpm;
-    mpm.add(createGlobalDCEPass());           // Delete unreachable globals.
+    mpm.add(IGCLLVM::createLegacyWrappedGlobalDCEPass()); // Delete unreachable globals.
     mpm.add(createStripDeadDebugInfoPass());  // Remove dead debug info.
     mpm.add(createStripDeadPrototypesPass()); // Remove dead func decls.
 

IGC/BiFManager/CMakeLists.txt

@@ -37,6 +37,8 @@ target_include_directories("${IGC_BUILD__PROJ__BiFManager}" PRIVATE ${IGC_BUILD_
 
 
 add_executable("${IGC_BUILD__PROJ__BiFManager_EXE}"
+${IGC_WrapperLLVM_HDR}
+${IGC_WrapperLLVM_SRC}
 "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/BiFManagerTool.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/BiFManagerCommon.cpp"

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -157,6 +157,13 @@ SPDX-License-Identifier: MIT
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/Bitcode/BitcodeWriter.h>
 #include "llvmWrapper/Transforms/Scalar/ADCE.h"
+#include "llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.h"
+#include "llvmWrapper/Transforms/Scalar/DeadStoreElimination.h"
+#include "llvmWrapper/Transforms/Scalar/JumpThreading.h"
+#include "llvmWrapper/Transforms/IPO/SCCP.h"
+#include "llvmWrapper/Transforms/IPO/GlobalDCE.h"
+#include "llvmWrapper/Transforms/Scalar/MemCpyOptimizer.h"
+
 #include "common/LLVMWarningsPop.hpp"
 #include "Compiler/CISACodeGen/PatternMatchPass.hpp"
 #include "Compiler/CISACodeGen/EmitVISAPass.hpp"
@@ -651,7 +658,7 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
 
   if (ctx.enableFunctionCall() || ctx.type == ShaderType::RAYTRACING_SHADER) {
     // Sort functions if subroutine/indirect fcall is enabled.
-    mpm.add(llvm::createGlobalDCEPass());
+    mpm.add(IGCLLVM::createLegacyWrappedGlobalDCEPass());
     mpm.add(new PurgeMetaDataUtils());
     mpm.add(createGenXCodeGenModulePass());
   }
@@ -745,7 +752,7 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
     const bool allowIPConstProp = !ctx.m_hasStackCalls && IGC_IS_FLAG_DISABLED(DisableIPConstantPropagation);
 
     if (allowIPConstProp) {
-      mpm.add(createIPSCCPPass());
+      mpm.add(IGCLLVM::createLegacyWrappedIPSCCPPass());
     }
     mpm.add(createDeadCodeEliminationPass());
     mpm.add(createCFGSimplificationPass());
@@ -1221,7 +1228,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
       const bool allowIPConstProp = !pContext->m_hasStackCalls && IGC_IS_FLAG_DISABLED(DisableIPConstantPropagation);
 
       if (allowIPConstProp) {
-        mpm.add(createIPSCCPPass());
+        mpm.add(IGCLLVM::createLegacyWrappedIPSCCPPass());
       }
       // Note / todo: LLVM < 12 also runs simple constant propagation pass
       // regardless of IPSCCP in this case. This pass is not available on
@@ -1262,7 +1269,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
     mpm.add(createScopedNoAliasAAWrapperPass());
 
     if (pContext->m_instrTypes.hasLoadStore) {
-      mpm.add(llvm::createDeadStoreEliminationPass());
+      mpm.add(IGCLLVM::createLegacyWrappedDeadStoreEliminationPass());
       mpm.add(createMarkReadOnlyLoadPass());
     }
 
@@ -1273,7 +1280,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
 
 
     if (pContext->m_instrTypes.CorrelatedValuePropagationEnable) {
-      mpm.add(llvm::createCorrelatedValuePropagationPass());
+      mpm.add(IGCLLVM::createLegacyWrappedCorrelatedValuePropagationPass());
     }
 
     mpm.add(new BreakConstantExpr());
@@ -1527,7 +1534,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
 #if LLVM_VERSION_MAJOR >= 15
         // In LLVM-12.x an extra parameter InsertFreezeWhenUnfoldingSelect = false was added
         // to JumpThreading pass, but since LLVM-15.x it was removed again.
-        mpm.add(llvm::createJumpThreadingPass(BBDuplicateThreshold));
+        mpm.add(IGCLLVM::createLegacyWrappedJumpThreadingPass(BBDuplicateThreshold));
 #else  // LLVM_VERSION_MAJOR
         mpm.add(llvm::createJumpThreadingPass(false, BBDuplicateThreshold));
 #endif // LLVM_VERSION_MAJOR
@@ -1662,8 +1669,8 @@ void OptimizeIR(CodeGenContext *const pContext) {
     mpm.add(createGenSimplificationPass());
 
     if (pContext->m_instrTypes.hasLoadStore) {
-      mpm.add(llvm::createDeadStoreEliminationPass());
-      mpm.add(llvm::createMemCpyOptPass());
+      mpm.add(IGCLLVM::createLegacyWrappedDeadStoreEliminationPass());
+      mpm.add(IGCLLVM::createLegacyWrappedMemCpyOptPass());
       mpm.add(createLdShrinkPass());
     }
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.cpp

@@ -93,6 +93,9 @@ SPDX-License-Identifier: MIT
 #include "llvm/Transforms/Utils.h"
 #include "llvm/Transforms/Utils/Mem2Reg.h"
 
+#include "llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.h"
+#include "llvmWrapper/Transforms/Scalar/JumpThreading.h"
+
 using namespace llvm;
 
 static cl::opt<std::string>

IGC/WrapperLLVM/CMakeLists.txt

@@ -70,13 +70,27 @@ set(IGC_WrapperLLVM_HDR
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/BasicBlockUtils.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/InitializePasses.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/ADCE.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/DeadStoreElimination.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/JumpThreading.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/MemCpyOptimizer.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/IPO/GlobalDCE.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/IPO/SCCP.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/InstCombine/InstructionCombining.h"
+
     "${CMAKE_CURRENT_SOURCE_DIR}/include/lldWrapper/Common/Driver.h"
   )
 
 set(IGC_WrapperLLVM_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/ADCE.cpp"
-  )
-
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/DeadStoreElimination.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/JumpThreading.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/MemCpyOptimizer.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/IPO/GlobalDCE.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/IPO/SCCP.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/InstCombine/InstructionCombining.cpp"
+    )
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     "${CMAKE_CURRENT_SOURCE_DIR}"

IGC/WrapperLLVM/include/llvmWrapper/Transforms/IPO/GlobalDCE.h

@@ -0,0 +1,36 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2025 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+#ifndef IGCLLVM_TRANSFORMS_IPO_GLOBALDCE_LEGACY_H
+#define IGCLLVM_TRANSFORMS_IPO_GLOBALDCE_LEGACY_H
+
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/Pass.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+
+using namespace llvm;
+
+namespace IGCLLVM {
+
+struct GlobalDCELegacyPassWrapper : public ModulePass {
+  GlobalDCELegacyPassWrapper();
+  static char ID;
+  bool runOnModule(llvm::Module &M) override;
+  virtual llvm::StringRef getPassName() const override { return "LegacyWrappedGlobalDCE"; }
+
+private:
+  PassBuilder PB;
+  ModuleAnalysisManager MAM;
+};
+
+ModulePass *createLegacyWrappedGlobalDCEPass();
+
+} // end namespace IGCLLVM
+
+#endif // IGCLLVM_TRANSFORMS_IPO_GLOBALDCE_LEGACY_H

IGC/WrapperLLVM/include/llvmWrapper/Transforms/IPO/SCCP.h

@@ -0,0 +1,40 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2025 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+#ifndef IGCLLVM_TRANSFORMS_IPO_SCCP_LEGACY_H
+#define IGCLLVM_TRANSFORMS_IPO_SCCP_LEGACY_H
+
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/Pass.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+
+using namespace llvm;
+
+namespace IGCLLVM {
+
+struct IPSCCPLegacyPassWrapper : public ModulePass {
+  IPSCCPLegacyPassWrapper();
+  static char ID;
+  bool runOnModule(llvm::Module &M) override;
+  void getAnalysisUsage(AnalysisUsage &AU) const override;
+  virtual llvm::StringRef getPassName() const override { return "LegacyWrappedIPSCCP"; }
+
+private:
+  PassBuilder PB;
+  LoopAnalysisManager LAM;
+  FunctionAnalysisManager FAM;
+  CGSCCAnalysisManager CGAM;
+  ModuleAnalysisManager MAM;
+};
+
+ModulePass *createLegacyWrappedIPSCCPPass();
+
+} // end namespace IGCLLVM
+
+#endif // IGCLLVM_TRANSFORMS_IPO_SCCP_LEGACY_H

IGC/WrapperLLVM/include/llvmWrapper/Transforms/InitializePasses.h

@@ -14,5 +14,11 @@ class PassRegistry;
 }
 
 void initializeADCELegacyPassWrapperPass(llvm::PassRegistry &);
-
+void initializeCorrelatedValuePropagationLegacyPassWrapperPass(llvm::PassRegistry &);
+void initializeDSELegacyPassWrapperPass(llvm::PassRegistry &);
+void initializeJumpThreadingPassWrapperPass(llvm::PassRegistry &);
+void initializeMemCpyOptLegacyPassWrapperPass(llvm::PassRegistry &);
+void initializeGlobalDCELegacyPassWrapperPass(llvm::PassRegistry &);
+void initializeIPSCCPLegacyPassWrapperPass(llvm::PassRegistry &);
+void initializeInstructionCombiningPassWrapperPass(llvm::PassRegistry &);
 #endif // IGCLLVM_TRANSFORMS_INITIALIZE_PASSES_H