[Autobackout][FunctionalRegression]Revert of change: da392f1: Legacy Pass Manager wrapper passes

This change introduces an initial wrapper for the
    multiple removed LLVM passes. The wrapper allows the New Pass
    Manager's implementation of the pass to be
    executed using the Legacy Pass Manager
    infrastructure.

Author: sys-igc

IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp

@@ -39,9 +39,6 @@ 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,7 +23,6 @@ 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"
@@ -406,7 +405,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(IGCLLVM::createLegacyWrappedGlobalDCEPass());
+    mpm.add(createGlobalDCEPass());
 
     // Check after GlobalDCE in case of doubles in dead functions
     mpm.add(new ErrorCheck());

IGC/BiFManager/BiFManagerTool.cpp

@@ -24,8 +24,6 @@ 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"
 
@@ -393,7 +391,7 @@ void BiFManagerTool::generateSplitedBiFModules(llvm::Module *pMainModule) {
 
     // Do cleanup.
     llvm::legacy::PassManager mpm;
-    mpm.add(IGCLLVM::createLegacyWrappedGlobalDCEPass()); // Delete unreachable globals.
+    mpm.add(createGlobalDCEPass());           // Delete unreachable globals.
     mpm.add(createStripDeadDebugInfoPass());  // Remove dead debug info.
     mpm.add(createStripDeadPrototypesPass()); // Remove dead func decls.
 

IGC/BiFManager/CMakeLists.txt

@@ -37,8 +37,6 @@ 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/CMakeLists.txt

@@ -1677,7 +1677,6 @@ set(IGC_BUILD__HDR__IGC__igc_dll
     ${IGC_BUILD__HDR__IGC__igc_common}
     ${IGC_BUILD__HDR__IGC_DriverInterface__igc_dll}
     ${IGC_WrapperLLVM_HDR}
-    ${IGC_WrapperLLVM_SRC}
   )
 
 

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -157,13 +157,6 @@ 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"
@@ -658,7 +651,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(IGCLLVM::createLegacyWrappedGlobalDCEPass());
+    mpm.add(llvm::createGlobalDCEPass());
     mpm.add(new PurgeMetaDataUtils());
     mpm.add(createGenXCodeGenModulePass());
   }
@@ -753,7 +746,7 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
     const bool allowIPConstProp = !ctx.m_hasStackCalls && IGC_IS_FLAG_DISABLED(DisableIPConstantPropagation);
 
     if (allowIPConstProp) {
-      mpm.add(IGCLLVM::createLegacyWrappedIPSCCPPass());
+      mpm.add(createIPSCCPPass());
     }
     mpm.add(createDeadCodeEliminationPass());
     mpm.add(createCFGSimplificationPass());
@@ -1229,7 +1222,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
       const bool allowIPConstProp = !pContext->m_hasStackCalls && IGC_IS_FLAG_DISABLED(DisableIPConstantPropagation);
 
       if (allowIPConstProp) {
-        mpm.add(IGCLLVM::createLegacyWrappedIPSCCPPass());
+        mpm.add(createIPSCCPPass());
       }
       // Note / todo: LLVM < 12 also runs simple constant propagation pass
       // regardless of IPSCCP in this case. This pass is not available on
@@ -1270,7 +1263,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
     mpm.add(createScopedNoAliasAAWrapperPass());
 
     if (pContext->m_instrTypes.hasLoadStore) {
-      mpm.add(IGCLLVM::createLegacyWrappedDeadStoreEliminationPass());
+      mpm.add(llvm::createDeadStoreEliminationPass());
       mpm.add(createMarkReadOnlyLoadPass());
     }
 
@@ -1281,7 +1274,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
 
 
     if (pContext->m_instrTypes.CorrelatedValuePropagationEnable) {
-      mpm.add(IGCLLVM::createLegacyWrappedCorrelatedValuePropagationPass());
+      mpm.add(llvm::createCorrelatedValuePropagationPass());
     }
 
     mpm.add(new BreakConstantExpr());
@@ -1535,7 +1528,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(IGCLLVM::createLegacyWrappedJumpThreadingPass(BBDuplicateThreshold));
+        mpm.add(llvm::createJumpThreadingPass(BBDuplicateThreshold));
 #else  // LLVM_VERSION_MAJOR
         mpm.add(llvm::createJumpThreadingPass(false, BBDuplicateThreshold));
 #endif // LLVM_VERSION_MAJOR
@@ -1670,8 +1663,8 @@ void OptimizeIR(CodeGenContext *const pContext) {
     mpm.add(createGenSimplificationPass());
 
     if (pContext->m_instrTypes.hasLoadStore) {
-      mpm.add(IGCLLVM::createLegacyWrappedDeadStoreEliminationPass());
-      mpm.add(IGCLLVM::createLegacyWrappedMemCpyOptPass());
+      mpm.add(llvm::createDeadStoreEliminationPass());
+      mpm.add(llvm::createMemCpyOptPass());
       mpm.add(createLdShrinkPass());
     }
 

IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.cpp

@@ -93,9 +93,6 @@ 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,27 +70,13 @@ 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}"