From 06ecc6d2d33c6904b65c981b991a991fe4652a7e Mon Sep 17 00:00:00 2001
From: tianshuo78520a <tianshuo03@baidu.com>
Date: Thu, 20 Apr 2023 15:28:22 +0800
Subject: [PATCH] Revert "[BUG FIX]Fix performance bugs that created by
 PR#49116 (#52124)" (#53109)

This reverts commit 543efcc550fa7a3fe8904f89c40ea4c3b2b615f9.
---
 paddle/fluid/framework/operator.cc | 39 ++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index 72240785102..c6da5403dc5 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -1565,16 +1565,41 @@ void OperatorWithKernel::CheckWhetherPreparePhiData(
     const VariableNameMap& outnames,
     const Scope& scope) const {
   if (run_phi_kernel_ && impl_ != nullptr) {
-    // For feed, there are two situations we need prepare phi data.
-    // 1. Sometimes the output's tensor in cached PhiKernelContext is
-    // inconsistent with the variable in scope. So we need prepare phi data.
-    // 2. Somehow, sometimes the input's tensor in cached PhiKernelContext has
-    // some problems. When we use these inputs, we get segmentfault and we must
-    // prepare phi data.
-    if (Type() == "feed") {
+    const auto& phi_kernel_context = impl_->getKernelContext();
+    size_t phi_tensor_index = 0;
+    // Check each tensor in KernelContext, if there is a tensor that has
+    // different type with variable. The PhiKernelContext need be reconstructed.
+    // We use kernel_signature_'s output to retrieve tensor. Because the tensor
+    // in phi_kernel_context stored in the order of kernel_signature_'s output.
+    if (phi_kernel_context->OutputsSize() >= phi_tensor_index ||
+        kernel_signature_ == nullptr) {
       need_prepare_phi_data_ = true;
       return;
     }
+
+    const auto& phi_output_names = kernel_signature_->output_names;
+    for (auto& phi_output_name : phi_output_names) {
+      const auto& iter = outnames.find(phi_output_name);
+      if (iter != outnames.end()) {
+        for (auto& var_name : iter->second) {
+          auto var_output = scope.FindVar(var_name);
+          auto phi_output =
+              phi_kernel_context->MutableOutputAt<phi::TensorBase>(
+                  phi_tensor_index);
+          if (phi_output == nullptr) {
+            continue;
+          }
+          if (!(HasSameTensorType<phi::DenseTensor>(phi_output, var_output) ||
+                HasSameTensorType<phi::SparseCooTensor>(phi_output,
+                                                        var_output) ||
+                HasSameTensorType<framework::Strings>(phi_output,
+                                                      var_output))) {
+            need_prepare_phi_data_ = true;
+          }
+          phi_tensor_index++;
+        }
+      }
+    }
   }
 }
 
-- 
GitLab