PaddlePaddle
diff --git a/‎paddle/fluid/inference/api/analysis_predictor.cc
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎paddle/fluid/inference/api/analysis_predictor.cc
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎paddle/fluid/pir/transforms/CMakeLists.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎paddle/fluid/pir/transforms/CMakeLists.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎paddle/fluid/pir/transforms/constant_folding_pass.cc
Copy file name to clipboard
+15-13Lines changed: 15 additions & 13 deletions b/‎paddle/fluid/pir/transforms/constant_folding_pass.cc
Copy file name to clipboard
+15-13Lines changed: 15 additions & 13 deletions
diff --git a/‎paddle/fluid/pir/transforms/dead_code_elimination_pass.cc
Copy file name to clipboard
+93Lines changed: 93 additions & 0 deletions b/‎paddle/fluid/pir/transforms/dead_code_elimination_pass.cc
Copy file name to clipboard
+93Lines changed: 93 additions & 0 deletions
diff --git a/‎paddle/pir/transforms/dead_code_elimination_pass.h renamed to ‎paddle/fluid/pir/transforms/dead_code_elimination_pass.h
Copy file name to clipboard b/‎paddle/pir/transforms/dead_code_elimination_pass.h renamed to ‎paddle/fluid/pir/transforms/dead_code_elimination_pass.h
Copy file name to clipboard
diff --git a/‎paddle/fluid/pybind/CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/pybind/CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pybind/pir.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pybind/pir.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/pir/pass/pass.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/pir/pass/pass.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/pir/transforms/dead_code_elimination_pass.cc
Copy file name to clipboard
-81Lines changed: 0 additions & 81 deletions b/‎paddle/pir/transforms/dead_code_elimination_pass.cc
Copy file name to clipboard
-81Lines changed: 0 additions & 81 deletions
@@ -103,12 +103,12 @@
 #endif
 
 #include "paddle/fluid/ir_adaptor/translator/translate.h"
+#include "paddle/fluid/pir/transforms/dead_code_elimination_pass.h"
 #include "paddle/fluid/pir/transforms/inplace_pass.h"
 #include "paddle/fluid/pir/transforms/pd_op_to_kernel_pass.h"
 #include "paddle/fluid/pir/transforms/replace_fetch_with_shadow_output_pass.h"
 #include "paddle/phi/core/flags.h"
 #include "paddle/pir/pass/pass_manager.h"
-#include "paddle/pir/transforms/dead_code_elimination_pass.h"
 
 PHI_DECLARE_bool(enable_pir_in_executor);
 PHI_DECLARE_bool(pir_apply_inplace_pass);
@@ -733,6 +733,8 @@ bool AnalysisPredictor::PrepareExecutor() {
       ::pir::PassManager pm(::pir::IrContext::Instance(), 2);
       pm.AddPass(::pir::CreateReplaceFetchWithShadowOutputPass());
       pm.AddPass(::pir::CreateDeadCodeEliminationPass());
+
+      pm.EnableIRPrinting();
       pm.Run(pir_program_.get());
 
       pir_program_ = std::move(
 
@@ -20,6 +20,11 @@ cc_library(
   SRCS constant_folding_pass.cc
   DEPS standalone_executor pd_op_to_kernel_pass transform_general_functions)
 
+cc_library(
+  dead_code_elimination_pass
+  SRCS dead_code_elimination_pass.cc
+  DEPS pd_op_dialect pir)
+
 cc_library(
   pd_inplace_pass
   SRCS inplace_pass.cc
 
@@ -33,6 +33,7 @@
 #include "paddle/phi/core/enforce.h"
 #include "paddle/pir/core/builtin_op.h"
 #include "paddle/pir/core/ir_context.h"
+#include "paddle/pir/core/op_result.h"
 #include "paddle/pir/core/operation.h"
 #include "paddle/pir/core/parameter.h"
 #include "paddle/pir/core/program.h"
@@ -46,22 +47,22 @@ namespace {
 class ConstantFoldingPattern : public pir::RewritePattern {
  public:
   ConstantFoldingPattern(pir::IrContext* context,
+                         paddle::framework::Scope* scope,
                          pir::PatternBenefit benefit = 1,
                          const std::vector<std::string>& generated_names = {})
-      : RewritePattern(MatchAnyOpTypeTag(), benefit, context, generated_names) {
-  }
+      : RewritePattern(MatchAnyOpTypeTag(), benefit, context, generated_names),
+        scope_(scope) {}
 
   bool Match(pir::Operation* op) const override {
     // TODO(liuyuanle): Use trait to improve robustness.
-    if (op->dyn_cast<pir::GetParameterOp>() ||
-        op->dyn_cast<pir::SetParameterOp>() ||
-        op->dyn_cast<paddle::dialect::FetchOp>())
+    if (op->isa<pir::GetParameterOp>() || op->isa<pir::SetParameterOp>() ||
+        op->isa<paddle::dialect::FetchOp>() ||
+        op->isa<paddle::dialect::ShadowOutputOp>())
       return false;
 
     // Inputs must come from get parameter op.
     for (uint32_t i = 0; i < op->num_operands(); ++i)
-      if (pir::GetDefiningOpForInput(op, i)->dyn_cast<pir::GetParameterOp>() ==
-          nullptr)
+      if (!pir::GetDefiningOpForInput(op, i)->isa<pir::GetParameterOp>())
         return false;
     return true;
   }
@@ -101,7 +102,7 @@ class ConstantFoldingPattern : public pir::RewritePattern {
     paddle::framework::InterpreterCore core(phi::CPUPlace{},
                                             fetch_var_names,
                                             kernel_program->block(),
-                                            &scope_,
+                                            scope_,
                                             exe_config_);
 
     paddle::framework::FetchList fetch_list = core.Run({});
@@ -118,7 +119,7 @@ class ConstantFoldingPattern : public pir::RewritePattern {
         "@constant_folding_pass@_" + std::to_string(suffix_++);
     exe_config_.skip_gc_vars.insert(param_name);
 
-    auto* param_var = scope_.Var(param_name);
+    auto* param_var = scope_->Var(param_name);
     auto* param_tensor = param_var->GetMutable<phi::DenseTensor>();
     *param_tensor = out_tensor;
     program->SetParameter(param_name, std::move(parameter));
@@ -150,7 +151,7 @@ class ConstantFoldingPattern : public pir::RewritePattern {
       program->SetParameter(param_name,
                             std::make_unique<pir::Parameter>(*param));
 
-      auto* param_var = scope_.FindVar(param_name);
+      auto* param_var = scope_->FindVar(param_name);
       PADDLE_ENFORCE_NOT_NULL(
           param_var,
           phi::errors::InvalidArgument("Parameter var not in scope."));
@@ -163,7 +164,7 @@ class ConstantFoldingPattern : public pir::RewritePattern {
     // prepare op outputs
     std::vector<pir::Type> output_types;
     for (uint32_t i = 0; i < op->num_results(); i++) {
-      output_types.push_back(op->result(i).type());
+      output_types.push_back(op->result_type(i));
     }
 
     auto* temp_op =
@@ -185,8 +186,8 @@ class ConstantFoldingPattern : public pir::RewritePattern {
   }
 
  private:
+  paddle::framework::Scope* scope_{nullptr};
   inline static size_t suffix_{0};
-  inline static paddle::framework::Scope scope_{};
   inline static paddle::framework::interpreter::ExecutionConfig exe_config_{};
 };
 
@@ -196,7 +197,7 @@ class ConstantFoldingPass : public pir::Pass {
 
   bool Initialize(pir::IrContext* context) override {
     pir::RewritePatternSet ps(context);
-    ps.Add<ConstantFoldingPattern>(context);
+    ps.Add<ConstantFoldingPattern>(context, &scope_);
     patterns_ = pir::FrozenRewritePatternSet(std::move(ps));
     return true;
   }
@@ -214,6 +215,7 @@ class ConstantFoldingPass : public pir::Pass {
 
  private:
   pir::FrozenRewritePatternSet patterns_;
+  paddle::framework::Scope scope_;
 };
 
 }  // namespace
 
@@ -0,0 +1,93 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/pir/transforms/dead_code_elimination_pass.h"
+
+#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
+#include "paddle/pir/core/builtin_op.h"
+#include "paddle/pir/core/program.h"
+#include "paddle/pir/pass/pass.h"
+#include "paddle/pir/pass/pass_registry.h"
+#include "paddle/pir/pattern_rewrite/frozen_rewrite_pattern_set.h"
+#include "paddle/pir/pattern_rewrite/pattern_match.h"
+#include "paddle/pir/pattern_rewrite/pattern_rewrite_driver.h"
+
+namespace {
+
+class DeadCodeEliminationPattern : public pir::RewritePattern {
+ public:
+  DeadCodeEliminationPattern(
+      pir::IrContext* context,
+      pir::PatternBenefit benefit = 1,
+      const std::vector<std::string>& generated_names = {})
+      : RewritePattern(MatchAnyOpTypeTag(), benefit, context, generated_names) {
+  }
+
+  bool Match(pir::Operation* op) const override {
+    if (op->isa<paddle::dialect::FetchOp>() ||
+        op->isa<paddle::dialect::ShadowOutputOp>())
+      return false;
+
+    return op->use_empty();
+  }
+
+  void Rewrite(pir::Operation* op,
+               pir::PatternRewriter& rewriter) const override {  // NOLINT
+    if (op->dyn_cast<pir::GetParameterOp>()) {
+      // Delete parameter from program.
+      pir::GetParameterOp get_parameter_op =
+          op->dyn_cast<pir::GetParameterOp>();
+      get_parameter_op->GetParentProgram()->parameters().erase(
+          get_parameter_op->attributes()
+              .at(get_parameter_op.attributes_name[0])
+              .dyn_cast<pir::StrAttribute>()
+              .AsString());
+    }
+    rewriter.EraseOp(op);
+  }
+};
+
+class DeadCodeEliminationPass : public pir::Pass {
+ public:
+  DeadCodeEliminationPass() : pir::Pass("dead_code_elimination_pass", 0) {}
+
+  bool Initialize(pir::IrContext* context) override {
+    pir::RewritePatternSet ps(context);
+    ps.Add<DeadCodeEliminationPattern>(context);
+    patterns_ = pir::FrozenRewritePatternSet(std::move(ps));
+    return true;
+  }
+
+  void Run(pir::Operation* op) override {
+    pir::GreedyRewriteConfig cfg;
+    cfg.use_top_down_traversal = true;
+    cfg.max_iterations = 10;
+    pir::ApplyPatternsGreedily(op->region(0), patterns_, cfg);
+  }
+
+ private:
+  pir::FrozenRewritePatternSet patterns_;
+};
+
+}  // namespace
+
+namespace pir {
+
+std::unique_ptr<Pass> CreateDeadCodeEliminationPass() {
+  return std::make_unique<DeadCodeEliminationPass>();
+}
+
+}  // namespace pir
+
+REGISTER_IR_PASS(dead_code_elimination_pass, DeadCodeEliminationPass);
@@ -44,6 +44,7 @@ set(PYBIND_DEPS
     pd_inplace_pass
     fusion_passes
     replace_fetch_with_shadow_output_pass
+    dead_code_elimination_pass
     pir
     new_profiler
     jit_layer
 
@@ -37,6 +37,7 @@
 #include "paddle/fluid/pir/dialect/operator/ir/pd_api.h"
 #include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
 #include "paddle/fluid/pir/dialect/operator/utils/utils.h"
+#include "paddle/fluid/pir/transforms/dead_code_elimination_pass.h"
 #include "paddle/fluid/pir/transforms/fusion/fused_dropout_add_pass.h"
 #include "paddle/fluid/pir/transforms/fusion/fused_linear_param_grad_add_pass.h"
 #include "paddle/fluid/pir/transforms/inplace_pass.h"
@@ -50,7 +51,6 @@
 #include "paddle/pir/pass/pass.h"
 #include "paddle/pir/pass/pass_manager.h"
 #include "paddle/pir/pass/pass_registry.h"
-#include "paddle/pir/transforms/dead_code_elimination_pass.h"
 #include "paddle/utils/flags.h"
 #include "pybind11/stl.h"
 
 
@@ -83,7 +83,7 @@ class IR_API Pass {
  protected:
   virtual void Run(Operation* op) = 0;
 
-  virtual inline bool CanApplyOn(Operation* op) const;
+  virtual bool CanApplyOn(Operation* op) const;
 
   virtual bool Initialize(IrContext* context) { return true; }