From f3206b097057b8c129168f041fb7d5e40e17bd79 Mon Sep 17 00:00:00 2001
From: niuliling123 <51102941+niuliling123@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:47:00 +0800
Subject: [PATCH] Revert "Fix argsort in XPU black list for XPU KP (#45975)"
 (#46064)

---
 paddle/fluid/imperative/prepared_operator.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/paddle/fluid/imperative/prepared_operator.cc b/paddle/fluid/imperative/prepared_operator.cc
index 1140db207a..62bbf77a2d 100644
--- a/paddle/fluid/imperative/prepared_operator.cc
+++ b/paddle/fluid/imperative/prepared_operator.cc
@@ -210,6 +210,7 @@ PreparedOp PrepareImpl(
       kernel_signature = *default_kernel_signature;
     }
   }
+
   if (has_phi_kernel) {
     VLOG(6) << kernel_signature;
     phi_kernel_name = kernel_signature.name;
@@ -217,13 +218,10 @@ PreparedOp PrepareImpl(
 // But the default library_type is Plain, so we need to modify the
 // library_type here, otherwise it can't work.
 #ifdef PADDLE_WITH_XPU_KP
-    bool is_kp_support = false;
     if (paddle::platform::is_xpu_place(expected_kernel_key.place_)) {
       bool use_xpu_kp_kernel_rt =
-          FLAGS_run_kp_kernel &&
-          paddle::platform::is_xpu_kp_support_op(op.Type(),
-                                                 expected_kernel_key) &&
-          (!paddle::platform::is_in_xpu_black_list(op.Type()));
+          FLAGS_run_kp_kernel && paddle::platform::is_xpu_kp_support_op(
+                                     op.Type(), expected_kernel_key);
       bool use_xpu_kp_kernel_debug =
           paddle::platform::is_in_xpu_kpwhite_list(op.Type());
       if (use_xpu_kp_kernel_rt) {
@@ -234,7 +232,6 @@ PreparedOp PrepareImpl(
       }
       bool is_xpu_kp_support =
           (use_xpu_kp_kernel_rt || use_xpu_kp_kernel_debug);
-      is_kp_support = is_xpu_kp_support;
       if (is_xpu_kp_support) {
         auto expected_kernel_key_library_type =
             expected_kernel_key.library_type_;
@@ -264,9 +261,6 @@ PreparedOp PrepareImpl(
     if (phi_kernel.IsValid()
 #if defined(PADDLE_WITH_XPU) && !defined(PADDLE_WITH_XPU_KP)
         && !is_xpu_unsupport
-#endif
-#if defined(PADDLE_WITH_XPU_KP)
-        && is_kp_support
 #endif
     ) {
       VLOG(6) << "Dynamic mode PrepareImpl - kernel name: " << phi_kernel_name
-- 
GitLab