Skip to content

Commit 6c736fe

Browse files
Aurelius84Aurelius84
committed
fix merge conflict
1 parent ad788c6 commit 6c736fe

File tree

21 files changed

+58
-162
lines changed

21 files changed

+58
-162
lines changed

‎paddle/cinn/hlir/dialect/runtime/ir/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
if(NOT CINN_ONLY)
22
cinn_cc_library(cinn_runtime_dialect SRCS runtime_dialect.cc jit_kernel_op.cc
3-
DEPS ir_core)
3+
DEPS pir_core)
44
endif()

‎paddle/cinn/runtime/cuda/float16.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@ __host__ __device__ inline bool(isfinite)(const float16& a) {
597597

598598
__host__ __device__ inline float16(abs)(const float16& a) {
599599
#if defined(CINN_CUDA_FP16) && (defined(__CUDA_ARCH__) && __CUDA_ARCH__ >= 530)
600-
return float16(__habs(a.to_half()));
600+
return static_cast<float16>(__habs(a.to_half()));
601601
#else
602-
return float16(fabsf(static_cast<float>(a)));
602+
return static_cast<float16>(fabsf(static_cast<float>(a)));
603603
#endif
604604
}
605605

‎paddle/fluid/framework/executor_cache.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include "paddle/fluid/framework/new_executor/interpretercore.h"
1818
#include "paddle/fluid/framework/op_info.h"
19-
#include "paddle/fluid/ir/transforms/inplace_pass.h"
20-
#include "paddle/fluid/ir/transforms/pd_op_to_kernel_pass.h"
2119
#include "paddle/fluid/ir_adaptor/translator/translate.h"
20+
#include "paddle/fluid/pir/transforms/inplace_pass.h"
21+
#include "paddle/fluid/pir/transforms/pd_op_to_kernel_pass.h"
2222
#include "paddle/pir/core/program.h"
2323
#include "paddle/pir/core/value.h"
2424
#include "paddle/pir/pass/pass.h"
@@ -444,8 +444,8 @@ std::unique_ptr<::pir::Program> ConstructFowardIrProgram(
444444

445445
auto ir_res = paddle::dialect::PdOpLowerToKernelPass(program.get());
446446

447-
::ir::PassManager pm(::ir::IrContext::Instance(), 3);
448-
pm.AddPass(::ir::CreateInplacePass());
447+
::pir::PassManager pm(::pir::IrContext::Instance(), 3);
448+
pm.AddPass(::pir::CreateInplacePass());
449449
pm.Run(ir_res.get());
450450

451451
return ir_res;
@@ -521,8 +521,8 @@ std::unique_ptr<::pir::Program> ConstructBackwardIrProgram(
521521

522522
auto res = paddle::dialect::PdOpLowerToKernelPass(program.get());
523523

524-
::ir::PassManager pm(::ir::IrContext::Instance(), 3);
525-
pm.AddPass(::ir::CreateInplacePass());
524+
::pir::PassManager pm(::pir::IrContext::Instance(), 3);
525+
pm.AddPass(::pir::CreateInplacePass());
526526
pm.Run(res.get());
527527

528528
return res;

‎paddle/fluid/framework/new_executor/new_ir_interpreter.cc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#include "paddle/pir/core/builtin_attribute.h"
5151

5252
PHI_DECLARE_bool(enable_new_ir_in_executor);
53-
5453
PHI_DECLARE_bool(enable_new_ir_in_executor_trace_run);
5554

5655
namespace paddle {
@@ -921,12 +920,12 @@ FetchList NewIRInterpreter::Run(const std::vector<std::string>& feed_names,
921920
std::stringstream ss;
922921
ss << this;
923922
::pir::BuildScope(*ir_program_->block(),
924-
InnerScope(),
925-
ss.str(),
926-
&value_2_var_name_,
927-
&variable_2_var_name_,
928-
&var_name_2_id_,
929-
&variable_list_);
923+
InnerScope(),
924+
ss.str(),
925+
&value_2_var_name_,
926+
&variable_2_var_name_,
927+
&var_name_2_id_,
928+
&variable_list_);
930929

931930
interpreter::BuildId2VarName(var_name_2_id_, &id_2_var_name_);
932931

‎paddle/fluid/pir/dialect/kernel/ir/legacy_kernel_op.cc

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎paddle/fluid/pir/dialect/kernel/ir/legacy_kernel_op.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎paddle/fluid/pir/dialect/op_generator/op_interface_gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
}
9494

9595
attr_data_map = {
96-
'ir::StrAttribute': 'AsString',
96+
'pir::StrAttribute': 'AsString',
9797
}
9898

9999

‎paddle/fluid/pir/dialect/operator/interface/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ file(GLOB PD_INTERFACE_SRCS "*.cc")
44
cc_library(
55
pd_interface
66
SRCS ${PD_INTERFACE_SRCS}
7-
DEPS ir_core phi_utils)
7+
DEPS pir_core phi_utils)

‎paddle/fluid/pir/dialect/operator/ir/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ cc_library(
195195
cc_library(
196196
api_builder
197197
SRCS api_builder.cc
198-
DEPS ir_core)
198+
DEPS pir_core)
199199
cc_library(
200200
pd_op_dialect_api
201201
SRCS ${api_source_file} manual_api.cc

‎paddle/fluid/pir/dialect/operator/ir/manual_op.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,12 @@ void IfOp::Build(pir::Builder &builder, // NOLINT
636636
argument.AddOperand(cond);
637637
argument.output_types.swap(output_types);
638638
}
639-
ir::Block *IfOp::true_block() {
639+
pir::Block *IfOp::true_block() {
640640
pir::Region &true_region = (*this)->region(0);
641641
if (true_region.empty()) true_region.emplace_back();
642642
return true_region.front();
643643
}
644-
ir::Block *IfOp::false_block() {
644+
pir::Block *IfOp::false_block() {
645645
pir::Region &false_region = (*this)->region(1);
646646
if (false_region.empty()) false_region.emplace_back();
647647
return false_region.front();

‎paddle/fluid/pir/dialect/operator/trait/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ file(GLOB PD_INTERFACE_SRCS "*.cc")
33
cc_library(
44
pd_trait
55
SRCS ${PD_INTERFACE_SRCS}
6-
DEPS ir_core)
6+
DEPS pir_core)

‎paddle/phi/core/meta_tensor.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License. */
1616

1717
#include "glog/logging.h"
1818

19-
#include "paddle/fluid/ir/dialect/operator/ir/meta_tensor.h"
19+
#include "paddle/fluid/pir/dialect/operator/ir/meta_tensor.h"
2020
#include "paddle/phi/core/dense_tensor.h"
2121
#include "paddle/phi/core/distributed/auto_parallel/dist_tensor.h"
2222
#include "paddle/phi/core/enforce.h"

‎paddle/phi/core/utils/type_info.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ limitations under the License. */
1414

1515
#include <string>
1616

17-
#include "paddle/fluid/ir/dialect/operator/ir/meta_tensor.h"
17+
#include "paddle/fluid/pir/dialect/operator/ir/meta_tensor.h"
1818
#include "paddle/phi/backends/cpu/cpu_context.h"
1919
#include "paddle/phi/backends/custom/custom_context.h"
2020
#include "paddle/phi/backends/gpu/gpu_context.h"

‎paddle/pir/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set(NEWIR_BINARY_DIR "${PADDLE_BINARY_DIR}/paddle/pir")
33

44
file(GLOB IR_SRCS "*.cc")
55

6-
ir_library(ir_core SRCS ${IR_SRCS} DEPS ddim)
6+
ir_library(pir_core SRCS ${IR_SRCS} DEPS ddim)

‎paddle/pir/dialect/shape/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
file(GLOB_RECURSE SHAPE_SRCS "*.cc")
2-
ir_library(ir_shape SRCS ${SHAPE_SRCS} DEPS ir_core)
2+
ir_library(pir_shape SRCS ${SHAPE_SRCS} DEPS pir_core)

‎paddle/pir/pass/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
file(GLOB NEW_PASS_SRCS "*.cc")
22

3-
ir_library(ir_pass SRCS ${NEW_PASS_SRCS} DEPS ir_core)
3+
ir_library(pir_pass SRCS ${NEW_PASS_SRCS} DEPS pir_core)

‎paddle/pir/pass/pass_registry.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "paddle/pir/core/enforce.h"
2222
#include "paddle/pir/core/macros.h"
2323
#include "paddle/pir/pass/pass.h"
24-
2524
namespace pir {
2625

2726
class Pass;
@@ -80,18 +79,19 @@ class PassRegistrar {
8079
msg)
8180

8281
// Register a new pass that can be applied on the IR.
83-
#define REGISTER_IR_PASS(pass_type, pass_class) \
84-
STATIC_ASSERT_PASS_GLOBAL_NAMESPACE( \
85-
__reg_pass__##pass_type, \
86-
"REGISTER_IR_PASS must be called in global namespace"); \
87-
static ::pir::PassRegistrar<pass_class> __pass_registrar_##pass_type##__( \
88-
#pass_type); \
89-
int TouchPassRegistrar_##pass_type() { \
90-
__pass_registrar_##pass_type##__.Touch(); \
91-
return 0; \
92-
} \
93-
static ::pir::PassRegistrar<pass_class> &__pass_tmp_registrar_##pass_type##__ \
94-
UNUSED = __pass_registrar_##pass_type##__
82+
#define REGISTER_IR_PASS(pass_type, pass_class) \
83+
STATIC_ASSERT_PASS_GLOBAL_NAMESPACE( \
84+
__reg_pass__##pass_type, \
85+
"REGISTER_IR_PASS must be called in global namespace"); \
86+
static ::pir::PassRegistrar<pass_class> __pass_registrar_##pass_type##__( \
87+
#pass_type); \
88+
int TouchPassRegistrar_##pass_type() { \
89+
__pass_registrar_##pass_type##__.Touch(); \
90+
return 0; \
91+
} \
92+
static ::pir::PassRegistrar<pass_class> \
93+
&__pass_tmp_registrar_##pass_type##__ UNUSED = \
94+
__pass_registrar_##pass_type##__
9595

9696
#define USE_PASS(pass_type) \
9797
STATIC_ASSERT_PASS_GLOBAL_NAMESPACE( \

‎paddle/pir/pattern_rewrite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
file(GLOB PATTERN_SRCS "*.cc")
22

3-
ir_library(ir_pattern_rewrite SRCS ${PATTERN_SRCS} DEPS ir_core)
3+
ir_library(pir_pattern_rewrite SRCS ${PATTERN_SRCS} DEPS pir_core)

‎paddle/pir/transforms/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
file(GLOB PATTERN_SRCS "*.cc")
22

33
ir_library(
4-
ir_builtin_transforms
4+
pir_builtin_transforms
55
SRCS
66
${PATTERN_SRCS}
77
DEPS
8-
ir_core
9-
ir_pattern_rewrite
10-
ir_pass)
8+
pir_core
9+
pir_pattern_rewrite
10+
pir_pass)

‎test/cpp/pir/control_flow_dialect/if_op_test.cc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,45 @@
1414
#include <gtest/gtest.h>
1515
#include <iostream>
1616

17-
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
18-
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_manual_op.h"
19-
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_op.h"
17+
#include "paddle/fluid/pir/dialect/operator/ir/manual_op.h"
18+
#include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
19+
#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
2020
#include "paddle/pir/core/builder.h"
2121
#include "paddle/pir/core/builtin_op.h"
2222
#include "paddle/pir/core/program.h"
2323
#include "paddle/pir/dialect/control_flow/ir/cf_dialect.h"
2424
#include "paddle/pir/dialect/control_flow/ir/cf_ops.h"
2525

2626
TEST(if_op_test, base) {
27-
ir::IrContext* ctx = ir::IrContext::Instance();
27+
pir::IrContext* ctx = pir::IrContext::Instance();
2828
ctx->GetOrRegisterDialect<paddle::dialect::PaddleDialect>();
29-
ctx->GetOrRegisterDialect<ir::ControlFlowDialect>();
29+
ctx->GetOrRegisterDialect<pir::ControlFlowDialect>();
3030

31-
ir::Program program(ctx);
32-
ir::Block* block = program.block();
33-
ir::Builder builder(ctx, block);
31+
pir::Program program(ctx);
32+
pir::Block* block = program.block();
33+
pir::Builder builder(ctx, block);
3434

3535
auto full_op = builder.Build<paddle::dialect::FullOp>(
3636
std::vector<int64_t>{1}, true, phi::DataType::BOOL);
3737

3838
auto if_op = builder.Build<paddle::dialect::IfOp>(
39-
full_op.out(), std::vector<ir::Type>{builder.bool_type()});
39+
full_op.out(), std::vector<pir::Type>{builder.bool_type()});
4040

41-
ir::Block* true_block = if_op.true_block();
41+
pir::Block* true_block = if_op.true_block();
4242

4343
builder.SetInsertionPointToStart(true_block);
4444

4545
auto full_op_1 = builder.Build<paddle::dialect::FullOp>(
4646
std::vector<int64_t>{2}, true, phi::DataType::BOOL);
47-
builder.Build<ir::YieldOp>(std::vector<ir::OpResult>{full_op_1.out()});
47+
builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_1.out()});
4848

49-
ir::Block* false_block = if_op.false_block();
49+
pir::Block* false_block = if_op.false_block();
5050

5151
builder.SetInsertionPointToStart(false_block);
5252

5353
auto full_op_2 = builder.Build<paddle::dialect::FullOp>(
5454
std::vector<int64_t>{3}, true, phi::DataType::BOOL);
55-
builder.Build<ir::YieldOp>(std::vector<ir::OpResult>{full_op_2.out()});
55+
builder.Build<pir::YieldOp>(std::vector<pir::OpResult>{full_op_2.out()});
5656

5757
std::stringstream ss;
5858
program.Print(ss);

‎tools/coverage/paddle_coverage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function gen_full_html_report() {
4949
'/paddle/paddle/fluid/recordio/*' \
5050
'/paddle/paddle/fluid/string/*' \
5151
'/paddle/paddle/fluid/eager/*' \
52-
'/paddle/paddle/fluid/ir/*' \
52+
'/paddle/paddle/fluid/pir/*' \
5353
'/paddle/paddle/fluid/ir_adaptor/*' \
5454
'/paddle/paddle/phi/*' \
5555
'/paddle/paddle/pir/*' \

0 commit comments

Comments
 (0)