[NewIR]Split PaddleDialect and KernelDialect and Implement Layered Compailation (#56442)

* [NewIR]Split PaddleDialect and KernelDialect and Implement Layered Compailation

* remove ir_core DEPS

* fix header files

* fix conflict

* ignore test_assert UT

* fix code style

* fix UT

paddle/cinn/hlir/framework/new_ir_compiler.cc

@@ -19,7 +19,7 @@
 #include "paddle/cinn/lang/lower.h"
 #include "paddle/cinn/lang/placeholder.h"
 #include "paddle/cinn/utils/attribute_util.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/ir/core/builtin_type.h"
 
 namespace cinn {

paddle/cinn/utils/attribute_util.h

@@ -18,7 +18,7 @@
 
 #include "paddle/cinn/common/type.h"
 #include "paddle/cinn/utils/type_defs.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 #include "paddle/ir/core/builtin_type.h"
 #include "paddle/phi/common/data_type.h"
 

paddle/fluid/framework/new_executor/instruction/legacy_kernel_instruction.cc

@@ -18,10 +18,10 @@
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"
 
 #include "paddle/fluid/platform/device_context.h"

paddle/fluid/framework/new_executor/instruction/phi_kernel_instruction.cc

@@ -17,10 +17,10 @@
 #include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
 #include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/fluid/platform/collective_helper.h"
 #include "paddle/fluid/platform/device_context.h"

paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc

@@ -23,9 +23,9 @@
 #include "paddle/fluid/framework/new_executor/interpreter/data_transfer.h"
 #include "paddle/fluid/framework/new_executor/interpreter/execution_config.h"
 #include "paddle/fluid/framework/new_executor/interpreter/static_build.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/fluid/memory/stats.h"
 #include "paddle/fluid/operators/controlflow/conditional_block_op_helper.h"

paddle/fluid/framework/new_executor/new_executor_defs.h

@@ -20,7 +20,7 @@
 
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/variable_helper.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
 #include "paddle/fluid/platform/device_event_base.h"
 #include "paddle/fluid/platform/event.h"
 #include "paddle/phi/core/utils/rw_lock.h"

paddle/fluid/framework/new_executor/new_ir_interpreter.cc

@@ -41,7 +41,7 @@
 #endif
 #include "paddle/fluid/framework/new_executor/instruction/legacy_kernel_instruction.h"
 #include "paddle/fluid/framework/new_executor/instruction/phi_kernel_instruction.h"
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"
 #include "paddle/ir/core/builtin_attribute.h"
 

paddle/fluid/ir/CMakeLists.txt

-add_subdirectory(interface)
-add_subdirectory(trait)
 add_subdirectory(dialect)
 add_subdirectory(transforms)
 add_subdirectory(phi_kernel_adaptor)

paddle/fluid/ir/dialect/CMakeLists.txt

-set(PD_DIALECT_SOURCE_DIR "${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect")
-set(PD_DIALECT_BINARY_DIR "${PADDLE_BINARY_DIR}/paddle/fluid/ir/dialect")
-
-# Generate pd_dialect files defining op using op_gen_file
-set(op_gen_file
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/op_generator/op_gen.py)
-set(op_compat_yaml_file ${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml)
-set(op_forward_yaml_file1
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
-)
-set(op_forward_yaml_file2
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_ops.parsed.yaml
-)
-set(op_backward_yaml_file1
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
-)
-set(op_backward_yaml_file2
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_backward_ops.parsed.yaml
-)
-set(op_yaml_file3 ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/pd_op.yaml)
-
-set(op_yaml_files
-    ${op_forward_yaml_file1},${op_forward_yaml_file2},${op_backward_yaml_file1},${op_backward_yaml_file2},${op_yaml_file3}
-)
-set(op_namespace paddle,dialect)
-set(dialect_name pd)
-set(op_header_file ${PD_DIALECT_BINARY_DIR}/pd_op.h)
-set(op_source_file ${PD_DIALECT_BINARY_DIR}/pd_op.cc)
-set(op_header_file_tmp ${op_header_file}.tmp)
-set(op_source_file_tmp ${op_source_file}.tmp)
-
-add_custom_command(
-  OUTPUT ${op_header_file} ${op_source_file}
-  COMMAND
-    ${PYTHON_EXECUTABLE} ${op_gen_file} --op_yaml_files ${op_yaml_files}
-    --op_compat_yaml_file ${op_compat_yaml_file} --namespaces ${op_namespace}
-    --dialect_name ${dialect_name} --op_def_h_file ${op_header_file_tmp}
-    --op_def_cc_file ${op_source_file_tmp}
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${op_header_file_tmp}
-          ${op_header_file}
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${op_source_file_tmp}
-          ${op_source_file}
-  COMMENT "copy_if_different ${op_header_file} ${op_source_file}"
-  DEPENDS ${op_gen_file} ${op_forward_yaml_file1} ${op_forward_yaml_file2}
-          ${op_backward_yaml_file1} ${op_backward_yaml_file2}
-          ${op_compat_yaml_file}
-  VERBATIM)
-
-set(api_gen_file
-    ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/op_generator/api_gen.py)
-set(api_header_file ${PD_DIALECT_BINARY_DIR}/pd_api.h)
-set(api_source_file ${PD_DIALECT_BINARY_DIR}/pd_api.cc)
-set(api_header_file_tmp ${api_header_file}.tmp)
-set(api_source_file_tmp ${api_source_file}.tmp)
-
-add_custom_command(
-  OUTPUT ${api_header_file} ${api_source_file}
-  COMMAND
-    ${PYTHON_EXECUTABLE} ${api_gen_file} --op_yaml_files ${op_yaml_files}
-    --op_compat_yaml_file ${op_compat_yaml_file} --namespaces ${op_namespace}
-    --api_def_h_file ${api_header_file_tmp} --api_def_cc_file
-    ${api_source_file_tmp}
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${api_header_file_tmp}
-          ${api_header_file}
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${api_source_file_tmp}
-          ${api_source_file}
-  COMMENT "copy_if_different ${api_header_file} ${api_source_file}"
-  DEPENDS ${api_gen_file} ${op_forward_yaml_file1} ${op_forward_yaml_file2}
-          ${op_backward_yaml_file1} ${op_backward_yaml_file2}
-          ${op_compat_yaml_file}
-  VERBATIM)
-
-# All source files of pd_dialect, except for the source file of op, which is generated in the compilation directory.
-file(GLOB PD_DIALECT_SRCS "*.cc")
-
-cc_library(
-  pd_dialect
-  SRCS ${PD_DIALECT_SRCS} ${op_source_file} ${api_source_file}
-  DEPS phi
-       phi_utils
-       pd_interface
-       pd_trait
-       ir
-       primitive_vjp_experimental
-       type_info)
-target_include_directories(pd_dialect PRIVATE ${PD_DIALECT_BINARY_DIR})
+add_subdirectory(paddle_dialect)
+add_subdirectory(paddle_kernel_dialect)

paddle/fluid/ir/dialect/op_generator/api_gen.py

@@ -29,7 +29,7 @@ H_FILE_TEMPLATE = """
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/common/place.h"
 #include "paddle/phi/common/scalar.h"
-#include "paddle/fluid/ir/dialect/pd_manual_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_api.h"
 
 {body}
 
@@ -37,9 +37,9 @@ H_FILE_TEMPLATE = """
 
 CPP_FILE_TEMPLATE = """
 
-#include "paddle/fluid/ir/dialect/pd_api.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/ir/core/builder.h"
 #include "paddle/ir/core/builtin_op.h"
 

paddle/fluid/ir/dialect/op_generator/op_gen.py

@@ -47,15 +47,15 @@ H_FILE_TEMPLATE = """#ifdef GET_OP_LIST
 #include "paddle/ir/core/builder.h"
 #include "paddle/ir/core/operation_utils.h"
 #include "paddle/ir/core/op_base.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/vjp.h"
-#include "paddle/fluid/ir/trait/inplace.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/vjp.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/trait/inplace.h"
 #include "paddle/fluid/framework/infershape_utils.h"
 #include "paddle/phi/core/infermeta_utils.h"
-#include "paddle/fluid/ir/dialect/pd_manual_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_op.h"
 
 {input}
 
@@ -98,8 +98,8 @@ op_n_attribute_declare_str = (
 # =====================================
 CC_FILE_TEMPLATE = """// This file is generated by "paddle/fluid/ir/dialect/op_generator/op_gen.py"
 #include "{h_file}"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_type.h"
 #include "paddle/ir/core/builtin_op.h"

paddle/fluid/ir/dialect/paddle_dialect/CMakeLists.txt

+add_subdirectory(ir)
+add_subdirectory(interface)
+add_subdirectory(trait)
+add_subdirectory(utils)
+add_subdirectory(transforms)

paddle/fluid/ir/interface/CMakeLists.txt → paddle/fluid/ir/dialect/paddle_dialect/interface/CMakeLists.txt

@@ -4,4 +4,4 @@ file(GLOB PD_INTERFACE_SRCS "*.cc")
 cc_library(
   pd_interface
   SRCS ${PD_INTERFACE_SRCS}
-  DEPS ir framework_proto phi_utils)
+  DEPS ir_core phi_utils)

paddle/fluid/ir/interface/interface.cc → paddle/fluid/ir/dialect/paddle_dialect/interface/interface.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/vjp.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/vjp.h"
 
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::InferMetaInterface)
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::OpYamlInfoInterface)

paddle/fluid/ir/interface/op_yaml_info.h → paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
 #include "paddle/ir/core/op_base.h"
 
 using OpInfoTuple = std::tuple<std::vector<paddle::dialect::OpInputInfo>,

paddle/fluid/ir/dialect/paddle_dialect/ir/CMakeLists.txt

+set(PD_DIALECT_BINARY_DIR
+    "${PADDLE_BINARY_DIR}/paddle/fluid/ir/dialect/paddle_dialect/ir")
+
+# Generate pd_dialect files defining op using op_gen_file
+set(op_gen_file
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/op_generator/op_gen.py)
+set(op_compat_yaml_file ${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml)
+set(op_forward_yaml_file1
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/ops.parsed.yaml
+)
+set(op_forward_yaml_file2
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_ops.parsed.yaml
+)
+set(op_backward_yaml_file1
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/backward_ops.parsed.yaml
+)
+set(op_backward_yaml_file2
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parsed_ops/legacy_backward_ops.parsed.yaml
+)
+set(op_yaml_file3
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.yaml)
+
+set(op_yaml_files
+    ${op_forward_yaml_file1},${op_forward_yaml_file2},${op_backward_yaml_file1},${op_backward_yaml_file2},${op_yaml_file3}
+)
+set(op_namespace paddle,dialect)
+set(dialect_name pd)
+set(op_header_file ${PD_DIALECT_BINARY_DIR}/pd_op.h)
+set(op_source_file ${PD_DIALECT_BINARY_DIR}/pd_op.cc)
+set(op_header_file_tmp ${op_header_file}.tmp)
+set(op_source_file_tmp ${op_source_file}.tmp)
+
+add_custom_command(
+  OUTPUT ${op_header_file} ${op_source_file}
+  COMMAND
+    ${PYTHON_EXECUTABLE} ${op_gen_file} --op_yaml_files ${op_yaml_files}
+    --op_compat_yaml_file ${op_compat_yaml_file} --namespaces ${op_namespace}
+    --dialect_name ${dialect_name} --op_def_h_file ${op_header_file_tmp}
+    --op_def_cc_file ${op_source_file_tmp}
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${op_header_file_tmp}
+          ${op_header_file}
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${op_source_file_tmp}
+          ${op_source_file}
+  COMMENT "copy_if_different ${op_header_file} ${op_source_file}"
+  DEPENDS ${op_gen_file} ${op_forward_yaml_file1} ${op_forward_yaml_file2}
+          ${op_backward_yaml_file1} ${op_backward_yaml_file2}
+          ${op_compat_yaml_file}
+  VERBATIM)
+
+set(api_gen_file
+    ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/op_generator/api_gen.py)
+set(api_header_file ${PD_DIALECT_BINARY_DIR}/pd_api.h)
+set(api_source_file ${PD_DIALECT_BINARY_DIR}/pd_api.cc)
+set(api_header_file_tmp ${api_header_file}.tmp)
+set(api_source_file_tmp ${api_source_file}.tmp)
+
+add_custom_command(
+  OUTPUT ${api_header_file} ${api_source_file}
+  COMMAND
+    ${PYTHON_EXECUTABLE} ${api_gen_file} --op_yaml_files ${op_yaml_files}
+    --op_compat_yaml_file ${op_compat_yaml_file} --namespaces ${op_namespace}
+    --api_def_h_file ${api_header_file_tmp} --api_def_cc_file
+    ${api_source_file_tmp}
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${api_header_file_tmp}
+          ${api_header_file}
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${api_source_file_tmp}
+          ${api_source_file}
+  COMMENT "copy_if_different ${api_header_file} ${api_source_file}"
+  DEPENDS ${api_gen_file} ${op_forward_yaml_file1} ${op_forward_yaml_file2}
+          ${op_backward_yaml_file1} ${op_backward_yaml_file2}
+          ${op_compat_yaml_file}
+  VERBATIM)
+
+cc_library(
+  pd_dialect_core
+  SRCS pd_attribute.cc pd_type.cc
+  DEPS phi pd_interface pd_trait type_info)
+cc_library(
+  pd_dialect_op
+  SRCS ${op_source_file} pd_manual_op.cc
+  DEPS pd_dialect_core)
+cc_library(
+  api_builder
+  SRCS api_builder.cc
+  DEPS ir_core)
+cc_library(
+  pd_dialect_api
+  SRCS ${api_source_file} pd_manual_api.cc
+  DEPS api_builder pd_dialect_op)
+
+target_include_directories(pd_dialect_api PRIVATE ${PD_DIALECT_BINARY_DIR})
+
+cc_library(
+  pd_dialect
+  SRCS pd_dialect.cc pd_op_vjp_manual.cc
+  DEPS pd_dialect_api param_to_variable primitive_vjp_experimental
+       pd_dialect_utils op_yaml_info_parser)

paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.cc

+// 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
+//
+//     http://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/ir/dialect/paddle_dialect/ir/api_builder.h"
+#include "paddle/ir/core/enforce.h"
+#include "paddle/ir/core/ir_context.h"
+// #include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+
+namespace paddle {
+namespace dialect {
+
+APIBuilder::APIBuilder() : builder_(nullptr) {
+  ctx_ = ir::IrContext::Instance();
+  // ctx_->GetOrRegisterDialect<paddle::dialect::PaddleDialect>();
+}
+
+void APIBuilder::SetProgram(ir::Program* program) {
+  builder_ = std::make_shared<ir::Builder>(ctx_, program->block());
+}
+
+void APIBuilder::SetInsertionPoint(ir::Operation* op) {
+  IR_ENFORCE(builder_ != nullptr,
+             "builder doesn't hold program, please call SetProgram for "
+             "initialization.");
+  builder_->SetInsertionPoint(op);
+}
+
+void APIBuilder::ResetInsertionPointToStart() {
+  IR_ENFORCE(builder_ != nullptr,
+             "builder doesn't hold program, please call SetProgram for "
+             "initialization.");
+  builder_->SetInsertionPointToStart(builder_->block());
+}
+
+void APIBuilder::ResetInsertionPointToEnd() {
+  IR_ENFORCE(builder_ != nullptr,
+             "builder doesn't hold program, please call SetProgram for "
+             "initialization.");
+  builder_->SetInsertionPointToEnd(builder_->block());
+}
+
+}  // namespace dialect
+}  // namespace paddle

paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.h

+// 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
+//
+//     http://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 <memory>
+
+#include "paddle/ir/core/builder.h"
+#include "paddle/ir/core/macros.h"
+#include "paddle/ir/core/program.h"
+
+namespace paddle {
+namespace dialect {
+///
+/// \brief APIBuilder is used in IR API for building op
+///
+class APIBuilder {
+ public:
+  static APIBuilder& Instance() {
+    static APIBuilder api_builder;
+    return api_builder;
+  }
+  void SetProgram(ir::Program* program);
+
+  /// Set the insertion point to the specified operation, which will cause
+  /// subsequent insertions to go right before it.
+  void SetInsertionPoint(ir::Operation* op);
+
+  void ResetInsertionPointToStart();
+
+  void ResetInsertionPointToEnd();
+
+  std::shared_ptr<ir::Builder> GetBuilder() { return builder_; }
+
+ private:
+  APIBuilder();
+
+  DISABLE_COPY_AND_ASSIGN(APIBuilder);
+
+  ir::IrContext* ctx_;
+  std::shared_ptr<ir::Builder> builder_;
+};
+
+}  // namespace dialect
+}  // namespace paddle

paddle/fluid/ir/dialect/pd_attribute.cc → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/dialect/pd_attribute.h → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/pd_attribute_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute_storage.h"
 #include "paddle/ir/core/attribute.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/phi/common/scalar.h"

paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.cc

+// 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
+//
+//     http://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/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+// NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
+// paddle/fluid/ir/dialect/CMakeLists.txt.
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/transforms/param_to_variable.h"
+#include "paddle/ir/core/utils.h"
+
+namespace paddle {
+namespace dialect {
+
+PaddleDialect::PaddleDialect(ir::IrContext *context)
+    : ir::Dialect(name(), context, ir::TypeId::get<PaddleDialect>()) {
+  initialize();
+}
+
+void PaddleDialect::initialize() {
+  RegisterTypes<paddle::dialect::DenseTensorType>();
+  RegisterTypes<paddle::dialect::SelectedRowsType>();
+
+  RegisterAttributes<paddle::dialect::IntArrayAttribute,
+                     paddle::dialect::DataTypeAttribute,
+                     paddle::dialect::PlaceAttribute,
+                     paddle::dialect::DataLayoutAttribute>();
+
+  // NOTE(zhangbo9674): GET_OP_LIST is defined in pd_op.h which is
+  // generated by op_gen.py, see details in
+  // paddle/fluid/ir/dialect/CMakeLists.txt.
+  // NOTE(Ruting)GET_MANUAL_OP_LIST is define in pd_manual_op.h"
+  // use RegisterOps when list has more than two ops.
+  RegisterOps<
+#define GET_OP_LIST
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"  // NOLINT
+      >();
+  RegisterOp<paddle::dialect::AddNOp>();
+
+  RegisterInterfaces<ParameterConvertInterface>();
+}
+
+void PaddleDialect::PrintType(ir::Type type, std::ostream &os) const {
+  os << type.dialect().name();
+  os << '.';
+  if (auto tensor_type = type.dyn_cast<DenseTensorType>()) {
+    os << "tensor<";
+    for (auto d : phi::vectorize(tensor_type.dims())) {
+      os << d;
+      os << "x";
+    }
+    tensor_type.dtype().Print(os);
+    os << ">";
+  } else if (auto selected_rows_type = type.dyn_cast<SelectedRowsType>()) {
+    os << "selectedrows<";
+    for (auto d : phi::vectorize(selected_rows_type.dims())) {
+      os << d;
+      os << "x";
+    }
+    selected_rows_type.dtype().Print(os);
+    os << ">";
+  }
+}
+
+void PaddleDialect::PrintAttribute(ir::Attribute attr, std::ostream &os) const {
+  if (auto int_array_attr = attr.dyn_cast<IntArrayAttribute>()) {
+    phi::IntArray data = int_array_attr.data();
+    os << "IntArray[";
+    const auto &inner_data = data.GetData();
+    ir::PrintInterleave(
+        inner_data.begin(),
+        inner_data.end(),
+        [&os](int64_t i) { os << i; },
+        [&os]() { os << ","; });
+    os << "]";
+  } else if (auto data_type_attr = attr.dyn_cast<DataTypeAttribute>()) {
+    os << data_type_attr.data();
+  } else if (auto place_type_attr = attr.dyn_cast<PlaceAttribute>()) {
+    os << place_type_attr.data();
+  } else if (auto data_layout_attr = attr.dyn_cast<DataLayoutAttribute>()) {
+    os << data_layout_attr.data();
+  } else {
+    os << "<#AttrNotImplemented>";
+  }
+}
+
+}  // namespace dialect
+}  // namespace paddle
+
+IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::PaddleDialect)

paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h

+// 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
+//
+//     http://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/ir/core/dialect.h"
+
+namespace paddle {
+namespace dialect {
+
+class PaddleDialect : public ir::Dialect {
+ public:
+  explicit PaddleDialect(ir::IrContext* context);
+
+  static const char* name() { return "pd"; }
+
+  void PrintType(ir::Type type, std::ostream& os) const;
+  void PrintAttribute(ir::Attribute type, std::ostream& os) const;
+
+ private:
+  void initialize();
+};
+
+}  // namespace dialect
+}  // namespace paddle
+
+IR_DECLARE_EXPLICIT_TYPE_ID(paddle::dialect::PaddleDialect)

paddle/fluid/ir/dialect/pd_manual_api.cc → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_api.cc

@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_manual_api.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
-#include "paddle/ir/core/builder.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/ir/core/builtin_op.h"
 
 namespace paddle {

paddle/fluid/ir/dialect/pd_manual_op.cc → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_op.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_manual_op.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_op.h"
 #include "paddle/ir/core/builtin_type.h"

paddle/fluid/ir/dialect/pd_manual_op.h → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_op.h

@@ -22,10 +22,10 @@ paddle::dialect::AddNOp
 #include <vector>
 
 #include "paddle/fluid/framework/infershape_utils.h"
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builder.h"
 #include "paddle/ir/core/op_base.h"
 #include "paddle/ir/core/operation_utils.h"

paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.yaml

+- name: assign_value
+  inputs: []
+  attrs:
+  - {typename: 'int[]', name: shape}
+  - {typename: DataType, name: dtype}
+  - {typename: 'Scalar[]', name: values, data_type: 'std::vector<Scalar>'}
+  - {typename: Place, name: place, default_value: '{}'}
+  outputs:
+  - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: AssignValueInferMeta
+    param: [shape, dtype]
+  kernel:
+    func: [assign_value]
+    param: [shape, dtype, values]
+    backend:
+      ordered: true
+      candidates: [place]
+    layout: null
+    data_type:
+      ordered: false
+      candidates: [dtype]
+      to_complex_flag: [false]
+    dispatch: {assign_value: null}
+    force_backend: null
+  inplace: null
+  view: null
+  backward: null
+
+- name: feed
+  inputs: []
+  attrs:
+  - {typename: str, name: name}
+  - {typename: int, name: col}
+  outputs:
+  - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  inplace: null
+  backward: null
+
+- name: fetch
+  inputs:
+  - typename: Tensor
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: str, name: name}
+  - {typename: int, name: col}
+  outputs:
+    - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: UnchangedInferMeta
+    param: [x]
+  kernel:
+    func: [fetch]
+    param: [x]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  inplace: null
+  backward: null
+
+- name: save_combine
+  inputs:
+  - typename: Tensor[]
+    name: X
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: str, name: file_path}
+  - {typename: bool, name: overwrite}
+  - {typename: bool, name: save_as_fp16}
+  - {typename: bool, name: save_to_memory}
+  outputs:
+    - {typename: Tensor, name: out, optional: true, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  kernel:
+    func: [save_combine_tensor]
+    param: [X, file_path, overwrite, save_as_fp16, save_to_memory]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  inplace: null
+  backward: null
+
+- name: load_combine
+  inputs: []
+  attrs:
+  - {typename: str, name: file_path}
+  - {typename: bool, name: load_as_fp16}
+  - {typename: bool, name: model_from_memory}
+  outputs:
+    - {typename: 'Tensor[]', name: Out, optional: true, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  kernel:
+    func: [load_combine]
+    param: [file_path, load_as_fp16, model_from_memory]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  inplace: null
+  backward: null
+
+- name: share_buffer_
+  inputs:
+  - typename: Tensor[]
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: 'bool[]', name: share_dims_and_dtype, default_value: '{}'}
+  outputs:
+  - {typename: 'Tensor[]', name: out, size: x.size(), optional: false, intermediate: false}
+  - {typename: 'Tensor[]', name: xout, size: x.size(), optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  inplace: null
+  backward: null
+
+- name: assert
+  inputs:
+  - typename: Tensor
+    name: cond
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  - typename: Tensor[]
+    name: data
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: 'int64_t', name: summarize, default_value: '-1'}
+  outputs: []
+  no_need_buffer: null
+  data_transform: null
+  kernel:
+    func: [assert]
+    param: [cond, data, summarize]
+    backend: null
+    layout: null
+    data_type:
+      ordered: false
+      candidates: [cond]
+      to_complex_flag: [false]
+    dispatch: {assert: null}
+    force_backend: null
+  inplace: null
+  backward: null
+
+- name: print
+  inputs:
+  - typename: Tensor
+    name: in
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: 'int', name: first_n}
+  - {typename: 'str', name: message}
+  - {typename: 'int', name: summarize}
+  - {typename: 'bool', name: print_tensor_name, default_value: 'true'}
+  - {typename: 'bool', name: print_tensor_type, default_value: 'true'}
+  - {typename: 'bool', name: print_tensor_shape, default_value: 'true'}
+  - {typename: 'bool', name: print_tensor_layout, default_value: 'true'}
+  - {typename: 'bool', name: print_tensor_lod, default_value: 'true'}
+  - {typename: 'str', name: print_phase, default_value: '"BOTH"'}
+  - {typename: 'bool', name: is_forward, default_value: 'true'}
+  outputs:
+    - typename: Tensor
+      name: out
+      optional: false
+      no_need_buffer: false
+      data_transform: {}
+  infer_meta:
+    func: UnchangedInferMeta
+    param: [in]
+  kernel:
+    func: [print_kernel]
+    param: [in, first_n, message, summarize, print_tensor_name, print_tensor_type, print_tensor_shape, print_tensor_layout, print_tensor_lod, print_phase, is_forward ]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {print: null}
+    force_backend: null
+  no_need_buffer: null
+  data_transform: null
+  inplace: null
+  backward: null
+
+- name: add_n_
+  inputs:
+  - typename: Tensor[]
+    name: inputs
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs: []
+  outputs:
+  - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: AddNInferMeta
+    param: [inputs]
+  kernel:
+    func: [add_n]
+    param: [inputs]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  backward: add_n_grad
+
+- name: add_n_with_kernel
+  inputs:
+  - typename: Tensor[]
+    name: inputs
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs: []
+  outputs:
+  - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: AddNInferMeta
+    param: [inputs]
+  kernel:
+    func: [add_n]
+    param: [inputs]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  backward: add_n_grad
+
+- name: write_to_array
+  inputs:
+  - typename: Tensor
+    name: i
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  - typename: Tensor
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs: []
+  outputs:
+  - {typename: 'Tensor[]', name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  backward: write_to_array_grad
+
+- name: lod_array_length
+  inputs:
+  - typename: Tensor[]
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs: []
+  outputs:
+  - {typename: 'Tensor', name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+
+- name: embedding_grad_sparse
+  inputs:
+  - typename: Tensor
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  - typename: Tensor
+    name: weight
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  - typename: Tensor
+    name: out_grad
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs:
+  - {typename: int64_t, name: padding_idx, default_value: '-1'}
+  - {typename: bool, name: sparse, default_value: 'false'}
+  outputs:
+  - {typename: SelectedRows, name: weight_grad, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: EmbeddingGradSparseInferMeta
+    param: [weight]
+  kernel:
+    func: [embedding_sparse_grad]
+    param: [x, weight, out_grad, padding_idx, sparse]
+    backend: null
+    layout: null
+    data_type:
+      ordered: false
+      candidates: [weight]
+      to_complex_flag: [false]
+    dispatch: {embedding_sparse_grad: null}
+    force_backend: null
+  inplace: null
+  view: null
+  backward: null
+
+
+- name: shadow_feed
+  inputs:
+  - typename: Tensor
+    name: x
+    optional: false
+    no_need_buffer: false
+    data_transform: {}
+  attrs: []
+  outputs:
+    - {typename: Tensor, name: out, optional: false, intermediate: false}
+  no_need_buffer: null
+  data_transform: null
+  infer_meta:
+    func: UnchangedInferMeta
+    param: [x]
+  kernel:
+    func: [shadow_feed]
+    param: [x]
+    backend: null
+    layout: null
+    data_type: null
+    dispatch: {fetch: null}
+    force_backend: null
+  inplace: null
+  backward: null

paddle/fluid/ir/dialect/pd_op_vjp_manual.cc → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op_vjp_manual.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/fluid/primitive/rule/vjp/vjp.h"
 #include "paddle/fluid/primitive/type/lazy_tensor.h"
 #include "paddle/ir/core/builtin_op.h"

paddle/fluid/ir/dialect/pd_type.cc → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/dialect/pd_type.h → paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/pd_type_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type_storage.h"
 #include "paddle/ir/core/type.h"
 
 namespace paddle {

paddle/fluid/ir/trait/CMakeLists.txt → paddle/fluid/ir/dialect/paddle_dialect/trait/CMakeLists.txt

@@ -3,4 +3,4 @@ file(GLOB PD_INTERFACE_SRCS "*.cc")
 cc_library(
   pd_trait
   SRCS ${PD_INTERFACE_SRCS}
-  DEPS ir)
+  DEPS ir_core)

paddle/fluid/ir/trait/trait.cc → paddle/fluid/ir/dialect/paddle_dialect/trait/trait.cc

@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/trait/inplace.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/trait/inplace.h"
 
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::InplaceTrait)

paddle/fluid/ir/dialect/paddle_dialect/transforms/CMakeLists.txt

+cc_library(
+  param_to_variable
+  SRCS param_to_variable.cc
+  DEPS pd_dialect_core)

paddle/fluid/ir/dialect/pd_dialect.cc → paddle/fluid/ir/dialect/paddle_dialect/transforms/param_to_variable.cc

@@ -12,18 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/transforms/param_to_variable.h"
+
 #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/framework/data_type.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-// NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
-// paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/pd_type_storage.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/ir/core/dialect_interface.h"
-#include "paddle/ir/core/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/core/dense_tensor.h"
 
@@ -85,80 +79,7 @@ std::unique_ptr<ir::Parameter> ParameterConvertInterface::VariableToParameter(
   }
 }
 
-PaddleDialect::PaddleDialect(ir::IrContext *context)
-    : ir::Dialect(name(), context, ir::TypeId::get<PaddleDialect>()) {
-  initialize();
-}
-
-void PaddleDialect::initialize() {
-  RegisterTypes<paddle::dialect::DenseTensorType>();
-  RegisterTypes<paddle::dialect::SelectedRowsType>();
-
-  RegisterAttributes<paddle::dialect::IntArrayAttribute,
-                     paddle::dialect::DataTypeAttribute,
-                     paddle::dialect::PlaceAttribute,
-                     paddle::dialect::DataLayoutAttribute>();
-
-  // NOTE(zhangbo9674): GET_OP_LIST is defined in pd_op.h which is
-  // generated by op_gen.py, see details in
-  // paddle/fluid/ir/dialect/CMakeLists.txt.
-  // NOTE(Ruting)GET_MANUAL_OP_LIST is define in pd_manual_op.h"
-  // use RegisterOps when list has more than two ops.
-  RegisterOps<
-#define GET_OP_LIST
-#include "paddle/fluid/ir/dialect/pd_op.h"  // NOLINT
-      >();
-  RegisterOp<paddle::dialect::AddNOp>();
-
-  RegisterInterfaces<ParameterConvertInterface>();
-}
-
-void PaddleDialect::PrintType(ir::Type type, std::ostream &os) const {
-  os << type.dialect().name();
-  os << '.';
-  if (auto tensor_type = type.dyn_cast<DenseTensorType>()) {
-    os << "tensor<";
-    for (auto d : phi::vectorize(tensor_type.dims())) {
-      os << d;
-      os << "x";
-    }
-    tensor_type.dtype().Print(os);
-    os << ">";
-  } else if (auto selected_rows_type = type.dyn_cast<SelectedRowsType>()) {
-    os << "selectedrows<";
-    for (auto d : phi::vectorize(selected_rows_type.dims())) {
-      os << d;
-      os << "x";
-    }
-    selected_rows_type.dtype().Print(os);
-    os << ">";
-  }
-}
-
-void PaddleDialect::PrintAttribute(ir::Attribute attr, std::ostream &os) const {
-  if (auto int_array_attr = attr.dyn_cast<IntArrayAttribute>()) {
-    phi::IntArray data = int_array_attr.data();
-    os << "IntArray[";
-    const auto &inner_data = data.GetData();
-    ir::PrintInterleave(
-        inner_data.begin(),
-        inner_data.end(),
-        [&os](int64_t i) { os << i; },
-        [&os]() { os << ","; });
-    os << "]";
-  } else if (auto data_type_attr = attr.dyn_cast<DataTypeAttribute>()) {
-    os << data_type_attr.data();
-  } else if (auto place_type_attr = attr.dyn_cast<PlaceAttribute>()) {
-    os << place_type_attr.data();
-  } else if (auto data_layout_attr = attr.dyn_cast<DataLayoutAttribute>()) {
-    os << data_layout_attr.data();
-  } else {
-    os << "<#AttrNotImplemented>";
-  }
-}
-
 }  // namespace dialect
 }  // namespace paddle
 
-IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::PaddleDialect)
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::ParameterConvertInterface)

paddle/fluid/ir/dialect/paddle_dialect/transforms/param_to_variable.h

+// 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
+//
+//     http://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/variable.h"
+#include "paddle/ir/core/dialect_interface.h"
+#include "paddle/ir/core/parameter.h"
+
+namespace paddle {
+namespace dialect {
+class ParameterConvertInterface
+    : public ir::DialectInterface::Base<ParameterConvertInterface> {
+ public:
+  explicit ParameterConvertInterface(ir::Dialect* dialect) : Base(dialect) {}
+
+  // NOTE(zhangbo): Only support new a CPU Variable.
+  std::shared_ptr<paddle::framework::Variable> ParameterToVariable(
+      ir::Parameter* parameter);
+
+  std::unique_ptr<ir::Parameter> VariableToParameter(
+      paddle::framework::Variable* var);
+};
+
+}  // namespace dialect
+}  // namespace paddle
+
+IR_DECLARE_EXPLICIT_TYPE_ID(paddle::dialect::ParameterConvertInterface)

paddle/fluid/ir/dialect/paddle_dialect/utils/CMakeLists.txt

+cc_library(op_yaml_info_parser SRCS op_yaml_info_parser.cc)
+cc_library(
+  pd_dialect_utils
+  SRCS utils.cc
+  DEPS pd_dialect_core)

paddle/fluid/ir/interface/op_yaml_info_parser.cc → paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/interface/op_yaml_info_parser.h → paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/dialect/op_yaml_info_util.h → paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/pd_type_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type_storage.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_type.h"
 

paddle/fluid/ir/dialect/utils.cc → paddle/fluid/ir/dialect/paddle_dialect/utils/utils.cc

@@ -12,13 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 
 namespace paddle {
 namespace dialect {
 
 const std::unordered_set<std::string> LegacyOpList = {
-    "pd.load_combine", "pd.c_concat", "pd.c_broadcast_"};
+    "pd.fused_softmax_mask_upper_triangle",
+    "pd.fused_softmax_mask_upper_triangle_grad",
+    "pd.load_combine",
+    "pd.c_concat",
+    "pd.load_combine"};
 
 enum class AttrType {
   UNDEFINED = 0,

paddle/fluid/ir/dialect/utils.h → paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h

@@ -16,8 +16,8 @@
 
 // #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/framework/data_type.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_type_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type_storage.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_type.h"
 #include "paddle/phi/common/int_array.h"

paddle/fluid/ir/dialect/paddle_kernel_dialect/CMakeLists.txt

+add_subdirectory(ir)

paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/CMakeLists.txt

+file(GLOB PADDLE_KERNEL_DIALECT_SRCS "*.cc")
+cc_library(
+  pd_kernel_dialect
+  SRCS ${PADDLE_KERNEL_DIALECT_SRCS}
+  DEPS pd_dialect_core)

paddle/fluid/ir/dialect/kernel_attribute.cc → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.cc

@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
 
 IR_DEFINE_EXPLICIT_TYPE_ID(paddle::dialect::KernelAttribute)

paddle/fluid/ir/dialect/kernel_attribute.h → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/kernel_attribute_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute_storage.h"
 #include "paddle/ir/core/attribute.h"
 #include "paddle/phi/core/enforce.h"
 

paddle/fluid/ir/dialect/kernel_dialect.cc → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_dialect.cc

@@ -12,22 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/kernel_dialect.h"
-#include "paddle/fluid/ir/dialect/kernel_op.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-// NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
-// paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/framework/convert_utils.h"
-#include "paddle/fluid/framework/data_type.h"
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
-#include "paddle/fluid/ir/dialect/kernel_type.h"
-#include "paddle/fluid/ir/dialect/kernel_type_storage.h"
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_op.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h"
 #include "paddle/fluid/platform/init_phi.h"
-#include "paddle/ir/core/dialect_interface.h"
-#include "paddle/phi/core/dense_tensor.h"
+#include "paddle/phi/common/place.h"
+#include "paddle/phi/core/ddim.h"
 
 REGISTER_FILE_SYMBOLS(kernel_dialect);
 

paddle/fluid/ir/dialect/kernel_dialect.h → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_dialect.h

@@ -14,9 +14,7 @@
 
 #pragma once
 
-#include "paddle/fluid/framework/variable.h"
 #include "paddle/ir/core/dialect.h"
-#include "paddle/ir/core/parameter.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/dialect/kernel_op.cc → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_op.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/kernel_op.h"
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_op.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/phi/core/enforce.h"
 

paddle/fluid/ir/dialect/kernel_type.cc → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/ir/dialect/kernel_type.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h"
 
 namespace paddle {
 namespace dialect {

paddle/fluid/ir/dialect/kernel_type.h → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/kernel_type_storage.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type_storage.h"
 #include "paddle/ir/core/type.h"
 
 namespace paddle {

paddle/fluid/ir/dialect/kernel_type_storage.h → paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type_storage.h

@@ -16,7 +16,7 @@
 
 #include <type_traits>
 
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/ir/core/type.h"
 #include "paddle/ir/core/utils.h"
 #include "paddle/phi/core/tensor_meta.h"

paddle/fluid/ir/dialect/pd_dialect.h

-// 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
-//
-//     http://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/variable.h"
-#include "paddle/ir/core/dialect.h"
-#include "paddle/ir/core/enforce.h"
-#include "paddle/ir/core/macros.h"
-#include "paddle/ir/core/parameter.h"
-#include "paddle/ir/core/program.h"
-
-namespace paddle {
-namespace dialect {
-class ParameterConvertInterface
-    : public ir::DialectInterface::Base<ParameterConvertInterface> {
- public:
-  explicit ParameterConvertInterface(ir::Dialect* dialect) : Base(dialect) {}
-
-  // NOTE(zhangbo): Only support new a CPU Variable.
-  std::shared_ptr<paddle::framework::Variable> ParameterToVariable(
-      ir::Parameter* parameter);
-
-  std::unique_ptr<ir::Parameter> VariableToParameter(
-      paddle::framework::Variable* var);
-};
-
-class PaddleDialect : public ir::Dialect {
- public:
-  explicit PaddleDialect(ir::IrContext* context);
-
-  static const char* name() { return "pd"; }
-
-  void PrintType(ir::Type type, std::ostream& os) const;
-  void PrintAttribute(ir::Attribute type, std::ostream& os) const;
-
- private:
-  void initialize();
-};
-
-///
-/// \brief APIBuilder is used in IR API for building op
-///
-class APIBuilder {
- public:
-  static APIBuilder& Instance() {
-    static APIBuilder api_builder;
-    return api_builder;
-  }
-  void SetProgram(ir::Program* program) {
-    builder_ = std::make_shared<ir::Builder>(ctx_, program->block());
-  }
-
-  /// Set the insertion point to the specified operation, which will cause
-  /// subsequent insertions to go right before it.
-  void SetInsertionPoint(ir::Operation* op) {
-    IR_ENFORCE(builder_ != nullptr,
-               "builder doesn't hold program, please call SetProgram for "
-               "initialization.");
-    builder_->SetInsertionPoint(op);
-  }
-
-  void ResetInsertionPointToStart() {
-    IR_ENFORCE(builder_ != nullptr,
-               "builder doesn't hold program, please call SetProgram for "
-               "initialization.");
-    builder_->SetInsertionPointToStart(builder_->block());
-  }
-
-  void ResetInsertionPointToEnd() {
-    IR_ENFORCE(builder_ != nullptr,
-               "builder doesn't hold program, please call SetProgram for "
-               "initialization.");
-    builder_->SetInsertionPointToEnd(builder_->block());
-  }
-
-  std::shared_ptr<ir::Builder> GetBuilder() { return builder_; }
-
- private:
-  APIBuilder() : builder_(nullptr) {
-    ctx_ = ir::IrContext::Instance();
-    ctx_->GetOrRegisterDialect<paddle::dialect::PaddleDialect>();
-  }
-
-  DISABLE_COPY_AND_ASSIGN(APIBuilder);
-
-  ir::IrContext* ctx_;
-  std::shared_ptr<ir::Builder> builder_;
-};
-
-}  // namespace dialect
-}  // namespace paddle
-
-IR_DECLARE_EXPLICIT_TYPE_ID(paddle::dialect::PaddleDialect)
-IR_DECLARE_EXPLICIT_TYPE_ID(paddle::dialect::ParameterConvertInterface)

paddle/fluid/ir/phi_kernel_adaptor/CMakeLists.txt

@@ -4,4 +4,4 @@ file(GLOB PHI_KERNEL_ADAPTOR_SRCS "*.cc")
 cc_library(
   phi_kernel_adaptor
   SRCS ${PHI_KERNEL_ADAPTOR_SRCS}
-  DEPS program_translator ir phi_utils)
+  DEPS program_translator pd_kernel_dialect)

paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_adaptor.h

@@ -14,14 +14,14 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_op.h"
@@ -43,8 +43,8 @@
 
 #include "paddle/fluid/platform/init.h"
 
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
 
 #include "glog/logging.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"

paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.cc

@@ -14,11 +14,11 @@
 
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h"
 
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
@@ -33,10 +33,10 @@
 
 #include "paddle/fluid/framework/string_array.h"
 #include "paddle/fluid/framework/tensor_ref_array.h"
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
-#include "paddle/fluid/ir/dialect/kernel_type.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h"
 #include "paddle/fluid/ir_adaptor/translator/op_compat_info.h"
 #include "paddle/phi/core/enforce.h"
 

paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_util.h

@@ -14,11 +14,11 @@
 
 #pragma once
 
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
@@ -33,10 +33,10 @@
 #include "paddle/phi/core/kernel_context.h"
 
 #include "paddle/fluid/framework/operator.h"
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
-#include "paddle/fluid/ir/dialect/kernel_type.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h"
 #include "paddle/phi/core/infermeta_utils.h"
 
 #include "glog/logging.h"

paddle/fluid/ir/transforms/CMakeLists.txt

 cc_library(
   transform_general_functions
   SRCS transform_general_functions.cc
-  DEPS phi pd_dialect ir)
+  DEPS pd_dialect_core)
 
 cc_library(
   pd_op_to_kernel_pass
   SRCS pd_op_to_kernel_pass.cc
-  DEPS phi_utils pd_interface pd_trait ir)
+  DEPS pd_kernel_dialect pd_dialect_core pd_dialect_utils)
 
 cc_library(
   _constant_folding_pass
   SRCS constant_folding_pass.cc
-  DEPS standalone_executor phi pd_op_to_kernel_pass transform_general_functions
-       ir)
+  DEPS standalone_executor pd_op_to_kernel_pass transform_general_functions)

paddle/fluid/ir/transforms/constant_folding_pass.cc

@@ -20,12 +20,12 @@
 
 // NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
 // paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 
 #include "paddle/fluid/framework/new_executor/interpretercore.h"
 #include "paddle/fluid/framework/scope.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
 #include "paddle/fluid/ir/transforms/transform_general_functions.h"
 #include "paddle/ir/core/builtin_op.h"

paddle/fluid/ir/transforms/pd_op_to_kernel_pass.cc

@@ -16,18 +16,18 @@
 
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
 
-#include "paddle/fluid/ir/dialect/kernel_attribute.h"
-#include "paddle/fluid/ir/dialect/kernel_dialect.h"
-#include "paddle/fluid/ir/dialect/kernel_op.h"
-#include "paddle/fluid/ir/dialect/kernel_type.h"
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
-#include "paddle/fluid/ir/trait/inplace.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/trait/inplace.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_op.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_type.h"
+#include "paddle/fluid/platform/place.h"
 #include "paddle/phi/api/lib/data_transform.h"
 #include "paddle/phi/api/lib/kernel_dispatch.h"
 #include "paddle/phi/common/place.h"

paddle/fluid/ir/transforms/transform_general_functions.cc

@@ -14,8 +14,8 @@
 
 #include "paddle/fluid/ir/transforms/transform_general_functions.h"
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/ir/core/builtin_op.h"
 #include "paddle/ir/core/parameter.h"
 #include "paddle/ir/core/program.h"

paddle/fluid/ir_adaptor/translator/attribute_translator.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 #include "paddle/ir/core/enforce.h"
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/common/int_array.h"

paddle/fluid/ir_adaptor/translator/op_translator.cc

@@ -23,10 +23,10 @@
 #include <vector>
 
 #include "paddle/fluid/framework/op_desc.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/fluid/ir_adaptor/translator/attribute_translator.h"
 #include "paddle/fluid/ir_adaptor/translator/op_compat_info.h"
 #include "paddle/fluid/ir_adaptor/translator/program_translator.h"
@@ -42,7 +42,7 @@
 
 // NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
 // paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 
 namespace paddle {
 namespace translator {

paddle/fluid/ir_adaptor/translator/translate.cc

@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
 #include "paddle/fluid/ir_adaptor/translator/program_translator.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/program.h"

paddle/fluid/ir_adaptor/translator/translate.h

@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
 #include "paddle/ir/core/program.h"
 
 namespace paddle {

paddle/fluid/ir_adaptor/translator/type_translator.cc

@@ -15,8 +15,8 @@
 #include "paddle/fluid/ir_adaptor/translator/type_translator.h"
 
 #include "paddle/fluid/framework/framework.pb.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/pd_type_storage.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type_storage.h"
 #include "paddle/ir/core/builtin_type.h"
 
 namespace paddle {

paddle/fluid/platform/CMakeLists.txt

@@ -108,7 +108,7 @@ endif()
 cc_library(
   init
   SRCS init.cc
-  DEPS device_context phi memcpy pd_dialect ir)
+  DEPS device_context phi memcpy pd_dialect)
 
 # memcpy depends on device_context, here add deps individually for
 # avoiding cycle dependencies

paddle/fluid/platform/init.cc

@@ -51,7 +51,7 @@ limitations under the License. */
 #include "paddle/fluid/platform/device/ipu/ipu_info.h"
 #endif
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
 #include "paddle/fluid/memory/allocation/allocator_facade.h"
 #include "paddle/fluid/memory/memory.h"
 #include "paddle/fluid/platform/flags.h"

paddle/fluid/primitive/backend/CMakeLists.txt

@@ -7,4 +7,4 @@ endif()
 cc_library(
   primitive_backend_static_experimental
   SRCS static_backend.cc
-  DEPS pd_dialect)
+  DEPS pd_dialect_api)

paddle/fluid/primitive/backend/static_backend.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/primitive/backend/static_backend.h"
-#include "paddle/fluid/ir/dialect/pd_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_api.h"
 #include "paddle/fluid/primitive/primitive/primitive.h"
 #include "paddle/fluid/primitive/type/lazy_tensor.h"
 

paddle/fluid/primitive/rule/vjp/CMakeLists.txt

@@ -4,4 +4,3 @@ cc_library(
   SRCS ${VJP_SRCS}
   DEPS primitive_backend_static_experimental static_global_utils
        primitive_static_utils_experimental)
-add_dependencies(primitive_vjp_experimental pd_dialect)

paddle/fluid/primitive/rule/vjp/vjp.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/primitive/rule/vjp/vjp.h"
-#include "paddle/fluid/ir/dialect/pd_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_api.h"
 #include "paddle/fluid/prim/utils/static/static_global_utils.h"
 #include "paddle/fluid/primitive/backend/static_backend.h"
 #include "paddle/fluid/primitive/rule/vjp/details.h"

paddle/fluid/primitive/type/lazy_tensor.h

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #pragma once
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/value.h"
 #include "paddle/phi/core/ddim.h"
 #include "paddle/phi/core/extended_tensor.h"

paddle/fluid/pybind/ir.cc

@@ -24,10 +24,11 @@
 
 #include "paddle/fluid/pybind/pybind_variant_caster.h"
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/fluid/ir_adaptor/translator/translate.h"
 #include "paddle/ir/core/block.h"
 #include "paddle/ir/core/builtin_attribute.h"

paddle/fluid/pybind/pybind.cc

@@ -195,7 +195,7 @@ limitations under the License. */
 #include "paddle/fluid/eager/api/utils/global_utils.h"
 #include "paddle/fluid/eager/nan_inf_utils.h"
 #include "paddle/fluid/imperative/layout_autotune.h"
-#include "paddle/fluid/ir/interface/vjp.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/vjp.h"
 #include "paddle/fluid/prim/utils/eager/eager_tensor_operants.h"
 #include "paddle/fluid/prim/utils/static/static_tensor_operants.h"
 #include "paddle/fluid/pybind/eager_utils.h"

paddle/fluid/pybind/static_op_function.cc

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/fluid/pybind/static_op_function.h"
-#include "paddle/fluid/ir/dialect/pd_api.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_api.h"
 #include "paddle/fluid/pybind/eager_utils.h"
 #include "paddle/fluid/pybind/exception.h"
 #include "paddle/fluid/pybind/op_function_common.h"

test/cpp/ir/cinn/jit_instruction_test.cc

@@ -22,8 +22,8 @@
 
 #include "paddle/fluid/framework/new_executor/interpretercore.h"
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
 

test/cpp/ir/cinn/new_ir_compiler_test.cc

@@ -19,8 +19,8 @@
 #include <string>
 #include <unordered_map>
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
 

test/cpp/ir/core/CMakeLists.txt

-cc_test_old(type_test SRCS type_test.cc DEPS ir gtest)
+cc_test_old(
+  type_test
+  SRCS
+  type_test.cc
+  DEPS
+  ir
+  gtest
+  pd_dialect)
 cc_test_old(ir_attribute_test SRCS ir_attribute_test.cc DEPS ir gtest)
 cc_test_old(ir_value_test SRCS ir_value_test.cc DEPS ir gtest)
 cc_test_old(ir_op_test SRCS ir_op_test.cc DEPS ir gtest)
@@ -32,6 +39,7 @@ cc_test_old(
   pd_op_to_kernel_pass
   program_translator
   pd_dialect
+  pd_kernel_dialect
   phi_kernel_adaptor
   ir
   phi

test/cpp/ir/core/ir_exe_test.cc

@@ -14,11 +14,11 @@
 
 #include <gtest/gtest.h>
 
-#include "paddle/fluid/ir/dialect/op_yaml_info_util.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_util.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_op.h"
@@ -40,7 +40,7 @@
 
 #include "paddle/fluid/platform/init.h"
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_adaptor.h"
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"

test/cpp/ir/core/ir_infershape_test.cc

@@ -32,7 +32,7 @@
 #include "paddle/phi/core/kernel_context.h"
 #include "paddle/phi/core/kernel_factory.h"
 
-#include "paddle/fluid/ir/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
 #include "paddle/fluid/platform/init.h"
 #include "paddle/phi/core/infermeta_utils.h"
 #include "paddle/phi/infermeta/nullary.h"

test/cpp/ir/core/ir_program_test.cc

@@ -14,10 +14,10 @@
 
 #include <gtest/gtest.h>
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/block.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_dialect.h"
@@ -30,7 +30,8 @@
 #include "paddle/phi/kernels/elementwise_add_kernel.h"
 // NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
 // paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/transforms/param_to_variable.h"
 
 class AddOp : public ir::Op<AddOp> {
  public:

test/cpp/ir/core/ir_type_converter_test.cc

@@ -18,7 +18,7 @@
 #include "paddle/fluid/framework/convert_utils.h"
 #include "paddle/fluid/framework/data_type.h"
 #include "paddle/fluid/framework/var_desc.h"
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/fluid/ir_adaptor/translator/type_translator.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_type.h"

test/cpp/ir/core/op_yaml_info_parser_test.cc

@@ -14,22 +14,22 @@
 
 #include <gtest/gtest.h>
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/interface/op_yaml_info_parser.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/op_yaml_info_parser.h"
 #include "paddle/ir/core/builder.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
 
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_op.h"
 
 #include "paddle/ir/core/utils.h"
 
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 
 TEST(ir_op_info_test, op_op_info_test) {
   ir::IrContext* ctx = ir::IrContext::Instance();

test/cpp/ir/core/program_translator_test.cc

@@ -22,7 +22,7 @@
 #include "paddle/fluid/framework/framework.pb.h"
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/program_desc.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
 #include "paddle/fluid/ir_adaptor/translator/translate.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/dialect.h"

test/cpp/ir/core/scalar_attribute_test.cc

@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 #include "paddle/ir/core/attribute.h"
 #include "paddle/ir/core/builtin_attribute.h"
 #include "paddle/ir/core/builtin_dialect.h"

test/cpp/ir/core/type_test.cc

@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 #include <unordered_map>
 
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_type.h"
 #include "paddle/ir/core/dialect.h"

test/cpp/ir/kernel_dialect/CMakeLists.txt

@@ -5,7 +5,7 @@ cc_test_old(
   DEPS
   pd_op_to_kernel_pass
   program_translator
-  pd_dialect
+  pd_kernel_dialect
   phi_kernel_adaptor
   pd_trait
   ir

test/cpp/ir/kernel_dialect/ir_kernel_dialect_pass_test.cc

@@ -19,13 +19,13 @@
 #include "paddle/fluid/framework/tensor.h"
 #include "paddle/fluid/framework/variable.h"
 #include "paddle/fluid/framework/variable_helper.h"
-#include "paddle/fluid/ir/dialect/kernel_dialect.h"
-#include "paddle/fluid/ir/dialect/kernel_op.h"
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_kernel_dialect/ir/kernel_op.h"
 #include "paddle/fluid/ir/phi_kernel_adaptor/phi_kernel_adaptor.h"
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
 #include "paddle/fluid/platform/init.h"

test/cpp/ir/pass/pass_manager_test.cc

@@ -17,12 +17,12 @@
 
 // NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
 // paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/ir/core/builtin_dialect.h"
 #include "paddle/ir/core/builtin_op.h"
 #include "paddle/ir/core/builtin_type.h"

test/cpp/ir/pattern_rewrite/pattern_rewrite_test.cc

@@ -20,7 +20,7 @@
 #include <sstream>
 #include <vector>
 
-#include "paddle/fluid/ir/dialect/pd_attribute.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
 #include "paddle/fluid/ir/transforms/constant_folding_pass.h"
 #include "paddle/fluid/ir/transforms/transform_general_functions.h"
 #include "paddle/ir/core/builder.h"
@@ -46,15 +46,15 @@
 
 // NOTE(zhangbo9674): File pd_op.h is generated by op_gen.py, see details in
 // paddle/fluid/ir/dialect/CMakeLists.txt.
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 #include "paddle/phi/core/ddim.h"
 
 // build Conv2dFusionOp
-#include "paddle/fluid/ir/interface/infermeta.h"
-#include "paddle/fluid/ir/interface/op_yaml_info.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/infermeta.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
 #include "paddle/ir/core/op_base.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
 #include "paddle/phi/infermeta/multiary.h"

test/cpp/new_executor/CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT WIN32)
   cc_test(
     standalone_executor_new_ir_test
     SRCS standalone_executor_new_ir_test.cc
-    DEPS phi_kernel_adaptor pd_dialect ir)
+    DEPS phi_kernel_adaptor pd_dialect pd_kernel_dialect ir)
 endif()
 
 set(OPS

test/cpp/new_executor/standalone_executor_new_ir_test.cc

@@ -23,14 +23,14 @@
 #include "paddle/phi/core/kernel_registry.h"
 
 #include "paddle/fluid/framework/new_executor/new_ir_interpreter.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
 #include "paddle/ir/core/builder.h"
 #include "paddle/ir/core/ir_context.h"
 #include "paddle/ir/core/program.h"
 
-#include "paddle/fluid/ir/dialect/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
 
 #include "paddle/fluid/platform/init_phi.h"
 

test/cpp/prim/test_vjp.cc

@@ -16,10 +16,11 @@
 
 #include "paddle/fluid/framework/new_executor/new_ir_interpreter.h"
 #include "paddle/fluid/framework/new_executor/standalone_executor.h"
-#include "paddle/fluid/ir/dialect/pd_dialect.h"
-#include "paddle/fluid/ir/dialect/pd_op.h"
-#include "paddle/fluid/ir/dialect/pd_type.h"
-#include "paddle/fluid/ir/dialect/utils.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/api_builder.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
+#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
 #include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
 #include "paddle/fluid/platform/init_phi.h"
 #include "paddle/ir/core/block.h"