New ir support combine op (#54682)

phlrain · web-flow · commit 0cf841c9220d · 2023-06-20T17:31:00.000+08:00
* add kernel dialect

* change DenseTensorTypeStorage to DenseTensorType

* add test case`

* add first pd_op to kernel dialect

* lower pd op to kernel dialect

* update

* update

* remove useless code

* add attrite print test

* fix bug

* update

* update

* update

* update

* polish code

* fix bug

* polish  code  and add python test

* add test

* fix test error

* add env flag

* fix bug

* revert test env

* change cc_test_old to cc_test

* fix build_static bug

* fix type test error

* udpate cmake

* disable test in windows

* update

* update

* fix bug

* split file

* fix conflict

* polish code and fix conflict

* polish code

* fix bug
diff --git a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc
@@ -948,7 +948,7 @@ void BuildOpFuncList(
 
     auto op_name = attr_map.at("op_name").dyn_cast<::ir::StrAttribute>().data();
 
-    if (op_name == "pd.fetch") {
+    if (op_name == "pd.fetch" || op_name == "builtin.combine") {
       VLOG(6) << "skip process pd.fetch op";
       continue;
     }
diff --git a/paddle/fluid/framework/phi_tensor_base_vector.h b/paddle/fluid/framework/phi_tensor_base_vector.h
@@ -0,0 +1,89 @@
+// 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.
+
+#pragma once
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include "paddle/phi/core/dense_tensor.h"
+#include "paddle/phi/core/extended_tensor.h"
+
+namespace paddle {
+namespace framework {
+
+template <typename T>
+struct PhiVectorType;
+
+template <typename T>
+class PhiVector : public phi::ExtendedTensor,
+                  public phi::TypeInfoTraits<phi::TensorBase, PhiVector<T>> {
+ public:
+  PhiVector() = default;
+
+  explicit PhiVector(const std::vector<T>& init_data) : data_(init_data) {}
+
+  PhiVector(PhiVector&& other) = default;
+
+  PhiVector(const PhiVector& other) = default;
+
+  PhiVector& operator=(const PhiVector& other) = default;
+
+  PhiVector& operator=(const std::vector<T>& other) {
+    data_ = other;
+    return *this;
+  }
+
+  PhiVector& operator=(PhiVector&& other) = default;
+
+  /// \brief Destroy the PhiVector and release exclusive resources.
+  virtual ~PhiVector() = default;
+
+ public:
+  /// \brief Returns the name of the class for type traits.
+  /// \return The name of the class.
+  static const char* name() { return PhiVectorType<T>().type_name; }
+
+  size_t size() const { return data_.size(); }
+
+  void resize(size_t size) { data_.resize(size); }
+
+  void clear() { data_.clear(); }
+
+  void emplace_back(const T& feed_data) { data_.emplace_back(feed_data); }
+
+  const T& operator[](size_t index) const { return data_[index]; }
+
+  T& operator[](size_t index) { return data_[index]; }
+
+  T& at(size_t index) { return data_.at(index); }
+
+  const T& at(size_t index) const { return data_.at(index); }
+
+  typename std::vector<T>::iterator begin() { return data_.begin(); }
+
+  typename std::vector<T>::const_iterator begin() const {
+    return data_.begin();
+  }
+
+  typename std::vector<T>::iterator end() { return data_.end(); }
+
+  typename std::vector<T>::const_iterator end() const { return data_.end(); }
+
+ private:
+  std::vector<T> data_;
+};
+
+}  // namespace framework
+}  // namespace paddle
diff --git a/paddle/fluid/framework/string_array.h b/paddle/fluid/framework/string_array.h
@@ -20,6 +20,8 @@ limitations under the License. */
 #include <string>
 #include <unordered_map>
 #include <vector>
+#include "paddle/fluid/framework/phi_tensor_base_vector.h"
+#include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/extended_tensor.h"
 
 namespace paddle {
@@ -102,73 +104,11 @@ class Vocab : public phi::ExtendedTensor,
 // Kernel. It can be used when you define a non-tensor type that needs to be
 // stored in a vector as PHI kernel argument.
 
-template <typename T>
-struct PhiVectorType;
-
 template <>
 struct PhiVectorType<std::string> {
   const char* type_name = "PhiVectorString";
 };
 
-template <typename T>
-class PhiVector : public phi::ExtendedTensor,
-                  public phi::TypeInfoTraits<phi::TensorBase, PhiVector<T>> {
- public:
-  PhiVector() = default;
-
-  explicit PhiVector(const std::vector<T>& init_data) : data_(init_data) {}
-
-  PhiVector(PhiVector&& other) = default;
-
-  PhiVector(const PhiVector& other) = default;
-
-  PhiVector& operator=(const PhiVector& other) = default;
-
-  PhiVector& operator=(const std::vector<T>& other) {
-    data_ = other;
-    return *this;
-  }
-
-  PhiVector& operator=(PhiVector&& other) = default;
-
-  /// \brief Destroy the PhiVector and release exclusive resources.
-  virtual ~PhiVector() = default;
-
- public:
-  /// \brief Returns the name of the class for type traits.
-  /// \return The name of the class.
-  static const char* name() { return PhiVectorType<T>().type_name; }
-
-  size_t size() const { return data_.size(); }
-
-  void resize(size_t size) { data_.resize(size); }
-
-  void clear() { data_.clear(); }
-
-  void emplace_back(const T& feed_data) { data_.emplace_back(feed_data); }
-
-  const T& operator[](size_t index) const { return data_[index]; }
-
-  T& operator[](size_t index) { return data_[index]; }
-
-  T& at(size_t index) { return data_.at(index); }
-
-  const T& at(size_t index) const { return data_.at(index); }
-
-  typename std::vector<T>::iterator begin() { return data_.begin(); }
-
-  typename std::vector<T>::const_iterator begin() const {
-    return data_.begin();
-  }
-
-  typename std::vector<T>::iterator end() { return data_.end(); }
-
-  typename std::vector<T>::const_iterator end() const { return data_.end(); }
-
- private:
-  std::vector<T> data_;
-};
-
 using String = std::string;
 using Strings = PhiVector<std::string>;
 
diff --git a/paddle/fluid/framework/tensor_ref_array.h b/paddle/fluid/framework/tensor_ref_array.h
@@ -0,0 +1,30 @@
+// 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.
+
+#pragma once
+
+#include "paddle/fluid/framework/phi_tensor_base_vector.h"
+
+namespace paddle {
+namespace framework {
+
+template <>
+struct PhiVectorType<const phi::DenseTensor*> {
+  const char* type_name = "PhiTensorRefArray";
+};
+
+using TensorRefArray = PhiVector<const phi::DenseTensor*>;
+
+}  // namespace framework
+}  // namespace paddle
diff --git a/paddle/fluid/framework/type_info.cc b/paddle/fluid/framework/type_info.cc
@@ -40,5 +40,7 @@ template class TypeInfoTraits<phi::TensorBase, paddle::framework::Strings>;
 template class TypeInfoTraits<phi::TensorBase, paddle::framework::FeedList>;
 template class TypeInfoTraits<phi::TensorBase, egr::VariableCompatTensor>;
 template class TypeInfoTraits<phi::TensorBase, paddle::prim::DescTensor>;
+template class TypeInfoTraits<phi::TensorBase,
+                              paddle::framework::TensorRefArray>;
 
 }  // namespace phi
diff --git a/paddle/fluid/framework/var_type_traits.h b/paddle/fluid/framework/var_type_traits.h
@@ -25,6 +25,7 @@
 #include "paddle/fluid/framework/lod_tensor_array.h"
 #include "paddle/fluid/framework/raw_tensor.h"
 #include "paddle/fluid/framework/string_array.h"
+#include "paddle/fluid/framework/tensor_ref_array.h"
 #include "paddle/fluid/platform/place.h"
 #ifdef PADDLE_WITH_CUDA
 #include <cudnn.h>
@@ -210,7 +211,8 @@ using VarTypeRegistry = detail::VarTypeRegistryImpl<
     std::vector<int>,
     std::vector<float>,
     std::vector<std::string>,
-    RawTensor>;
+    RawTensor,
+    TensorRefArray>;
 template <typename T>
 struct VarTypeTrait {
   static_assert(VarTypeRegistry::IsRegistered<T>(), "Must be registered type");
diff --git a/paddle/fluid/ir/pass/pd_op_to_kernel_pass.cc b/paddle/fluid/ir/pass/pd_op_to_kernel_pass.cc
diff --git a/paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.cc b/paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.cc
diff --git a/test/ir/new_ir/test_standalone_new_ir.py b/test/ir/new_ir/test_standalone_new_ir.py

Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ void BuildOpFuncList(`
`948`	`948`
`949`	`949`	`auto op_name = attr_map.at("op_name").dyn_cast<::ir::StrAttribute>().data();`
`950`	`950`
`951`		`- if (op_name == "pd.fetch") {`
	`951`	`+ if (op_name == "pd.fetch" \|\| op_name == "builtin.combine") {`
`952`	`952`	`VLOG(6) << "skip process pd.fetch op";`
`953`	`953`	`continue;`
`954`	`954`	`}`