PaddlePaddle
diff --git a/‎cmake/generic.cmake
Copy file name to clipboard
+9-6Lines changed: 9 additions & 6 deletions b/‎cmake/generic.cmake
Copy file name to clipboard
+9-6Lines changed: 9 additions & 6 deletions
diff --git a/‎paddle/cinn/hlir/dialect/operator/ir/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/ir/CMakeLists.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/operator/ir/attribute_storage.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/cinn/hlir/dialect/operator/ir/attribute_storage.h
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/cinn/hlir/dialect/operator/ir/op_attribute.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/ir/op_attribute.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/cinn/hlir/dialect/operator/ir/op_attribute.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/framework/CMakeLists.txt
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions b/‎paddle/cinn/hlir/framework/CMakeLists.txt
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions
diff --git a/‎paddle/cinn/hlir/framework/new_ir/CMakeLists.txt
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions b/‎paddle/cinn/hlir/framework/new_ir/CMakeLists.txt
Copy file name to clipboard
-4Lines changed: 0 additions & 4 deletions
diff --git a/‎paddle/cinn/hlir/framework/new_ir/utils.cc
Copy file name to clipboard
-90Lines changed: 0 additions & 90 deletions b/‎paddle/cinn/hlir/framework/new_ir/utils.cc
Copy file name to clipboard
-90Lines changed: 0 additions & 90 deletions
@@ -499,12 +499,15 @@ function(cc_test_run TARGET_NAME)
       NAME ${TARGET_NAME}
       COMMAND ${cc_test_COMMAND} ${cc_test_ARGS}
       WORKING_DIRECTORY ${cc_test_DIR})
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_cpu_deterministic=true)
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_init_allocated_mem=true)
-    set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
-                                              FLAGS_cudnn_deterministic=true)
+    set_property(
+      TEST ${TARGET_NAME}
+      PROPERTY
+        ENVIRONMENT
+        FLAGS_cpu_deterministic=true
+        FLAGS_init_allocated_mem=true
+        FLAGS_cudnn_deterministic=true
+        LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PADDLE_BINARY_DIR}/python/paddle/libs:${PADDLE_BINARY_DIR}/python/paddle/base
+    )
     # No unit test should exceed 2 minutes.
     if(WIN32)
       set_tests_properties(${TARGET_NAME} PROPERTIES TIMEOUT 150)
 
@@ -1,4 +1,4 @@
-# TODO(Aurelius84): new_ir_compiler depends on pd_op_dialect and could
+# TODO(Aurelius84): pir_compiler depends on pd_op_dialect and could
 # not found under CINN_ONLY mode
 if(NOT CINN_ONLY)
   set(CINN_DIALECT_BINARY_DIR
 
@@ -18,8 +18,8 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include "paddle/cinn/hlir/framework/new_ir/utils.h"
 #include "paddle/cinn/hlir/framework/op.h"
+#include "paddle/cinn/hlir/framework/pir/utils.h"
 #include "paddle/pir/core/attribute_base.h"
 #include "paddle/pir/core/operation.h"
 
@@ -51,7 +51,7 @@ struct GroupInfo {
  private:
   void Initialize() {
     op_pattern_kind = hlir::framework::OpPatternKind::kElementWise;
-    fn_name = hlir::framework::newir::CompatibleInfo::GroupOpsName(ops);
+    fn_name = hlir::framework::pir::CompatibleInfo::GroupOpsName(ops);
   }
 };
 
@@ -78,7 +78,7 @@ struct GroupInfoAttributeStorage : public pir::AttributeStorage {
 };
 
 struct JITInfoAttributeStorage : public pir::AttributeStorage {
-  using ParamKey = cinn::hlir::framework::newir::CUDAJITInfo;
+  using ParamKey = cinn::hlir::framework::pir::CUDAJITInfo;
   explicit JITInfoAttributeStorage(const ParamKey& key) : data_(key) {}
 
   static JITInfoAttributeStorage* Construct(const ParamKey& key) {
 
@@ -20,7 +20,7 @@ const GroupInfo &GroupInfoAttribute::data() const {
   return storage()->GetAsKey();
 }
 
-const cinn::hlir::framework::newir::CUDAJITInfo &CUDAJITInfoAttribute::data()
+const cinn::hlir::framework::pir::CUDAJITInfo &CUDAJITInfoAttribute::data()
     const {
   return storage()->GetAsKey();
 }
 
@@ -44,7 +44,7 @@ class CUDAJITInfoAttribute : public pir::Attribute {
     return storage() < right.storage();
   }
 
-  const cinn::hlir::framework::newir::CUDAJITInfo& data() const;
+  const cinn::hlir::framework::pir::CUDAJITInfo& data() const;
 };
 
 }  // namespace dialect
 
@@ -15,7 +15,7 @@
 #include "paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.h"
 
 #include "paddle/cinn/hlir/dialect/operator/ir/op_attribute.h"
-#include "paddle/cinn/hlir/framework/new_ir_compiler.h"
+#include "paddle/cinn/hlir/framework/pir_compiler.h"
 #include "paddle/pir/core/builtin_attribute.h"
 #include "paddle/pir/core/enforce.h"
 
@@ -35,7 +35,7 @@ void JitKernelOp::VerifySig() {
       "Type of attribute: instruction is not right.");
 }
 
-const hlir::framework::newir::CUDAJITInfo& JitKernelOp::cuda_jit_info() {
+const hlir::framework::pir::CUDAJITInfo& JitKernelOp::cuda_jit_info() {
   return attributes()
       .at(kAttrName)
       .dyn_cast<cinn::dialect::CUDAJITInfoAttribute>()
 
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "paddle/cinn/hlir/framework/new_ir/utils.h"
+#include "paddle/cinn/hlir/framework/pir/utils.h"
 #include "paddle/pir/core/op_base.h"
 
 namespace cinn {
@@ -44,7 +44,7 @@ class JitKernelOp : public ::pir::Op<JitKernelOp> {
   static constexpr char* kAttrName = "jit_info";
   static const char* attributes_name[attributes_num];
 
-  const hlir::framework::newir::CUDAJITInfo& cuda_jit_info();
+  const hlir::framework::pir::CUDAJITInfo& cuda_jit_info();
 
   void VerifySig();
 };
 
@@ -1,4 +1,4 @@
-add_subdirectory(new_ir)
+add_subdirectory(pir)
 core_gather_headers()
 
 gather_srcs(
@@ -24,11 +24,10 @@ gather_srcs(
   visualize_helper.cc
   compile_error.cc)
 
-# TODO(Aurelius84): new_ir_compiler depends on pd_op_dialect and could
+# TODO(Aurelius84): pir_compiler depends on pd_op_dialect and could
 # not found under CINN_ONLY mode
 if(NOT CINN_ONLY)
-  cinn_cc_library(new_ir_compiler SRCS new_ir_compiler.cc DEPS cinnapi
-                  pd_op_dialect)
+  cinn_cc_library(pir_compiler SRCS pir_compiler.cc DEPS cinnapi pd_op_dialect)
 endif()
 
 if(WITH_CUDA)
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# TODO(Aurelius84): new_ir_compiler depends on pd_op_dialect and could`
	`1`	`+# TODO(Aurelius84): pir_compiler depends on pd_op_dialect and could`
`2`	`2`	`# not found under CINN_ONLY mode`
`3`	`3`	`if(NOT CINN_ONLY)`
`4`	`4`	`set(CINN_DIALECT_BINARY_DIR`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ const GroupInfo &GroupInfoAttribute::data() const {`
`20`	`20`	`return storage()->GetAsKey();`
`21`	`21`	`}`
`22`	`22`
`23`		`-const cinn::hlir::framework::newir::CUDAJITInfo &CUDAJITInfoAttribute::data()`
	`23`	`+const cinn::hlir::framework::pir::CUDAJITInfo &CUDAJITInfoAttribute::data()`
`24`	`24`	`const {`
`25`	`25`	`return storage()->GetAsKey();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class CUDAJITInfoAttribute : public pir::Attribute {`
`44`	`44`	`return storage() < right.storage();`
`45`	`45`	`}`
`46`	`46`
`47`		`- const cinn::hlir::framework::newir::CUDAJITInfo& data() const;`
	`47`	`+ const cinn::hlir::framework::pir::CUDAJITInfo& data() const;`
`48`	`48`	`};`
`49`	`49`
`50`	`50`	`} // namespace dialect`