[NewIR]Split PaddleDialect and KernelDialect and Implement Layered Compailation

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

@@ -1,5 +1,3 @@
-add_subdirectory(interface)
-add_subdirectory(trait)
 add_subdirectory(dialect)
 add_subdirectory(transforms)
 add_subdirectory(phi_kernel_adaptor)

paddle/fluid/ir/dialect/CMakeLists.txt

@@ -1,86 +1,2 @@
-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,17 +29,17 @@
 #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}
 
 """
 
 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 @@
 #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 @@ class {op_name} : public ir::Op<{op_name}{interfaces}{traits}> {{
 # =====================================
 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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,97 @@
+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)