PaddlePaddle
diff --git a/‎cmake/cinn.cmake
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎cmake/cinn.cmake
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎cmake/inference_lib.cmake
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎cmake/inference_lib.cmake
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/CMakeLists.txt
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/cinn/hlir/dialect/CMakeLists.txt
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/dialect/generated/cinn_ops.parsed.yaml
Copy file name to clipboard
-31Lines changed: 0 additions & 31 deletions b/‎paddle/cinn/hlir/dialect/generated/cinn_ops.parsed.yaml
Copy file name to clipboard
-31Lines changed: 0 additions & 31 deletions
diff --git a/‎paddle/cinn/hlir/dialect/cinn_dialect/CMakeLists.txt renamed to ‎paddle/cinn/hlir/dialect/operator/CMakeLists.txt
Copy file name to clipboard b/‎paddle/cinn/hlir/dialect/cinn_dialect/CMakeLists.txt renamed to ‎paddle/cinn/hlir/dialect/operator/CMakeLists.txt
Copy file name to clipboard
diff --git a/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/CMakeLists.txt renamed to ‎paddle/cinn/hlir/dialect/operator/ir/CMakeLists.txt
Copy file name to clipboard
+11-12Lines changed: 11 additions & 12 deletions b/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/CMakeLists.txt renamed to ‎paddle/cinn/hlir/dialect/operator/ir/CMakeLists.txt
Copy file name to clipboard
+11-12Lines changed: 11 additions & 12 deletions
diff --git a/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_dialect.cc renamed to ‎paddle/cinn/hlir/dialect/operator/ir/op_dialect.cc
Copy file name to clipboard
+9-8Lines changed: 9 additions & 8 deletions b/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_dialect.cc renamed to ‎paddle/cinn/hlir/dialect/operator/ir/op_dialect.cc
Copy file name to clipboard
+9-8Lines changed: 9 additions & 8 deletions
diff --git a/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_dialect.h renamed to ‎paddle/cinn/hlir/dialect/operator/ir/op_dialect.h
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_dialect.h renamed to ‎paddle/cinn/hlir/dialect/operator/ir/op_dialect.h
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_ops.yaml renamed to ‎paddle/cinn/hlir/dialect/operator/ir/ops.yaml
Copy file name to clipboard b/‎paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_ops.yaml renamed to ‎paddle/cinn/hlir/dialect/operator/ir/ops.yaml
Copy file name to clipboard
@@ -164,8 +164,8 @@ cinn_cc_library(
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ZLIB::ZLIB)
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ${core_deps})
 if(NOT CINN_ONLY)
-  target_link_libraries(cinnapi pd_dialect phi)
-  add_dependencies(cinnapi pd_dialect phi)
+  target_link_libraries(cinnapi pd_op_dialect phi)
+  add_dependencies(cinnapi pd_op_dialect phi)
 endif()
 
 target_link_libraries(cinnapi ${PYTHON_LIBRARIES})
@@ -222,8 +222,8 @@ function(gen_cinncore LINKTYPE)
   add_dependencies(${CINNCORE_TARGET} GEN_LLVM_RUNTIME_IR_HEADER ZLIB::ZLIB)
   add_dependencies(${CINNCORE_TARGET} GEN_LLVM_RUNTIME_IR_HEADER ${core_deps})
   if(NOT CINN_ONLY)
-    target_link_libraries(${CINNCORE_TARGET} pd_dialect phi)
-    add_dependencies(${CINNCORE_TARGET} pd_dialect phi)
+    target_link_libraries(${CINNCORE_TARGET} pd_op_dialect phi)
+    add_dependencies(${CINNCORE_TARGET} pd_op_dialect phi)
   endif()
 
   add_dependencies(${CINNCORE_TARGET} pybind)
 
@@ -269,10 +269,10 @@ else()
       DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
   endif()
   if(WITH_SHARED_IR)
-    set(paddle_ir_lib ${PADDLE_BINARY_DIR}/paddle/ir/libir.*)
+    set(paddle_pir_lib ${PADDLE_BINARY_DIR}/paddle/pir/libpir.*)
     copy(
       inference_lib_dist
-      SRCS ${paddle_ir_lib}
+      SRCS ${paddle_pir_lib}
       DSTS ${PADDLE_INFERENCE_INSTALL_DIR}/paddle/lib)
   endif()
 endif()
 
@@ -3,7 +3,7 @@ set(PYTHON_TESTS_DIR
     CACHE INTERNAL "python tests directory")
 
 add_subdirectory(utils)
-add_subdirectory(ir)
+add_subdirectory(pir)
 add_subdirectory(scripts)
 add_subdirectory(testing)
 add_subdirectory(phi)
 
@@ -1,2 +1,2 @@
-add_subdirectory(cinn_dialect)
-add_subdirectory(runtime_dialect)
+add_subdirectory(operator)
+add_subdirectory(runtime)
@@ -1,31 +1,30 @@
-# TODO(Aurelius84): new_ir_compiler depends on pd_dialect and could
+# TODO(Aurelius84): new_ir_compiler depends on pd_op_dialect and could
 # not found under CINN_ONLY mode
 if(NOT CINN_ONLY)
   set(CINN_DIALECT_BINARY_DIR
-      "${PADDLE_BINARY_DIR}/paddle/cinn/hlir/dialect/cinn_dialect/ir")
+      "${PADDLE_BINARY_DIR}/paddle/cinn/hlir/dialect/operator/ir")
 
-  # Generate cinn_dialect files defining op using op_gen_file
+  # Generate cinn_op_dialect files defining op using op_gen_file
   set(cinn_op_gen_parsed_yaml_file
       ${PADDLE_SOURCE_DIR}/paddle/fluid/operators/generator/parse_op.py)
 
   set(cinn_op_gen_file
-      ${PADDLE_SOURCE_DIR}/paddle/fluid/ir/dialect/op_generator/op_gen.py)
+      ${PADDLE_SOURCE_DIR}/paddle/fluid/pir/dialect/op_generator/op_gen.py)
 
   set(cinn_op_compat_yaml_file
       ${PADDLE_SOURCE_DIR}/paddle/phi/api/yaml/op_compat.yaml)
 
   set(cinn_op_yaml_file
-      ${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_ops.yaml
-  )
+      ${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/operator/ir/ops.yaml)
 
   set(parsed_op_dir ${PADDLE_SOURCE_DIR}/paddle/cinn/hlir/dialect/generated)
 
-  set(cinn_op_parsed_yaml_file ${parsed_op_dir}/cinn_ops.parsed.yaml)
+  set(cinn_op_parsed_yaml_file ${parsed_op_dir}/ops.parsed.yaml)
 
   set(cinn_op_parsed_yaml_files ${cinn_op_parsed_yaml_file})
 
   set(cinn_op_namespace cinn,dialect)
-  set(cinn_dialect_name cinn)
+  set(cinn_op_dialect_name cinn_op)
   set(cinn_op_header_file ${CINN_DIALECT_BINARY_DIR}/cinn_op.h)
   set(cinn_op_source_file ${CINN_DIALECT_BINARY_DIR}/cinn_op.cc)
   set(cinn_op_header_file_tmp ${cinn_op_header_file}.tmp)
@@ -44,7 +43,7 @@ if(NOT CINN_ONLY)
       ${PYTHON_EXECUTABLE} ${cinn_op_gen_file} --op_yaml_files
       ${cinn_op_parsed_yaml_files} --op_compat_yaml_file
       ${cinn_op_compat_yaml_file} --namespaces ${cinn_op_namespace}
-      --dialect_name ${cinn_dialect_name} --op_def_h_file
+      --dialect_name ${cinn_op_dialect_name} --op_def_h_file
       ${cinn_op_header_file_tmp} --op_def_cc_file ${cinn_op_source_file_tmp}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${cinn_op_header_file_tmp}
             ${cinn_op_header_file}
@@ -54,8 +53,8 @@ if(NOT CINN_ONLY)
             ${cinn_op_compat_yaml_file}
     VERBATIM)
 
-  cinn_cc_library(cinn_dialect SRCS cinn_dialect.cc ${cinn_op_source_file} DEPS
-                  pd_dialect)
+  cinn_cc_library(cinn_op_dialect SRCS op_dialect.cc ${cinn_op_source_file}
+                  DEPS pd_op_dialect)
 
-  target_include_directories(cinn_dialect PRIVATE ${CINN_DIALECT_BINARY_DIR})
+  target_include_directories(cinn_op_dialect PRIVATE ${CINN_DIALECT_BINARY_DIR})
 endif()
@@ -12,31 +12,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_dialect.h"
+#include "paddle/cinn/hlir/dialect/operator/ir/op_dialect.h"
 // NOTE(chenxi67): File cinn_op.h is generated by op_gen.py, see details in
 // paddle/cinn/hlir/dialect/CMakeLists.txt.
-#include "paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_op.h"
+#include "paddle/cinn/hlir/dialect/operator/ir/cinn_op.h"
 
 namespace cinn {
 namespace dialect {
 
-CinnDialect::CinnDialect(::ir::IrContext* context)
-    : ::ir::Dialect(
-          name(), context, ::ir::TypeId::get<cinn::dialect::CinnDialect>()) {
+OperatorDialect::OperatorDialect(::pir::IrContext* context)
+    : ::pir::Dialect(name(),
+                     context,
+                     ::pir::TypeId::get<cinn::dialect::OperatorDialect>()) {
   this->initialize();
 }
 
-void CinnDialect::initialize() {
+void OperatorDialect::initialize() {
   // NOTE(chenxi67): GET_OP_LIST is defined in cinn_op.h which is
   // generated by op_gen.py, see details in
   // paddle/cinn/hlir/dialect/CMakeLists.txt.
   RegisterOps<
 #define GET_OP_LIST
-#include "paddle/cinn/hlir/dialect/cinn_dialect/ir/cinn_op.h"  // NOLINT
+#include "paddle/cinn/hlir/dialect/operator/ir/cinn_op.h"  // NOLINT
       >();
 }
 
 }  // namespace dialect
 }  // namespace cinn
 
-IR_DEFINE_EXPLICIT_TYPE_ID(cinn::dialect::CinnDialect)
+IR_DEFINE_EXPLICIT_TYPE_ID(cinn::dialect::OperatorDialect)
@@ -14,16 +14,16 @@
 
 #pragma once
 
-#include "paddle/ir/core/dialect.h"
+#include "paddle/pir/core/dialect.h"
 
 namespace cinn {
 namespace dialect {
 
-class CinnDialect : public ::ir::Dialect {
+class OperatorDialect : public ::pir::Dialect {
  public:
-  explicit CinnDialect(::ir::IrContext* context);
+  explicit OperatorDialect(::pir::IrContext* context);
 
-  static const char* name() { return "cinn"; }
+  static const char* name() { return "cinn_op"; }
 
  private:
   void initialize();
@@ -32,4 +32,4 @@ class CinnDialect : public ::ir::Dialect {
 }  // namespace dialect
 }  // namespace cinn
 
-IR_DECLARE_EXPLICIT_TYPE_ID(cinn::dialect::CinnDialect)
+IR_DECLARE_EXPLICIT_TYPE_ID(cinn::dialect::OperatorDialect)