Revert "Legacy Pass Manager wrapper for the ADCE pass"

Reverts "Legacy Pass Manager wrapper for the ADCE pass"

Author: michalpaszkowski

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -156,7 +156,6 @@ SPDX-License-Identifier: MIT
 #include <llvm/Transforms/Utils.h>
 #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"
@@ -571,7 +570,7 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
     // DCE doesn't remove dead control flow; ADCE does (currently)
     // otherwise you'd have to call createCFGSimplificationPass and DCE
     // iteratively e.g..
-    mpm.add(IGCLLVM::createLegacyWrappedADCEPass());
+    mpm.add(llvm::createAggressiveDCEPass());
     // TODO: we probably should be running other passes on the result
 
     if (!IGC::ForceAlwaysInline(&ctx)) {
@@ -827,7 +826,7 @@ void AddLegalizationPasses(CodeGenContext &ctx, IGCPassManager &mpm, PSSignature
       mpm.add(llvm::createLICMPass(100, 500, true));
       mpm.add(llvm::createEarlyCSEPass());
     }
-    mpm.add(IGCLLVM::createLegacyWrappedADCEPass());
+    mpm.add(createAggressiveDCEPass());
     // As DPC++ FE apply LICM we cannot reduce register pressure just
     // by turning off LICM at IGC in some cases so apply sinking address arithmetic
     if ((IGC_IS_FLAG_ENABLED(ForceAddressArithSinking) ||
@@ -1496,7 +1495,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
 
       mpm.add(llvm::createDeadCodeEliminationPass());
       if (!extensiveShader(pContext))
-        mpm.add(IGCLLVM::createLegacyWrappedADCEPass());
+        mpm.add(llvm::createAggressiveDCEPass());
 
       mpm.add(new BreakConstantExpr());
       mpm.add(new IGCConstProp(IGC_IS_FLAG_ENABLED(EnableSimplifyGEP)));
@@ -1745,7 +1744,7 @@ void OptimizeIR(CodeGenContext *const pContext) {
     }
     if (IGC_IS_FLAG_ENABLED(EnableVectorizer)) {
       mpm.add(new IGCVectorizer());
-      mpm.add(IGCLLVM::createLegacyWrappedADCEPass());
+      mpm.add(llvm::createAggressiveDCEPass());
       if (IGC_IS_FLAG_ENABLED(VectorizerCheckScalarizer))
         mpm.add(createScalarizerPass(SelectiveScalarizer::Auto));
     }

IGC/WrapperLLVM/CMakeLists.txt

@@ -71,7 +71,6 @@ set(IGC_WrapperLLVM_HDR
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/BasicBlockUtils.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Utils/LibCallsShrinkWrap.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/BDCE.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/CallSiteSplitting.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.h"
@@ -110,7 +109,6 @@ set(IGC_WrapperLLVM_HDR
   )
 
 set(IGC_WrapperLLVM_SRC
-    "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/ADCE.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/BDCE.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/CallSiteSplitting.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/lib/llvmWrapper/Transforms/Scalar/CorrelatedValuePropagation.cpp"

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

@@ -13,7 +13,6 @@ namespace llvm {
 class PassRegistry;
 }
 
-void initializeADCELegacyPassWrapperPass(llvm::PassRegistry &);
 void initializeCorrelatedValuePropagationLegacyPassWrapperPass(llvm::PassRegistry &);
 void initializeDSELegacyPassWrapperPass(llvm::PassRegistry &);
 void initializeJumpThreadingPassWrapperPass(llvm::PassRegistry &);