From e4dc0d31294162d3cadea6ad16427372df241779 Mon Sep 17 00:00:00 2001 From: limingshu <61349199+JamesLim-sy@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:44:16 +0800 Subject: [PATCH] Clarify cinn/ir dirs [Part1] (#55121) * Clarify cinn/ir dirs [Part1] * addition of cinn/ir/op dir * change header inludsion of ir/ir_operator.h to ir/op/ir_operator.h * merge with develop changes * relocate libschedule_desc_proto.a * remove extra ir_schedule_error.cc * addition for schedule/ir_schedule_error files --- cmake/cinn.cmake | 3 +- .../cinn/auto_schedule/analysis/analyze_ir.cc | 6 +-- .../cinn/auto_schedule/analysis/analyze_ir.h | 2 +- .../auto_schedule/analysis/analyze_ir_test.cc | 2 +- paddle/cinn/auto_schedule/auto_schedule.proto | 2 +- .../cost_model/expr_cost_model.cc | 2 +- .../cost_model/expr_cost_model.h | 2 +- .../cinn/auto_schedule/cost_model/feature.h | 2 +- .../cost_model/feature_extractor.cc | 4 +- .../cost_model/feature_extractor.h | 4 +- .../cost_model/feature_extractor_test.cc | 2 +- .../cinn/auto_schedule/database/database.cc | 4 +- paddle/cinn/auto_schedule/database/database.h | 2 +- .../auto_schedule/database/database_test.cc | 2 +- .../database/jsonfile_database_test.cc | 4 +- .../post_schedule_rule/cooperative_process.cc | 6 +-- .../cooperative_process_test.cc | 2 +- .../post_schedule_rule/post_schedule_rule.h | 2 +- .../search_space/auto_gen_rule/auto_bind.cc | 6 +-- .../search_space/auto_gen_rule/auto_bind.h | 2 +- .../auto_gen_rule/auto_bind_test.cc | 2 +- .../auto_gen_rule/auto_gen_rule.cc | 2 +- .../auto_gen_rule/auto_gen_rule.h | 2 +- .../search_space/auto_gen_rule/auto_inline.cc | 6 +-- .../search_space/auto_gen_rule/auto_inline.h | 2 +- .../auto_gen_rule/auto_inline_test.cc | 4 +- .../search_space/auto_gen_rule/auto_unroll.cc | 6 +-- .../search_space/auto_gen_rule/auto_unroll.h | 2 +- .../auto_gen_rule/mix_rules_test.cc | 4 +- .../auto_gen_rule/multi_level_tiling.cc | 6 +-- .../auto_gen_rule/multi_level_tiling.h | 2 +- .../auto_gen_rule/multi_level_tiling_test.cc | 4 +- .../search_space/auto_gen_rule/skip_rule.cc | 2 +- .../search_space/auto_gen_rule/skip_rule.h | 2 +- .../auto_gen_rule/skip_rule_test.cc | 2 +- .../search_space/auto_gen_rule/test_helper.h | 2 +- .../search_space/search_space.cc | 2 +- .../auto_schedule/search_space/search_space.h | 2 +- .../search_space/search_state.cc | 6 +-- .../auto_schedule/search_space/search_state.h | 6 +-- .../search_strategy/evolutionary_search.h | 2 +- .../evolutionary_search_test.cc | 2 +- .../search_strategy/mutate_rule/mutate_rule.h | 2 +- .../mutate_rule/mutate_tile_size_test.cc | 2 +- .../cinn/auto_schedule/task/task_optimizer.cc | 2 +- .../cinn/auto_schedule/task/task_registry.h | 2 +- paddle/cinn/auto_schedule/task/tune_task.cc | 2 +- paddle/cinn/auto_schedule/task/tune_task.h | 2 +- .../cinn/auto_schedule/task/tune_task_test.cc | 4 +- paddle/cinn/backends/codegen_c.cc | 4 +- paddle/cinn/backends/codegen_c.h | 2 +- paddle/cinn/backends/codegen_cuda_dev.cc | 4 +- paddle/cinn/backends/codegen_cuda_dev.h | 2 +- .../backends/codegen_cuda_generate_test.cc | 4 +- paddle/cinn/backends/codegen_cuda_util.cc | 2 +- paddle/cinn/backends/codegen_cuda_util.h | 2 +- paddle/cinn/backends/ir_schedule_test.cc | 6 +-- paddle/cinn/backends/llvm/codegen_llvm.cc | 6 +-- paddle/cinn/backends/llvm/codegen_llvm.h | 2 +- paddle/cinn/backends/llvm/codegen_x86.cc | 2 +- paddle/cinn/backends/llvm/execution_engine.cc | 2 +- .../backends/llvm/execution_engine_test.cc | 2 +- paddle/cinn/backends/llvm/simple_jit.cc | 2 +- paddle/cinn/backends/modular.cc | 2 +- paddle/cinn/cinn.h | 2 +- paddle/cinn/common/arithmatic.cc | 6 +-- paddle/cinn/common/arithmatic_test.cc | 4 +- paddle/cinn/common/cas.cc | 10 ++--- paddle/cinn/common/cas.h | 2 +- paddle/cinn/common/cas_test.cc | 4 +- paddle/cinn/common/cinn_value_test.cc | 2 +- paddle/cinn/common/ir_util.cc | 6 +-- paddle/cinn/hlir/framework/op_lowering.cc | 2 +- paddle/cinn/hlir/framework/op_lowering.h | 4 +- paddle/cinn/hlir/op/broadcast.cc | 2 +- paddle/cinn/hlir/op/contrib/argmax.cc | 2 +- paddle/cinn/hlir/op/contrib/argmin.cc | 2 +- .../cinn/hlir/op/contrib/bitcast_convert.cc | 2 +- paddle/cinn/hlir/op/contrib/cholesky.cc | 2 +- .../cinn/hlir/op/contrib/gaussian_random.cc | 2 +- .../hlir/op/contrib/logical_right_shift.cc | 2 +- paddle/cinn/hlir/op/contrib/one_hot.cc | 2 +- paddle/cinn/hlir/op/contrib/randint.cc | 2 +- paddle/cinn/hlir/op/contrib/reciprocal.cc | 2 +- paddle/cinn/hlir/op/contrib/repeat.cc | 2 +- paddle/cinn/hlir/op/contrib/uniform_random.cc | 2 +- paddle/cinn/hlir/op/custom_call.cc | 2 +- paddle/cinn/hlir/op/elementwise.cc | 2 +- paddle/cinn/hlir/op/op_util.cc | 2 +- paddle/cinn/hlir/op/reduction.cc | 4 +- paddle/cinn/hlir/op/transform.cc | 2 +- paddle/cinn/hlir/pe/broadcast.cc | 2 +- paddle/cinn/hlir/pe/elementwise.cc | 2 +- paddle/cinn/hlir/pe/ir_schedule_pe.h | 4 +- paddle/cinn/hlir/pe/nn.cc | 2 +- paddle/cinn/hlir/pe/reduction.cc | 2 +- paddle/cinn/ir/CMakeLists.txt | 45 +++---------------- paddle/cinn/ir/buffer.cc | 4 +- paddle/cinn/ir/ir.cc | 4 +- paddle/cinn/ir/ir_base.cc | 4 +- paddle/cinn/ir/lowered_func.cc | 4 +- paddle/cinn/ir/op/CMakeLists.txt | 3 ++ paddle/cinn/ir/{ => op}/ir_operators.cc | 2 +- paddle/cinn/ir/{ => op}/ir_operators.h | 0 paddle/cinn/ir/schedule/CMakeLists.txt | 11 +++++ paddle/cinn/ir/{ => schedule}/ir_schedule.cc | 15 +++---- paddle/cinn/ir/{ => schedule}/ir_schedule.h | 4 +- .../ir/{ => schedule}/ir_schedule_error.cc | 4 +- .../ir/{ => schedule}/ir_schedule_error.h | 2 +- .../ir/{ => schedule}/ir_schedule_util.cc | 10 ++--- .../cinn/ir/{ => schedule}/ir_schedule_util.h | 4 +- .../cinn/ir/{ => schedule}/schedule_desc.cc | 4 +- paddle/cinn/ir/{ => schedule}/schedule_desc.h | 2 +- .../ir/{ => schedule}/schedule_desc.proto | 0 paddle/cinn/ir/tensor.cc | 6 +-- paddle/cinn/ir/test/CMakeLists.txt | 18 ++++++++ paddle/cinn/ir/{ => test}/buffer_test.cc | 0 .../ir/{ => test}/collect_ir_nodes_test.cc | 0 .../cinn/ir/{ => test}/intrinsic_ops_test.cc | 0 paddle/cinn/ir/{ => test}/ir_compare_test.cc | 2 +- .../cinn/ir/{ => test}/ir_operators_test.cc | 2 +- paddle/cinn/ir/{ => test}/ir_printer_test.cc | 2 +- paddle/cinn/ir/{ => test}/ir_test.cc | 0 paddle/cinn/ir/{ => test}/ir_verify_test.cc | 4 +- .../cinn/ir/{ => test}/schedule_desc_test.cc | 6 +-- paddle/cinn/ir/{ => test}/tensor_test.cc | 4 +- paddle/cinn/ir/utils/CMakeLists.txt | 11 +++++ paddle/cinn/ir/{ => utils}/ir_compare.cc | 4 +- paddle/cinn/ir/{ => utils}/ir_compare.h | 2 +- paddle/cinn/ir/{ => utils}/ir_mutator.cc | 4 +- paddle/cinn/ir/{ => utils}/ir_mutator.h | 2 +- .../ir_nodes_collector.cc} | 7 ++- .../ir_nodes_collector.h} | 0 paddle/cinn/ir/{ => utils}/ir_printer.cc | 2 +- paddle/cinn/ir/{ => utils}/ir_printer.h | 2 +- paddle/cinn/ir/{ => utils}/ir_verify.cc | 6 +-- paddle/cinn/ir/{ => utils}/ir_verify.h | 0 paddle/cinn/ir/{ => utils}/ir_visitor.cc | 7 +-- paddle/cinn/ir/{ => utils}/ir_visitor.h | 2 +- paddle/cinn/lang/builtin.h | 2 +- paddle/cinn/lang/compute.h | 2 +- paddle/cinn/lang/compute_test.cc | 2 +- paddle/cinn/lang/lower.cc | 2 +- paddle/cinn/lang/lower_impl.cc | 2 +- paddle/cinn/lang/lower_impl.h | 2 +- paddle/cinn/lang/packed_func_test.cc | 4 +- paddle/cinn/lang/placeholder.h | 2 +- paddle/cinn/lang/placeholder_test.cc | 2 +- paddle/cinn/optim/buffer_assign.cc | 4 +- .../cinn/optim/call_arg_list_to_pod_value.cc | 2 +- paddle/cinn/optim/cast_bool_to_int8.cc | 2 +- paddle/cinn/optim/cast_simplify.cc | 2 +- paddle/cinn/optim/cast_simplify_test.cc | 4 +- paddle/cinn/optim/collect_undefined_vars.cc | 2 +- paddle/cinn/optim/compute_inline_expand.cc | 2 +- .../optim/eliminate_broadcast_in_forloop.cc | 6 +-- paddle/cinn/optim/extern_call_process.cc | 2 +- paddle/cinn/optim/fold_cinn_call_arguments.cc | 4 +- paddle/cinn/optim/if_simplify.cc | 2 +- paddle/cinn/optim/if_simplify_test.cc | 2 +- paddle/cinn/optim/insert_debug_log_callee.cc | 4 +- paddle/cinn/optim/ir_copy.cc | 6 +-- paddle/cinn/optim/ir_copy_test.cc | 2 +- paddle/cinn/optim/ir_replace.cc | 4 +- paddle/cinn/optim/ir_simplify.cc | 8 ++-- .../optim/lower_function_call_bind_vars.cc | 2 +- paddle/cinn/optim/lower_intrin.cc | 2 +- paddle/cinn/optim/map_extern_call.cc | 2 +- paddle/cinn/optim/optimize.cc | 4 +- paddle/cinn/optim/optimize_test.cc | 2 +- paddle/cinn/optim/remove_nested_block.cc | 4 +- paddle/cinn/optim/remove_nested_block_test.cc | 2 +- paddle/cinn/optim/remove_schedule_block.cc | 4 +- .../cinn/optim/remove_schedule_block_test.cc | 4 +- paddle/cinn/optim/replace_call_with_expr.cc | 4 +- .../cinn/optim/replace_call_with_expr_test.cc | 4 +- .../optim/replace_const_param_to_integer.cc | 2 +- paddle/cinn/optim/replace_var_with_expr.cc | 6 +-- paddle/cinn/optim/tensor_write_tell.h | 2 +- paddle/cinn/optim/transform_gpu_forloop.cc | 4 +- paddle/cinn/optim/transform_polyfor_to_for.cc | 8 ++-- paddle/cinn/optim/unroll_loops.cc | 6 +-- paddle/cinn/optim/unroll_loops_test.cc | 2 +- paddle/cinn/optim/var_mod_simplify.cc | 4 +- paddle/cinn/optim/vectorize_loops.cc | 6 +-- paddle/cinn/optim/vectorize_loops.h | 2 +- paddle/cinn/optim/vectorize_loops_test.cc | 2 +- paddle/cinn/poly/ast_gen.cc | 2 +- paddle/cinn/poly/ast_gen_test.cc | 2 +- paddle/cinn/poly/dim.cc | 2 +- paddle/cinn/poly/domain.cc | 2 +- .../cinn/poly/domain_add_unit_loop_mutator.cc | 2 +- .../cinn/poly/domain_add_unit_loop_mutator.h | 2 +- paddle/cinn/poly/graph_test.cc | 2 +- paddle/cinn/poly/schedule.cc | 4 +- paddle/cinn/poly/schedule_test.cc | 2 +- paddle/cinn/poly/stage.cc | 8 ++-- paddle/cinn/poly/stage_test.cc | 4 +- paddle/cinn/pybind/bind_utils.h | 2 +- paddle/cinn/pybind/common.cc | 2 +- paddle/cinn/pybind/ir.cc | 6 +-- paddle/cinn/pybind/optim.cc | 2 +- 202 files changed, 351 insertions(+), 345 deletions(-) mode change 100755 => 100644 paddle/cinn/auto_schedule/task/tune_task_test.cc mode change 100755 => 100644 paddle/cinn/backends/codegen_c.h mode change 100755 => 100644 paddle/cinn/common/ir_util.cc mode change 100755 => 100644 paddle/cinn/ir/CMakeLists.txt mode change 100755 => 100644 paddle/cinn/ir/ir.cc create mode 100644 paddle/cinn/ir/op/CMakeLists.txt rename paddle/cinn/ir/{ => op}/ir_operators.cc (99%) rename paddle/cinn/ir/{ => op}/ir_operators.h (100%) create mode 100755 paddle/cinn/ir/schedule/CMakeLists.txt rename paddle/cinn/ir/{ => schedule}/ir_schedule.cc (99%) rename paddle/cinn/ir/{ => schedule}/ir_schedule.h (99%) rename paddle/cinn/ir/{ => schedule}/ir_schedule_error.cc (95%) rename paddle/cinn/ir/{ => schedule}/ir_schedule_error.h (99%) rename paddle/cinn/ir/{ => schedule}/ir_schedule_util.cc (99%) rename paddle/cinn/ir/{ => schedule}/ir_schedule_util.h (99%) rename paddle/cinn/ir/{ => schedule}/schedule_desc.cc (99%) rename paddle/cinn/ir/{ => schedule}/schedule_desc.h (98%) rename paddle/cinn/ir/{ => schedule}/schedule_desc.proto (100%) mode change 100755 => 100644 paddle/cinn/ir/tensor.cc create mode 100644 paddle/cinn/ir/test/CMakeLists.txt rename paddle/cinn/ir/{ => test}/buffer_test.cc (100%) rename paddle/cinn/ir/{ => test}/collect_ir_nodes_test.cc (100%) rename paddle/cinn/ir/{ => test}/intrinsic_ops_test.cc (100%) rename paddle/cinn/ir/{ => test}/ir_compare_test.cc (98%) rename paddle/cinn/ir/{ => test}/ir_operators_test.cc (94%) rename paddle/cinn/ir/{ => test}/ir_printer_test.cc (94%) rename paddle/cinn/ir/{ => test}/ir_test.cc (100%) rename paddle/cinn/ir/{ => test}/ir_verify_test.cc (89%) rename paddle/cinn/ir/{ => test}/schedule_desc_test.cc (99%) rename paddle/cinn/ir/{ => test}/tensor_test.cc (98%) create mode 100644 paddle/cinn/ir/utils/CMakeLists.txt rename paddle/cinn/ir/{ => utils}/ir_compare.cc (99%) rename paddle/cinn/ir/{ => utils}/ir_compare.h (97%) rename paddle/cinn/ir/{ => utils}/ir_mutator.cc (88%) rename paddle/cinn/ir/{ => utils}/ir_mutator.h (99%) rename paddle/cinn/ir/{collect_ir_nodes.cc => utils/ir_nodes_collector.cc} (97%) rename paddle/cinn/ir/{collect_ir_nodes.h => utils/ir_nodes_collector.h} (100%) rename paddle/cinn/ir/{ => utils}/ir_printer.cc (99%) rename paddle/cinn/ir/{ => utils}/ir_printer.h (98%) rename paddle/cinn/ir/{ => utils}/ir_verify.cc (88%) rename paddle/cinn/ir/{ => utils}/ir_verify.h (100%) rename paddle/cinn/ir/{ => utils}/ir_visitor.cc (85%) rename paddle/cinn/ir/{ => utils}/ir_visitor.h (97%) mode change 100755 => 100644 paddle/cinn/optim/unroll_loops.cc diff --git a/cmake/cinn.cmake b/cmake/cinn.cmake index b92c19790e78d..a7b74124a150a 100644 --- a/cmake/cinn.cmake +++ b/cmake/cinn.cmake @@ -302,7 +302,8 @@ if(PUBLISH_LIBS) ${CMAKE_BINARY_DIR}/paddle/cinn/auto_schedule/libauto_schedule_proto.a ${CMAKE_BINARY_DIR}/dist/cinn/lib/libauto_schedule_proto.a COMMAND - cmake -E copy ${CMAKE_BINARY_DIR}/paddle/cinn/ir/libschedule_desc_proto.a + cmake -E copy + ${CMAKE_BINARY_DIR}/paddle/cinn/ir/schedule/libschedule_desc_proto.a ${CMAKE_BINARY_DIR}/dist/cinn/lib/libschedule_desc_proto.a COMMENT "distribute libcinncore_static.a and related header files." DEPENDS cinncore_static) diff --git a/paddle/cinn/auto_schedule/analysis/analyze_ir.cc b/paddle/cinn/auto_schedule/analysis/analyze_ir.cc index 62cef5e2694c1..8adc61ba269b4 100644 --- a/paddle/cinn/auto_schedule/analysis/analyze_ir.cc +++ b/paddle/cinn/auto_schedule/analysis/analyze_ir.cc @@ -21,13 +21,13 @@ #include #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/optimize.h" diff --git a/paddle/cinn/auto_schedule/analysis/analyze_ir.h b/paddle/cinn/auto_schedule/analysis/analyze_ir.h index f59aa06b2dcaf..8fbdd52329f51 100644 --- a/paddle/cinn/auto_schedule/analysis/analyze_ir.h +++ b/paddle/cinn/auto_schedule/analysis/analyze_ir.h @@ -19,8 +19,8 @@ #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/analysis/analyze_ir_test.cc b/paddle/cinn/auto_schedule/analysis/analyze_ir_test.cc index 232a8a498ffbe..ef408b7b7778a 100644 --- a/paddle/cinn/auto_schedule/analysis/analyze_ir_test.cc +++ b/paddle/cinn/auto_schedule/analysis/analyze_ir_test.cc @@ -23,7 +23,7 @@ #include "paddle/cinn/common/context.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/auto_schedule/auto_schedule.proto b/paddle/cinn/auto_schedule/auto_schedule.proto index 6d239cf522279..5148f9cea467a 100644 --- a/paddle/cinn/auto_schedule/auto_schedule.proto +++ b/paddle/cinn/auto_schedule/auto_schedule.proto @@ -16,7 +16,7 @@ syntax ="proto3"; package cinn.auto_schedule.proto; -import "paddle/cinn/ir/schedule_desc.proto"; +import "paddle/cinn/ir/schedule/schedule_desc.proto"; message TuningRecord { string task_key = 1; diff --git a/paddle/cinn/auto_schedule/cost_model/expr_cost_model.cc b/paddle/cinn/auto_schedule/cost_model/expr_cost_model.cc index f433115036bc1..fcaf57d54c4ce 100644 --- a/paddle/cinn/auto_schedule/cost_model/expr_cost_model.cc +++ b/paddle/cinn/auto_schedule/cost_model/expr_cost_model.cc @@ -23,7 +23,7 @@ #include "paddle/cinn/auto_schedule/cost_model/feature_extractor.h" #include "paddle/cinn/auto_schedule/search_space/search_state.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/cost_model/expr_cost_model.h b/paddle/cinn/auto_schedule/cost_model/expr_cost_model.h index c0fe6ee899e43..02e0b4a52c831 100644 --- a/paddle/cinn/auto_schedule/cost_model/expr_cost_model.h +++ b/paddle/cinn/auto_schedule/cost_model/expr_cost_model.h @@ -18,7 +18,7 @@ #include #include "paddle/cinn/auto_schedule/cost_model/xgb_cost_model.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/cost_model/feature.h b/paddle/cinn/auto_schedule/cost_model/feature.h index 52e43d8ed80b2..cfd100598cdd1 100644 --- a/paddle/cinn/auto_schedule/cost_model/feature.h +++ b/paddle/cinn/auto_schedule/cost_model/feature.h @@ -18,7 +18,7 @@ #include #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/cost_model/feature_extractor.cc b/paddle/cinn/auto_schedule/cost_model/feature_extractor.cc index ba0e6239beed9..3369ef4b6ba8b 100644 --- a/paddle/cinn/auto_schedule/cost_model/feature_extractor.cc +++ b/paddle/cinn/auto_schedule/cost_model/feature_extractor.cc @@ -33,8 +33,8 @@ #include "paddle/cinn/common/type.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/transform_polyfor_to_for.h" diff --git a/paddle/cinn/auto_schedule/cost_model/feature_extractor.h b/paddle/cinn/auto_schedule/cost_model/feature_extractor.h index c6109f658e16a..6d2cfebf85b38 100644 --- a/paddle/cinn/auto_schedule/cost_model/feature_extractor.h +++ b/paddle/cinn/auto_schedule/cost_model/feature_extractor.h @@ -31,8 +31,8 @@ #include "paddle/cinn/common/target.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/cost_model/feature_extractor_test.cc b/paddle/cinn/auto_schedule/cost_model/feature_extractor_test.cc index 51e68cb287901..9364374156f4a 100644 --- a/paddle/cinn/auto_schedule/cost_model/feature_extractor_test.cc +++ b/paddle/cinn/auto_schedule/cost_model/feature_extractor_test.cc @@ -24,7 +24,7 @@ #include "paddle/cinn/common/context.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/auto_schedule/database/database.cc b/paddle/cinn/auto_schedule/database/database.cc index e8c14e58b33c0..24d071a7df4e1 100644 --- a/paddle/cinn/auto_schedule/database/database.cc +++ b/paddle/cinn/auto_schedule/database/database.cc @@ -20,8 +20,8 @@ #include "paddle/cinn/auto_schedule/database/jsonfile_database.h" #include "paddle/cinn/auto_schedule/task/task_registry.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/database/database.h b/paddle/cinn/auto_schedule/database/database.h index dc82475bfd37a..f45838717ce01 100644 --- a/paddle/cinn/auto_schedule/database/database.h +++ b/paddle/cinn/auto_schedule/database/database.h @@ -17,7 +17,7 @@ #include "paddle/cinn/auto_schedule/auto_schedule.pb.h" #include "paddle/cinn/auto_schedule/search_space/search_state.h" -#include "paddle/cinn/ir/schedule_desc.pb.h" +#include "paddle/cinn/ir/schedule/schedule_desc.pb.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/database/database_test.cc b/paddle/cinn/auto_schedule/database/database_test.cc index 3fc55334b8ea5..041fca4a0f3dc 100644 --- a/paddle/cinn/auto_schedule/database/database_test.cc +++ b/paddle/cinn/auto_schedule/database/database_test.cc @@ -20,7 +20,7 @@ #include "paddle/cinn/auto_schedule/auto_schedule.pb.h" #include "paddle/cinn/auto_schedule/search_space/search_state.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/database/jsonfile_database_test.cc b/paddle/cinn/auto_schedule/database/jsonfile_database_test.cc index 71674c18f6013..d977e02dc15c2 100644 --- a/paddle/cinn/auto_schedule/database/jsonfile_database_test.cc +++ b/paddle/cinn/auto_schedule/database/jsonfile_database_test.cc @@ -23,8 +23,8 @@ #include "paddle/cinn/auto_schedule/search_space/search_state.h" #include "paddle/cinn/auto_schedule/task/task_registry.h" #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process.cc b/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process.cc index 40f40d06d9d7f..678d282e5dbd6 100644 --- a/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process.cc +++ b/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process.cc @@ -15,9 +15,9 @@ #include "paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process_test.cc b/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process_test.cc index a6e1db2a8b20e..e2d3eea411ce7 100644 --- a/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process_test.cc +++ b/paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process_test.cc @@ -17,7 +17,7 @@ #include #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "test/cpp/cinn/program_builder.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/post_schedule_rule/post_schedule_rule.h b/paddle/cinn/auto_schedule/post_schedule_rule/post_schedule_rule.h index f9de633cbc99b..d24c0cb1ef9f7 100644 --- a/paddle/cinn/auto_schedule/post_schedule_rule/post_schedule_rule.h +++ b/paddle/cinn/auto_schedule/post_schedule_rule/post_schedule_rule.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.cc index a07d4ffff20e8..3fd38ab0d4ba6 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.cc @@ -16,9 +16,9 @@ #include -#include "paddle/cinn/ir/collect_ir_nodes.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.h index 9793e5a5ef3ac..a45bd31d4b33f 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.h @@ -19,7 +19,7 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind_test.cc index 35dc5374b9664..2c68eefaffe0f 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind_test.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind_test.cc @@ -22,7 +22,7 @@ #include #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "test/cpp/cinn/program_builder.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.cc index 1a46df6a5bfaf..bb215358d0b64 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.cc @@ -19,7 +19,7 @@ #include #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h index bf6d3abbf9d6d..e3008b857c53a 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h @@ -18,7 +18,7 @@ #include "paddle/cinn/auto_schedule/search_space/search_state.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.cc index c5efb376d12c4..db5f8e711d8d9 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.cc @@ -24,11 +24,11 @@ #include "paddle/cinn/auto_schedule/analysis/analyze_ir.h" #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.h index 8a556dfdf488f..0ef60a01a9b0f 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline.h @@ -22,7 +22,7 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc index 609550e4fe4d7..0147d8280c446 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc @@ -30,9 +30,9 @@ #include "paddle/cinn/ir/function_base.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/poly/stage.h" diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.cc index a42df90350790..3ea7882b80654 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.cc @@ -18,9 +18,9 @@ #include -#include "paddle/cinn/ir/collect_ir_nodes.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.h index 517b5ee5b9b2c..f11ff7227a70e 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.h @@ -19,7 +19,7 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/mix_rules_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/mix_rules_test.cc index 2c2478d71723a..c7d40c8e54a1b 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/mix_rules_test.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/mix_rules_test.cc @@ -20,8 +20,8 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.h" #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "test/cpp/cinn/program_builder.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.cc index 459031266a714..b521db598fca0 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.cc @@ -27,12 +27,12 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/common/target.h" #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.h index cd26bc69b8531..3bcf22a812ae0 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling.h @@ -26,7 +26,7 @@ #include "paddle/cinn/common/target.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling_test.cc index c41d9171c835f..131330cd28205 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling_test.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/multi_level_tiling_test.cc @@ -27,9 +27,9 @@ #include "paddle/cinn/frontend/syntax.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/poly/stage.h" diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.cc index 4ada86aec17e1..9ad9dd143b494 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.cc @@ -18,7 +18,7 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.h index c4280b5569f7e..b6862c23e7d2c 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule.h @@ -18,7 +18,7 @@ #include "paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.h" #include "paddle/cinn/common/target.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule_test.cc b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule_test.cc index 81c955916f4e7..52f38e0b65b03 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule_test.cc +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/skip_rule_test.cc @@ -25,7 +25,7 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h index 9fc7c2ced18ee..73ef166e37b41 100644 --- a/paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h +++ b/paddle/cinn/auto_schedule/search_space/auto_gen_rule/test_helper.h @@ -23,8 +23,8 @@ #include "paddle/cinn/common/target.h" #include "paddle/cinn/frontend/syntax.h" #include "paddle/cinn/hlir/framework/scope.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/utils/random_engine.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_space/search_space.cc b/paddle/cinn/auto_schedule/search_space/search_space.cc index a0bc719269376..f3f8ba2f673f9 100644 --- a/paddle/cinn/auto_schedule/search_space/search_space.cc +++ b/paddle/cinn/auto_schedule/search_space/search_space.cc @@ -30,7 +30,7 @@ #include "paddle/cinn/auto_schedule/search_space/rule_sampler.h" #include "paddle/cinn/auto_schedule/task/tune_task.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/runtime/flags.h" diff --git a/paddle/cinn/auto_schedule/search_space/search_space.h b/paddle/cinn/auto_schedule/search_space/search_space.h index 4a7e0632729ee..f8f3907ed9710 100644 --- a/paddle/cinn/auto_schedule/search_space/search_space.h +++ b/paddle/cinn/auto_schedule/search_space/search_space.h @@ -24,7 +24,7 @@ #include "paddle/cinn/auto_schedule/search_space/search_state.h" #include "paddle/cinn/auto_schedule/task/tune_task.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_space/search_state.cc b/paddle/cinn/auto_schedule/search_space/search_state.cc index 852ea25259c69..96ace0f505d7f 100644 --- a/paddle/cinn/auto_schedule/search_space/search_state.cc +++ b/paddle/cinn/auto_schedule/search_space/search_state.cc @@ -20,9 +20,9 @@ #include #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/utils/functional.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/auto_schedule/search_space/search_state.h b/paddle/cinn/auto_schedule/search_space/search_state.h index 505c4967b6bb5..7991fb9540188 100644 --- a/paddle/cinn/auto_schedule/search_space/search_state.h +++ b/paddle/cinn/auto_schedule/search_space/search_state.h @@ -20,9 +20,9 @@ #include "paddle/cinn/common/object.h" #include "paddle/cinn/common/shared.h" -#include "paddle/cinn/ir/ir_compare.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_compare.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_strategy/evolutionary_search.h b/paddle/cinn/auto_schedule/search_strategy/evolutionary_search.h index a9215ae5c29c6..694e7813f4ce2 100644 --- a/paddle/cinn/auto_schedule/search_strategy/evolutionary_search.h +++ b/paddle/cinn/auto_schedule/search_strategy/evolutionary_search.h @@ -25,7 +25,7 @@ #include "paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_rule.h" #include "paddle/cinn/auto_schedule/task/tune_task.h" #include "paddle/cinn/auto_schedule/tuning.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/search_strategy/evolutionary_search_test.cc b/paddle/cinn/auto_schedule/search_strategy/evolutionary_search_test.cc index ab1abc0c4773c..25a9e1f72192e 100644 --- a/paddle/cinn/auto_schedule/search_strategy/evolutionary_search_test.cc +++ b/paddle/cinn/auto_schedule/search_strategy/evolutionary_search_test.cc @@ -28,7 +28,7 @@ #include "paddle/cinn/auto_schedule/task/tune_task.h" #include "paddle/cinn/auto_schedule/tuning.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "test/cpp/cinn/program_builder.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_rule.h b/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_rule.h index 5a0b097cf451c..dca114f243563 100644 --- a/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_rule.h +++ b/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_rule.h @@ -14,7 +14,7 @@ #pragma once -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" #include "paddle/cinn/utils/random_engine.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_tile_size_test.cc b/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_tile_size_test.cc index dfd895b72ed9f..443c297c5e722 100644 --- a/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_tile_size_test.cc +++ b/paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_tile_size_test.cc @@ -18,7 +18,7 @@ #include #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/task/task_optimizer.cc b/paddle/cinn/auto_schedule/task/task_optimizer.cc index cc658934dd4da..cd89eedbb75d1 100644 --- a/paddle/cinn/auto_schedule/task/task_optimizer.cc +++ b/paddle/cinn/auto_schedule/task/task_optimizer.cc @@ -29,7 +29,7 @@ #include "paddle/cinn/ir/buffer.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/transform_gpu_forloop.h" #include "paddle/cinn/runtime/flags.h" diff --git a/paddle/cinn/auto_schedule/task/task_registry.h b/paddle/cinn/auto_schedule/task/task_registry.h index 749c16c68b49f..158a899e5b915 100644 --- a/paddle/cinn/auto_schedule/task/task_registry.h +++ b/paddle/cinn/auto_schedule/task/task_registry.h @@ -19,7 +19,7 @@ #include #include -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/utils/registry.h" diff --git a/paddle/cinn/auto_schedule/task/tune_task.cc b/paddle/cinn/auto_schedule/task/tune_task.cc index 091a45b1c304a..c0e150990dc2f 100644 --- a/paddle/cinn/auto_schedule/task/tune_task.cc +++ b/paddle/cinn/auto_schedule/task/tune_task.cc @@ -23,8 +23,8 @@ #include "paddle/cinn/hlir/framework/node.h" #include "paddle/cinn/hlir/framework/op_lowering.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/auto_schedule/task/tune_task.h b/paddle/cinn/auto_schedule/task/tune_task.h index 5c3403d427804..033c7ccf397d8 100644 --- a/paddle/cinn/auto_schedule/task/tune_task.h +++ b/paddle/cinn/auto_schedule/task/tune_task.h @@ -27,8 +27,8 @@ #include "paddle/cinn/hlir/framework/op_lowering.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace auto_schedule { diff --git a/paddle/cinn/auto_schedule/task/tune_task_test.cc b/paddle/cinn/auto_schedule/task/tune_task_test.cc old mode 100755 new mode 100644 index b0b4a27e9b6d2..aa41dce3f6e9f --- a/paddle/cinn/auto_schedule/task/tune_task_test.cc +++ b/paddle/cinn/auto_schedule/task/tune_task_test.cc @@ -31,8 +31,8 @@ #include "paddle/cinn/hlir/framework/pass.h" #include "paddle/cinn/hlir/framework/scope.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" DECLARE_bool(cinn_ir_schedule); diff --git a/paddle/cinn/backends/codegen_c.cc b/paddle/cinn/backends/codegen_c.cc index 8263aab3eb9a4..0ba150aeb7679 100644 --- a/paddle/cinn/backends/codegen_c.cc +++ b/paddle/cinn/backends/codegen_c.cc @@ -19,9 +19,9 @@ #include "paddle/cinn/backends/extern_func_emitter.h" #include "paddle/cinn/backends/extern_func_emitter_builtin.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_verify.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_verify.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/remove_nested_block.h" #include "paddle/cinn/runtime/cpu/thread_backend.h" diff --git a/paddle/cinn/backends/codegen_c.h b/paddle/cinn/backends/codegen_c.h old mode 100755 new mode 100644 index a44f99fea606f..dad1174eb9881 --- a/paddle/cinn/backends/codegen_c.h +++ b/paddle/cinn/backends/codegen_c.h @@ -22,9 +22,9 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/ir/intrinsic_ops.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/lowered_func.h" #include "paddle/cinn/ir/module.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/packed_func.h" #include "paddle/cinn/runtime/cinn_runtime.h" diff --git a/paddle/cinn/backends/codegen_cuda_dev.cc b/paddle/cinn/backends/codegen_cuda_dev.cc index 66bcc44901edf..a82fd19ae1cbb 100644 --- a/paddle/cinn/backends/codegen_cuda_dev.cc +++ b/paddle/cinn/backends/codegen_cuda_dev.cc @@ -21,8 +21,8 @@ #include #include -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_verify.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_verify.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/remove_nested_block.h" diff --git a/paddle/cinn/backends/codegen_cuda_dev.h b/paddle/cinn/backends/codegen_cuda_dev.h index 1abe891b619f0..b0fd1b2d77c10 100644 --- a/paddle/cinn/backends/codegen_cuda_dev.h +++ b/paddle/cinn/backends/codegen_cuda_dev.h @@ -20,9 +20,9 @@ #include "paddle/cinn/backends/codegen_c.h" #include "paddle/cinn/common/common.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/lowered_func.h" #include "paddle/cinn/ir/module.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/packed_func.h" #include "paddle/cinn/runtime/cinn_runtime.h" diff --git a/paddle/cinn/backends/codegen_cuda_generate_test.cc b/paddle/cinn/backends/codegen_cuda_generate_test.cc index c120732528a8e..8b2a28a75753a 100644 --- a/paddle/cinn/backends/codegen_cuda_generate_test.cc +++ b/paddle/cinn/backends/codegen_cuda_generate_test.cc @@ -30,8 +30,8 @@ #include "paddle/cinn/common/test_helper.h" #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/utils/timer.h" diff --git a/paddle/cinn/backends/codegen_cuda_util.cc b/paddle/cinn/backends/codegen_cuda_util.cc index f74fadacc803d..62385b01e7337 100644 --- a/paddle/cinn/backends/codegen_cuda_util.cc +++ b/paddle/cinn/backends/codegen_cuda_util.cc @@ -15,7 +15,7 @@ #include "paddle/cinn/backends/codegen_cuda_util.h" #include "paddle/cinn/backends/cuda_util.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace backends { diff --git a/paddle/cinn/backends/codegen_cuda_util.h b/paddle/cinn/backends/codegen_cuda_util.h index 09f35d6698565..a0f892ca58c02 100755 --- a/paddle/cinn/backends/codegen_cuda_util.h +++ b/paddle/cinn/backends/codegen_cuda_util.h @@ -22,7 +22,7 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/optim/ir_copy.h" namespace cinn { diff --git a/paddle/cinn/backends/ir_schedule_test.cc b/paddle/cinn/backends/ir_schedule_test.cc index 4b2b7abbb3604..d610df1990d10 100644 --- a/paddle/cinn/backends/ir_schedule_test.cc +++ b/paddle/cinn/backends/ir_schedule_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include #include @@ -24,8 +24,8 @@ #include "paddle/cinn/backends/codegen_c_x86.h" #include "paddle/cinn/backends/codegen_cuda_dev.h" #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule_error.h" +#include "paddle/cinn/ir/schedule/ir_schedule_error.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/remove_schedule_block.h" diff --git a/paddle/cinn/backends/llvm/codegen_llvm.cc b/paddle/cinn/backends/llvm/codegen_llvm.cc index 57dc97ecc94f9..5ff8ce03c77b0 100644 --- a/paddle/cinn/backends/llvm/codegen_llvm.cc +++ b/paddle/cinn/backends/llvm/codegen_llvm.cc @@ -43,9 +43,9 @@ #include "paddle/cinn/backends/llvm/llvm_util.h" #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/type.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_verify.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_verify.h" #include "paddle/cinn/optim/var_mod_simplify.h" #include "paddle/cinn/runtime/cinn_runtime.h" #include "paddle/cinn/runtime/intrinsic.h" diff --git a/paddle/cinn/backends/llvm/codegen_llvm.h b/paddle/cinn/backends/llvm/codegen_llvm.h index ff885db2c8e59..7e61208cb9a5b 100644 --- a/paddle/cinn/backends/llvm/codegen_llvm.h +++ b/paddle/cinn/backends/llvm/codegen_llvm.h @@ -32,9 +32,9 @@ #include "paddle/cinn/backends/llvm/ir_builder_mixin.h" #include "paddle/cinn/backends/llvm/llvm_util.h" #include "paddle/cinn/ir/intrinsic_ops.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/lowered_func.h" #include "paddle/cinn/ir/module.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace backends { diff --git a/paddle/cinn/backends/llvm/codegen_x86.cc b/paddle/cinn/backends/llvm/codegen_x86.cc index bc0ec7493f164..28159f9ea4e4f 100644 --- a/paddle/cinn/backends/llvm/codegen_x86.cc +++ b/paddle/cinn/backends/llvm/codegen_x86.cc @@ -27,7 +27,7 @@ #include "paddle/cinn/backends/llvm/codegen_llvm.h" #include "paddle/cinn/common/target.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/optim/collect_undefined_vars.h" #include "paddle/cinn/runtime/intrinsic.h" diff --git a/paddle/cinn/backends/llvm/execution_engine.cc b/paddle/cinn/backends/llvm/execution_engine.cc index 050fd4e0d8389..6f1a93d5c76e5 100644 --- a/paddle/cinn/backends/llvm/execution_engine.cc +++ b/paddle/cinn/backends/llvm/execution_engine.cc @@ -61,7 +61,7 @@ #include "paddle/cinn/backends/llvm/llvm_optimizer.h" #include "paddle/cinn/backends/llvm/llvm_util.h" #include "paddle/cinn/backends/llvm/runtime_symbol_registry.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/runtime/intrinsic.h" #include "paddle/cinn/utils/profiler.h" diff --git a/paddle/cinn/backends/llvm/execution_engine_test.cc b/paddle/cinn/backends/llvm/execution_engine_test.cc index 7adca52f34ca7..6b04f0a2401df 100644 --- a/paddle/cinn/backends/llvm/execution_engine_test.cc +++ b/paddle/cinn/backends/llvm/execution_engine_test.cc @@ -41,8 +41,8 @@ #include "paddle/cinn/backends/llvm/runtime_symbol_registry.h" #include "paddle/cinn/cinn.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/module.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/lang/placeholder.h" diff --git a/paddle/cinn/backends/llvm/simple_jit.cc b/paddle/cinn/backends/llvm/simple_jit.cc index 1966542fd6fbf..83b3fe566b583 100755 --- a/paddle/cinn/backends/llvm/simple_jit.cc +++ b/paddle/cinn/backends/llvm/simple_jit.cc @@ -37,7 +37,7 @@ #include "paddle/cinn/backends/llvm/codegen_llvm.h" #include "paddle/cinn/backends/llvm/llvm_util.h" #include "paddle/cinn/backends/llvm/runtime_symbol_registry.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/runtime/intrinsic.h" namespace cinn { diff --git a/paddle/cinn/backends/modular.cc b/paddle/cinn/backends/modular.cc index fb736154c7bfc..b332424c45438 100644 --- a/paddle/cinn/backends/modular.cc +++ b/paddle/cinn/backends/modular.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/backends/modular.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace backends { diff --git a/paddle/cinn/cinn.h b/paddle/cinn/cinn.h index e535478df6bcb..333bc051ead98 100644 --- a/paddle/cinn/cinn.h +++ b/paddle/cinn/cinn.h @@ -20,7 +20,7 @@ #include "paddle/cinn/backends/codegen_c.h" #include "paddle/cinn/backends/codegen_c_x86.h" #include "paddle/cinn/common/common.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/common/arithmatic.cc b/paddle/cinn/common/arithmatic.cc index 6dff837ca1017..16b1d9cb8e8a5 100644 --- a/paddle/cinn/common/arithmatic.cc +++ b/paddle/cinn/common/arithmatic.cc @@ -21,9 +21,9 @@ #include #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/common/arithmatic_test.cc b/paddle/cinn/common/arithmatic_test.cc index 774d158c29369..b2e02ff9eb48f 100644 --- a/paddle/cinn/common/arithmatic_test.cc +++ b/paddle/cinn/common/arithmatic_test.cc @@ -20,8 +20,8 @@ #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/common/cas.cc b/paddle/cinn/common/cas.cc index 8bd3ea0d96a18..ff867858d80f8 100644 --- a/paddle/cinn/common/cas.cc +++ b/paddle/cinn/common/cas.cc @@ -21,11 +21,11 @@ #include "paddle/cinn/common/arithmatic.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/cast_simplify.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/common/cas.h b/paddle/cinn/common/cas.h index c7c4517d63524..aa895c07d5eaa 100755 --- a/paddle/cinn/common/cas.h +++ b/paddle/cinn/common/cas.h @@ -20,7 +20,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_simplify.h" namespace cinn { diff --git a/paddle/cinn/common/cas_test.cc b/paddle/cinn/common/cas_test.cc index b13f8c8a2e97f..b2f061611a634 100644 --- a/paddle/cinn/common/cas_test.cc +++ b/paddle/cinn/common/cas_test.cc @@ -19,8 +19,8 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/common/cinn_value_test.cc b/paddle/cinn/common/cinn_value_test.cc index 3419ba7849c09..186c7f6133f25 100644 --- a/paddle/cinn/common/cinn_value_test.cc +++ b/paddle/cinn/common/cinn_value_test.cc @@ -19,7 +19,7 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace common { diff --git a/paddle/cinn/common/ir_util.cc b/paddle/cinn/common/ir_util.cc old mode 100755 new mode 100644 index c590b9443905a..97d56f2ceaeb4 --- a/paddle/cinn/common/ir_util.cc +++ b/paddle/cinn/common/ir_util.cc @@ -18,9 +18,9 @@ #include #include "paddle/cinn/common/cas.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/cast_simplify.h" namespace cinn { diff --git a/paddle/cinn/hlir/framework/op_lowering.cc b/paddle/cinn/hlir/framework/op_lowering.cc index d26e40891a7b3..533327f958f35 100644 --- a/paddle/cinn/hlir/framework/op_lowering.cc +++ b/paddle/cinn/hlir/framework/op_lowering.cc @@ -16,7 +16,7 @@ #include "paddle/cinn/hlir/framework/op_lowering_util.h" #include "paddle/cinn/hlir/op/external_api_registry.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/transform_gpu_forloop.h" DECLARE_bool(cinn_ir_schedule); diff --git a/paddle/cinn/hlir/framework/op_lowering.h b/paddle/cinn/hlir/framework/op_lowering.h index 6059b87ac44d4..d8cf1825df791 100644 --- a/paddle/cinn/hlir/framework/op_lowering.h +++ b/paddle/cinn/hlir/framework/op_lowering.h @@ -21,9 +21,9 @@ #include "paddle/cinn/hlir/framework/graph.h" #include "paddle/cinn/hlir/framework/instruction.h" #include "paddle/cinn/hlir/framework/op_strategy.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/ir_schedule_util.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule_util.h" #include "paddle/cinn/lang/packed_func.h" // Fusion Op lowering, there are four kinds of lowering function: diff --git a/paddle/cinn/hlir/op/broadcast.cc b/paddle/cinn/hlir/op/broadcast.cc index 4fa52b6458df5..646652b0ce33e 100644 --- a/paddle/cinn/hlir/op/broadcast.cc +++ b/paddle/cinn/hlir/op/broadcast.cc @@ -23,8 +23,8 @@ #include "paddle/cinn/hlir/pe/ir_schedule_pe.h" #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_operators.h" #include "paddle/cinn/ir/layout.h" +#include "paddle/cinn/ir/op/ir_operators.h" DECLARE_bool(cinn_ir_schedule); diff --git a/paddle/cinn/hlir/op/contrib/argmax.cc b/paddle/cinn/hlir/op/contrib/argmax.cc index 491a93193c129..f6ae8a5d2b6f0 100644 --- a/paddle/cinn/hlir/op/contrib/argmax.cc +++ b/paddle/cinn/hlir/op/contrib/argmax.cc @@ -30,7 +30,7 @@ #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/argmin.cc b/paddle/cinn/hlir/op/contrib/argmin.cc index a849982df6620..d0d1c63a332e7 100644 --- a/paddle/cinn/hlir/op/contrib/argmin.cc +++ b/paddle/cinn/hlir/op/contrib/argmin.cc @@ -30,7 +30,7 @@ #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/bitcast_convert.cc b/paddle/cinn/hlir/op/contrib/bitcast_convert.cc index 6973afa3b6239..21b3eb2a4bd87 100644 --- a/paddle/cinn/hlir/op/contrib/bitcast_convert.cc +++ b/paddle/cinn/hlir/op/contrib/bitcast_convert.cc @@ -32,7 +32,7 @@ #include "paddle/cinn/hlir/pe/transform.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/cholesky.cc b/paddle/cinn/hlir/op/contrib/cholesky.cc index 93f7649d0cd52..1c6eb90374734 100644 --- a/paddle/cinn/hlir/op/contrib/cholesky.cc +++ b/paddle/cinn/hlir/op/contrib/cholesky.cc @@ -38,7 +38,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/gaussian_random.cc b/paddle/cinn/hlir/op/contrib/gaussian_random.cc index ef1e30f7f3178..29e979aacbf4f 100644 --- a/paddle/cinn/hlir/op/contrib/gaussian_random.cc +++ b/paddle/cinn/hlir/op/contrib/gaussian_random.cc @@ -38,7 +38,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/logical_right_shift.cc b/paddle/cinn/hlir/op/contrib/logical_right_shift.cc index 4b6d3dcf9eef2..b4d57dba997c7 100644 --- a/paddle/cinn/hlir/op/contrib/logical_right_shift.cc +++ b/paddle/cinn/hlir/op/contrib/logical_right_shift.cc @@ -33,7 +33,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/one_hot.cc b/paddle/cinn/hlir/op/contrib/one_hot.cc index b76b2af444591..a9013443212a0 100644 --- a/paddle/cinn/hlir/op/contrib/one_hot.cc +++ b/paddle/cinn/hlir/op/contrib/one_hot.cc @@ -34,7 +34,7 @@ #include "paddle/cinn/hlir/pe/transform.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/randint.cc b/paddle/cinn/hlir/op/contrib/randint.cc index 7c6c1a0582107..260397ea6388c 100644 --- a/paddle/cinn/hlir/op/contrib/randint.cc +++ b/paddle/cinn/hlir/op/contrib/randint.cc @@ -38,7 +38,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/reciprocal.cc b/paddle/cinn/hlir/op/contrib/reciprocal.cc index 5e2968c133461..e7757925b4aee 100644 --- a/paddle/cinn/hlir/op/contrib/reciprocal.cc +++ b/paddle/cinn/hlir/op/contrib/reciprocal.cc @@ -33,7 +33,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/repeat.cc b/paddle/cinn/hlir/op/contrib/repeat.cc index d8545ce310a5b..45ba57167a745 100644 --- a/paddle/cinn/hlir/op/contrib/repeat.cc +++ b/paddle/cinn/hlir/op/contrib/repeat.cc @@ -33,7 +33,7 @@ #include "paddle/cinn/hlir/pe/transform.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/contrib/uniform_random.cc b/paddle/cinn/hlir/op/contrib/uniform_random.cc index 4895c0a16289c..1b6a5b829cc21 100644 --- a/paddle/cinn/hlir/op/contrib/uniform_random.cc +++ b/paddle/cinn/hlir/op/contrib/uniform_random.cc @@ -38,7 +38,7 @@ #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/hlir/op/custom_call.cc b/paddle/cinn/hlir/op/custom_call.cc index 5f272b98c226a..af35c9431bc08 100644 --- a/paddle/cinn/hlir/op/custom_call.cc +++ b/paddle/cinn/hlir/op/custom_call.cc @@ -23,7 +23,7 @@ #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/hlir/pe/transform.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" #ifdef CINN_WITH_CUDNN diff --git a/paddle/cinn/hlir/op/elementwise.cc b/paddle/cinn/hlir/op/elementwise.cc index 9109a1ca4965b..27ac596de870b 100644 --- a/paddle/cinn/hlir/op/elementwise.cc +++ b/paddle/cinn/hlir/op/elementwise.cc @@ -24,7 +24,7 @@ #include "paddle/cinn/hlir/pe/ir_schedule_pe.h" #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/utils/functional.h" DECLARE_bool(cinn_ir_schedule); diff --git a/paddle/cinn/hlir/op/op_util.cc b/paddle/cinn/hlir/op/op_util.cc index 02106ee65d57d..83251a38db7ad 100644 --- a/paddle/cinn/hlir/op/op_util.cc +++ b/paddle/cinn/hlir/op/op_util.cc @@ -19,7 +19,7 @@ #include "paddle/cinn/common/target.h" #include "paddle/cinn/hlir/pe/ir_schedule_pe.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace hlir { diff --git a/paddle/cinn/hlir/op/reduction.cc b/paddle/cinn/hlir/op/reduction.cc index 3e6b5e15ce299..3cd4a3bdd79dd 100644 --- a/paddle/cinn/hlir/op/reduction.cc +++ b/paddle/cinn/hlir/op/reduction.cc @@ -25,8 +25,8 @@ #include "paddle/cinn/hlir/pe/ir_schedule_pe.h" #include "paddle/cinn/hlir/pe/schedule.h" #include "paddle/cinn/hlir/pe/transform.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/optim/ir_simplify.h" namespace cinn { diff --git a/paddle/cinn/hlir/op/transform.cc b/paddle/cinn/hlir/op/transform.cc index 7eaf4213d2a59..0313f73eeb276 100644 --- a/paddle/cinn/hlir/op/transform.cc +++ b/paddle/cinn/hlir/op/transform.cc @@ -25,7 +25,7 @@ #include "paddle/cinn/hlir/pe/ir_schedule_pe.h" #include "paddle/cinn/hlir/pe/nn.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" DECLARE_bool(cinn_ir_schedule); diff --git a/paddle/cinn/hlir/pe/broadcast.cc b/paddle/cinn/hlir/pe/broadcast.cc index 2658fd3fd3980..29abc69587f5e 100644 --- a/paddle/cinn/hlir/pe/broadcast.cc +++ b/paddle/cinn/hlir/pe/broadcast.cc @@ -19,7 +19,7 @@ #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/hlir/op/op_util.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/optim/ir_copy.h" diff --git a/paddle/cinn/hlir/pe/elementwise.cc b/paddle/cinn/hlir/pe/elementwise.cc index d26dba6a04dc1..6a147a21b9a08 100644 --- a/paddle/cinn/hlir/pe/elementwise.cc +++ b/paddle/cinn/hlir/pe/elementwise.cc @@ -18,7 +18,7 @@ #include #include "paddle/cinn/hlir/op/op_util.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/utils/functional.h" diff --git a/paddle/cinn/hlir/pe/ir_schedule_pe.h b/paddle/cinn/hlir/pe/ir_schedule_pe.h index 82967f3d9f536..5a7e32197220f 100644 --- a/paddle/cinn/hlir/pe/ir_schedule_pe.h +++ b/paddle/cinn/hlir/pe/ir_schedule_pe.h @@ -22,8 +22,8 @@ #include "paddle/cinn/hlir/framework/node.h" #include "paddle/cinn/hlir/pe/schedule_param.pb.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_schedule.h" -#include "paddle/cinn/ir/ir_schedule_util.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule_util.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/poly/stage.h" diff --git a/paddle/cinn/hlir/pe/nn.cc b/paddle/cinn/hlir/pe/nn.cc index 6a3f46f6bf0d2..26929568c901f 100644 --- a/paddle/cinn/hlir/pe/nn.cc +++ b/paddle/cinn/hlir/pe/nn.cc @@ -28,7 +28,7 @@ #include "paddle/cinn/hlir/pe/elementwise.h" #include "paddle/cinn/hlir/pe/nn_util.h" #include "paddle/cinn/hlir/pe/schedule.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/optim/ir_copy.h" diff --git a/paddle/cinn/hlir/pe/reduction.cc b/paddle/cinn/hlir/pe/reduction.cc index 8edce3c153bbb..e38465babbb38 100644 --- a/paddle/cinn/hlir/pe/reduction.cc +++ b/paddle/cinn/hlir/pe/reduction.cc @@ -23,7 +23,7 @@ #include "paddle/cinn/hlir/pe/broadcast.h" #include "paddle/cinn/hlir/pe/elementwise.h" #include "paddle/cinn/hlir/pe/nn_util.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" diff --git a/paddle/cinn/ir/CMakeLists.txt b/paddle/cinn/ir/CMakeLists.txt old mode 100755 new mode 100644 index fad631ec34dd7..fdadb140078d2 --- a/paddle/cinn/ir/CMakeLists.txt +++ b/paddle/cinn/ir/CMakeLists.txt @@ -1,5 +1,3 @@ -cinn_proto_library(schedule_desc_proto SRCS schedule_desc.proto) - core_gather_headers() gather_srcs( @@ -7,49 +5,18 @@ gather_srcs( SRCS ir.cc ir_base.cc - ir_schedule.cc - ir_schedule_error.cc - ir_schedule_util.cc - ir_visitor.cc - ir_printer.cc - ir_mutator.cc function_definition.cc - lowered_func.cc - ir_operators.cc - ir_verify.cc buffer.cc function_base.cc operation.cc - collect_ir_nodes.cc registry.cc tensor.cc module.cc + lowered_func.cc intrinsic_ops.cc - layout.cc - schedule_desc.cc - ir_compare.cc) - -# cinn_cc_test(test_ir SRCS ir_test.cc DEPS core) -# cinn_cc_test(test_ir_printer SRCS ir_printer_test.cc DEPS core) -# cinn_cc_test(test_ir_operators SRCS ir_operators_test.cc DEPS core) -cinn_cc_test(test_collect_ir_nodes SRCS collect_ir_nodes_test.cc DEPS cinncore) -# cinn_cc_test(test_tensor SRCS tensor_test.cc DEPS core) -cinn_cc_test( - test_buffer - SRCS - buffer_test.cc - DEPS - cinncore - ARGS - ${global_test_args}) -cinn_cc_test(test_tensor SRCS tensor_test.cc DEPS cinncore) -cinn_cc_test(test_intrinsic_ops SRCS intrinsic_ops_test.cc DEPS cinncore) -cinn_cc_test(test_ir_verify SRCS ir_verify_test.cc DEPS cinncore) -cinn_cc_test(test_schedule_desc SRCS schedule_desc_test.cc DEPS cinncore) -cinn_cc_test(test_ir_compare SRCS ir_compare_test.cc DEPS cinncore) + layout.cc) -foreach(header ${schedule_desc_proto_HDRS}) - set(core_proto_includes - "${core_proto_includes};${header}" - CACHE INTERNAL "") -endforeach() +add_subdirectory(op) +add_subdirectory(test) +add_subdirectory(utils) +add_subdirectory(schedule) diff --git a/paddle/cinn/ir/buffer.cc b/paddle/cinn/ir/buffer.cc index ef9227a2d128c..b7e323f47a961 100755 --- a/paddle/cinn/ir/buffer.cc +++ b/paddle/cinn/ir/buffer.cc @@ -16,8 +16,8 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/runtime/intrinsic.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/ir/ir.cc b/paddle/cinn/ir/ir.cc old mode 100755 new mode 100644 index f9a3b2655396b..a1e92c75c290c --- a/paddle/cinn/ir/ir.cc +++ b/paddle/cinn/ir/ir.cc @@ -20,10 +20,10 @@ #include "paddle/cinn/common/cinn_value.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/module.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/ir_simplify.h" namespace cinn { diff --git a/paddle/cinn/ir/ir_base.cc b/paddle/cinn/ir/ir_base.cc index ed1980511d686..0a353ec02b27e 100644 --- a/paddle/cinn/ir/ir_base.cc +++ b/paddle/cinn/ir/ir_base.cc @@ -18,10 +18,10 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/ir/buffer.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/module.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/lowered_func.cc b/paddle/cinn/ir/lowered_func.cc index 7505a5647f5fe..4399d13121803 100644 --- a/paddle/cinn/ir/lowered_func.cc +++ b/paddle/cinn/ir/lowered_func.cc @@ -25,8 +25,8 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/tensor_write_tell.h" #include "paddle/cinn/runtime/intrinsic.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/ir/op/CMakeLists.txt b/paddle/cinn/ir/op/CMakeLists.txt new file mode 100644 index 0000000000000..76cd17ec52530 --- /dev/null +++ b/paddle/cinn/ir/op/CMakeLists.txt @@ -0,0 +1,3 @@ +core_gather_headers() + +gather_srcs(cinnapi_src SRCS ir_operators.cc) diff --git a/paddle/cinn/ir/ir_operators.cc b/paddle/cinn/ir/op/ir_operators.cc similarity index 99% rename from paddle/cinn/ir/ir_operators.cc rename to paddle/cinn/ir/op/ir_operators.cc index 407c771e070d7..69bdea2378a74 100644 --- a/paddle/cinn/ir/ir_operators.cc +++ b/paddle/cinn/ir/op/ir_operators.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include #include diff --git a/paddle/cinn/ir/ir_operators.h b/paddle/cinn/ir/op/ir_operators.h similarity index 100% rename from paddle/cinn/ir/ir_operators.h rename to paddle/cinn/ir/op/ir_operators.h diff --git a/paddle/cinn/ir/schedule/CMakeLists.txt b/paddle/cinn/ir/schedule/CMakeLists.txt new file mode 100755 index 0000000000000..5df1997279fb7 --- /dev/null +++ b/paddle/cinn/ir/schedule/CMakeLists.txt @@ -0,0 +1,11 @@ +cinn_proto_library(schedule_desc_proto SRCS schedule_desc.proto) + +core_gather_headers() +gather_srcs(cinnapi_src SRCS ir_schedule.cc ir_schedule_util.cc + ir_schedule_error.cc schedule_desc.cc) + +foreach(header ${schedule_desc_proto_HDRS}) + set(core_proto_includes + "${core_proto_includes};${header}" + CACHE INTERNAL "") +endforeach() diff --git a/paddle/cinn/ir/ir_schedule.cc b/paddle/cinn/ir/schedule/ir_schedule.cc similarity index 99% rename from paddle/cinn/ir/ir_schedule.cc rename to paddle/cinn/ir/schedule/ir_schedule.cc index 288e2db4832a0..af0db05f36af0 100644 --- a/paddle/cinn/ir/ir_schedule.cc +++ b/paddle/cinn/ir/schedule/ir_schedule.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include @@ -28,14 +28,13 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule_error.h" -#include "paddle/cinn/ir/ir_schedule_util.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/schedule/ir_schedule_error.h" +#include "paddle/cinn/ir/schedule/ir_schedule_util.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" diff --git a/paddle/cinn/ir/ir_schedule.h b/paddle/cinn/ir/schedule/ir_schedule.h similarity index 99% rename from paddle/cinn/ir/ir_schedule.h rename to paddle/cinn/ir/schedule/ir_schedule.h index a68fdbbd26282..c36a3363c6dcc 100644 --- a/paddle/cinn/ir/ir_schedule.h +++ b/paddle/cinn/ir/schedule/ir_schedule.h @@ -21,9 +21,9 @@ #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/utils/random_engine.h" namespace cinn { diff --git a/paddle/cinn/ir/ir_schedule_error.cc b/paddle/cinn/ir/schedule/ir_schedule_error.cc similarity index 95% rename from paddle/cinn/ir/ir_schedule_error.cc rename to paddle/cinn/ir/schedule/ir_schedule_error.cc index b6d2c2f94d4f3..30c970ffd16d6 100644 --- a/paddle/cinn/ir/ir_schedule_error.cc +++ b/paddle/cinn/ir/schedule/ir_schedule_error.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_schedule_error.h" +#include "paddle/cinn/ir/schedule/ir_schedule_error.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/ir_schedule_error.h b/paddle/cinn/ir/schedule/ir_schedule_error.h similarity index 99% rename from paddle/cinn/ir/ir_schedule_error.h rename to paddle/cinn/ir/schedule/ir_schedule_error.h index eb4a70175a8ca..9c4f15ddab962 100644 --- a/paddle/cinn/ir/ir_schedule_error.h +++ b/paddle/cinn/ir/schedule/ir_schedule_error.h @@ -38,7 +38,7 @@ #include #include #include -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/ir_schedule_util.cc b/paddle/cinn/ir/schedule/ir_schedule_util.cc similarity index 99% rename from paddle/cinn/ir/ir_schedule_util.cc rename to paddle/cinn/ir/schedule/ir_schedule_util.cc index 4399716796d03..70bc7b0415b88 100644 --- a/paddle/cinn/ir/ir_schedule_util.cc +++ b/paddle/cinn/ir/schedule/ir_schedule_util.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_schedule_util.h" +#include "paddle/cinn/ir/schedule/ir_schedule_util.h" #include @@ -25,11 +25,11 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" diff --git a/paddle/cinn/ir/ir_schedule_util.h b/paddle/cinn/ir/schedule/ir_schedule_util.h similarity index 99% rename from paddle/cinn/ir/ir_schedule_util.h rename to paddle/cinn/ir/schedule/ir_schedule_util.h index 33a8337b8f911..2d319c44f8ae5 100644 --- a/paddle/cinn/ir/ir_schedule_util.h +++ b/paddle/cinn/ir/schedule/ir_schedule_util.h @@ -22,9 +22,9 @@ #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_schedule_error.h" +#include "paddle/cinn/ir/schedule/ir_schedule_error.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/utils/random_engine.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/ir/schedule_desc.cc b/paddle/cinn/ir/schedule/schedule_desc.cc similarity index 99% rename from paddle/cinn/ir/schedule_desc.cc rename to paddle/cinn/ir/schedule/schedule_desc.cc index 5ab75684de79c..a3ef7e72a1bc9 100644 --- a/paddle/cinn/ir/schedule_desc.cc +++ b/paddle/cinn/ir/schedule/schedule_desc.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" #include @@ -21,7 +21,7 @@ #include #include "paddle/cinn/common/macros.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/ir/schedule_desc.h b/paddle/cinn/ir/schedule/schedule_desc.h similarity index 98% rename from paddle/cinn/ir/schedule_desc.h rename to paddle/cinn/ir/schedule/schedule_desc.h index c166479e695d5..eeaca70ca0e94 100644 --- a/paddle/cinn/ir/schedule_desc.h +++ b/paddle/cinn/ir/schedule/schedule_desc.h @@ -20,7 +20,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/schedule_desc.pb.h" +#include "paddle/cinn/ir/schedule/schedule_desc.pb.h" #include "paddle/cinn/utils/registry.h" #include "paddle/cinn/utils/type_defs.h" diff --git a/paddle/cinn/ir/schedule_desc.proto b/paddle/cinn/ir/schedule/schedule_desc.proto similarity index 100% rename from paddle/cinn/ir/schedule_desc.proto rename to paddle/cinn/ir/schedule/schedule_desc.proto diff --git a/paddle/cinn/ir/tensor.cc b/paddle/cinn/ir/tensor.cc old mode 100755 new mode 100644 index c5f5232e9a179..b324e1fd25961 --- a/paddle/cinn/ir/tensor.cc +++ b/paddle/cinn/ir/tensor.cc @@ -23,10 +23,10 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/operation.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/poly/isl_utils.h" #include "paddle/cinn/poly/stage.h" diff --git a/paddle/cinn/ir/test/CMakeLists.txt b/paddle/cinn/ir/test/CMakeLists.txt new file mode 100644 index 0000000000000..de5816d9e808d --- /dev/null +++ b/paddle/cinn/ir/test/CMakeLists.txt @@ -0,0 +1,18 @@ +# cinn_cc_test(test_ir SRCS ir_test.cc DEPS core) +# cinn_cc_test(test_ir_printer SRCS ir_printer_test.cc DEPS core) +# cinn_cc_test(test_ir_operators SRCS ir_operators_test.cc DEPS core) +# cinn_cc_test(test_tensor SRCS tensor_test.cc DEPS core) +cinn_cc_test(test_collect_ir_nodes SRCS collect_ir_nodes_test.cc DEPS cinncore) +cinn_cc_test( + test_buffer + SRCS + buffer_test.cc + DEPS + cinncore + ARGS + ${global_test_args}) +cinn_cc_test(test_tensor SRCS tensor_test.cc DEPS cinncore) +cinn_cc_test(test_intrinsic_ops SRCS intrinsic_ops_test.cc DEPS cinncore) +cinn_cc_test(test_ir_verify SRCS ir_verify_test.cc DEPS cinncore) +cinn_cc_test(test_schedule_desc SRCS schedule_desc_test.cc DEPS cinncore) +cinn_cc_test(test_ir_compare SRCS ir_compare_test.cc DEPS cinncore) diff --git a/paddle/cinn/ir/buffer_test.cc b/paddle/cinn/ir/test/buffer_test.cc similarity index 100% rename from paddle/cinn/ir/buffer_test.cc rename to paddle/cinn/ir/test/buffer_test.cc diff --git a/paddle/cinn/ir/collect_ir_nodes_test.cc b/paddle/cinn/ir/test/collect_ir_nodes_test.cc similarity index 100% rename from paddle/cinn/ir/collect_ir_nodes_test.cc rename to paddle/cinn/ir/test/collect_ir_nodes_test.cc diff --git a/paddle/cinn/ir/intrinsic_ops_test.cc b/paddle/cinn/ir/test/intrinsic_ops_test.cc similarity index 100% rename from paddle/cinn/ir/intrinsic_ops_test.cc rename to paddle/cinn/ir/test/intrinsic_ops_test.cc diff --git a/paddle/cinn/ir/ir_compare_test.cc b/paddle/cinn/ir/test/ir_compare_test.cc similarity index 98% rename from paddle/cinn/ir/ir_compare_test.cc rename to paddle/cinn/ir/test/ir_compare_test.cc index a4c374dc59960..a1bca0cd5373f 100644 --- a/paddle/cinn/ir/ir_compare_test.cc +++ b/paddle/cinn/ir/test/ir_compare_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_compare.h" +#include "paddle/cinn/ir/utils/ir_compare.h" #include #include diff --git a/paddle/cinn/ir/ir_operators_test.cc b/paddle/cinn/ir/test/ir_operators_test.cc similarity index 94% rename from paddle/cinn/ir/ir_operators_test.cc rename to paddle/cinn/ir/test/ir_operators_test.cc index e3411a0e0d783..83ffdf2e5f82d 100644 --- a/paddle/cinn/ir/ir_operators_test.cc +++ b/paddle/cinn/ir/test/ir_operators_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include diff --git a/paddle/cinn/ir/ir_printer_test.cc b/paddle/cinn/ir/test/ir_printer_test.cc similarity index 94% rename from paddle/cinn/ir/ir_printer_test.cc rename to paddle/cinn/ir/test/ir_printer_test.cc index e1e55b0d61593..f85c04904022a 100644 --- a/paddle/cinn/ir/ir_printer_test.cc +++ b/paddle/cinn/ir/test/ir_printer_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include diff --git a/paddle/cinn/ir/ir_test.cc b/paddle/cinn/ir/test/ir_test.cc similarity index 100% rename from paddle/cinn/ir/ir_test.cc rename to paddle/cinn/ir/test/ir_test.cc diff --git a/paddle/cinn/ir/ir_verify_test.cc b/paddle/cinn/ir/test/ir_verify_test.cc similarity index 89% rename from paddle/cinn/ir/ir_verify_test.cc rename to paddle/cinn/ir/test/ir_verify_test.cc index ed34a1d8be3a4..06a842ef5ba81 100644 --- a/paddle/cinn/ir/ir_verify_test.cc +++ b/paddle/cinn/ir/test/ir_verify_test.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_verify.h" +#include "paddle/cinn/ir/utils/ir_verify.h" #include -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" namespace cinn::ir { diff --git a/paddle/cinn/ir/schedule_desc_test.cc b/paddle/cinn/ir/test/schedule_desc_test.cc similarity index 99% rename from paddle/cinn/ir/schedule_desc_test.cc rename to paddle/cinn/ir/test/schedule_desc_test.cc index a58a322afdf0a..1cefd9a1b1971 100644 --- a/paddle/cinn/ir/schedule_desc_test.cc +++ b/paddle/cinn/ir/test/schedule_desc_test.cc @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/schedule_desc.h" +#include "paddle/cinn/ir/schedule/schedule_desc.h" #include #include #include "paddle/cinn/cinn.h" #include "paddle/cinn/common/context.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/ir/tensor_test.cc b/paddle/cinn/ir/test/tensor_test.cc similarity index 98% rename from paddle/cinn/ir/tensor_test.cc rename to paddle/cinn/ir/test/tensor_test.cc index 19b92ce51703a..c74d954a51f68 100755 --- a/paddle/cinn/ir/tensor_test.cc +++ b/paddle/cinn/ir/test/tensor_test.cc @@ -20,8 +20,8 @@ #include "paddle/cinn/backends/llvm/execution_engine.h" #include "paddle/cinn/cinn.h" #include "paddle/cinn/common/test_helper.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/ir/utils/CMakeLists.txt b/paddle/cinn/ir/utils/CMakeLists.txt new file mode 100644 index 0000000000000..58d9c3b59dc1a --- /dev/null +++ b/paddle/cinn/ir/utils/CMakeLists.txt @@ -0,0 +1,11 @@ +core_gather_headers() + +gather_srcs( + cinnapi_src + SRCS + ir_visitor.cc + ir_mutator.cc + ir_printer.cc + ir_verify.cc + ir_compare.cc + ir_nodes_collector.cc) diff --git a/paddle/cinn/ir/ir_compare.cc b/paddle/cinn/ir/utils/ir_compare.cc similarity index 99% rename from paddle/cinn/ir/ir_compare.cc rename to paddle/cinn/ir/utils/ir_compare.cc index 9832343c5ffde..c303262d04fbd 100644 --- a/paddle/cinn/ir/ir_compare.cc +++ b/paddle/cinn/ir/utils/ir_compare.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_compare.h" +#include "paddle/cinn/ir/utils/ir_compare.h" #include #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/ir_compare.h b/paddle/cinn/ir/utils/ir_compare.h similarity index 97% rename from paddle/cinn/ir/ir_compare.h rename to paddle/cinn/ir/utils/ir_compare.h index 9ea6a13c79d0e..9e4b335857b98 100644 --- a/paddle/cinn/ir/ir_compare.h +++ b/paddle/cinn/ir/utils/ir_compare.h @@ -16,7 +16,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/ir_mutator.cc b/paddle/cinn/ir/utils/ir_mutator.cc similarity index 88% rename from paddle/cinn/ir/ir_mutator.cc rename to paddle/cinn/ir/utils/ir_mutator.cc index 341a8be3edc3a..9224e863b4a76 100644 --- a/paddle/cinn/ir/ir_mutator.cc +++ b/paddle/cinn/ir/utils/ir_mutator.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace ir {} // namespace ir diff --git a/paddle/cinn/ir/ir_mutator.h b/paddle/cinn/ir/utils/ir_mutator.h similarity index 99% rename from paddle/cinn/ir/ir_mutator.h rename to paddle/cinn/ir/utils/ir_mutator.h index d83c54152206d..7962f414f10c3 100644 --- a/paddle/cinn/ir/ir_mutator.h +++ b/paddle/cinn/ir/utils/ir_mutator.h @@ -19,7 +19,7 @@ #include "paddle/cinn/ir/intrinsic_ops.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/collect_ir_nodes.cc b/paddle/cinn/ir/utils/ir_nodes_collector.cc similarity index 97% rename from paddle/cinn/ir/collect_ir_nodes.cc rename to paddle/cinn/ir/utils/ir_nodes_collector.cc index 74a13c2e61bae..e99da88a1dd35 100644 --- a/paddle/cinn/ir/collect_ir_nodes.cc +++ b/paddle/cinn/ir/utils/ir_nodes_collector.cc @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/collect_ir_nodes.h" - +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" #include -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/ir/collect_ir_nodes.h b/paddle/cinn/ir/utils/ir_nodes_collector.h similarity index 100% rename from paddle/cinn/ir/collect_ir_nodes.h rename to paddle/cinn/ir/utils/ir_nodes_collector.h diff --git a/paddle/cinn/ir/ir_printer.cc b/paddle/cinn/ir/utils/ir_printer.cc similarity index 99% rename from paddle/cinn/ir/ir_printer.cc rename to paddle/cinn/ir/utils/ir_printer.cc index 64945254d84d9..e42aa509e3e46 100644 --- a/paddle/cinn/ir/ir_printer.cc +++ b/paddle/cinn/ir/utils/ir_printer.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include #include diff --git a/paddle/cinn/ir/ir_printer.h b/paddle/cinn/ir/utils/ir_printer.h similarity index 98% rename from paddle/cinn/ir/ir_printer.h rename to paddle/cinn/ir/utils/ir_printer.h index 84a4b8f1cd5f7..e07079c3d5955 100644 --- a/paddle/cinn/ir/ir_printer.h +++ b/paddle/cinn/ir/utils/ir_printer.h @@ -18,7 +18,7 @@ #include "paddle/cinn/ir/buffer.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" namespace cinn { diff --git a/paddle/cinn/ir/ir_verify.cc b/paddle/cinn/ir/utils/ir_verify.cc similarity index 88% rename from paddle/cinn/ir/ir_verify.cc rename to paddle/cinn/ir/utils/ir_verify.cc index 0a91ac17d18d0..d0f69802438bb 100644 --- a/paddle/cinn/ir/ir_verify.cc +++ b/paddle/cinn/ir/utils/ir_verify.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_verify.h" +#include "paddle/cinn/ir/utils/ir_verify.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn::ir { diff --git a/paddle/cinn/ir/ir_verify.h b/paddle/cinn/ir/utils/ir_verify.h similarity index 100% rename from paddle/cinn/ir/ir_verify.h rename to paddle/cinn/ir/utils/ir_verify.h diff --git a/paddle/cinn/ir/ir_visitor.cc b/paddle/cinn/ir/utils/ir_visitor.cc similarity index 85% rename from paddle/cinn/ir/ir_visitor.cc rename to paddle/cinn/ir/utils/ir_visitor.cc index 50d81b839bc41..9ef6a78df1fcd 100644 --- a/paddle/cinn/ir/ir_visitor.cc +++ b/paddle/cinn/ir/utils/ir_visitor.cc @@ -12,13 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/cinn/ir/ir_visitor.h" - #include -#include "paddle/cinn/ir/ir_compare.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_compare.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/ir/ir_visitor.h b/paddle/cinn/ir/utils/ir_visitor.h similarity index 97% rename from paddle/cinn/ir/ir_visitor.h rename to paddle/cinn/ir/utils/ir_visitor.h index 75b0b8413d05e..7eb5c8fdb5d9c 100644 --- a/paddle/cinn/ir/ir_visitor.h +++ b/paddle/cinn/ir/utils/ir_visitor.h @@ -17,11 +17,11 @@ #include #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" #include "paddle/cinn/ir/intrinsic_ops.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/lowered_func.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" namespace cinn { namespace ir { diff --git a/paddle/cinn/lang/builtin.h b/paddle/cinn/lang/builtin.h index b18c3ad1308a2..fee72c4e4b105 100644 --- a/paddle/cinn/lang/builtin.h +++ b/paddle/cinn/lang/builtin.h @@ -18,7 +18,7 @@ #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" namespace cinn { namespace lang { diff --git a/paddle/cinn/lang/compute.h b/paddle/cinn/lang/compute.h index 5917db305b46f..d8b2fac6e6b86 100755 --- a/paddle/cinn/lang/compute.h +++ b/paddle/cinn/lang/compute.h @@ -22,7 +22,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/placeholder.h" #include "paddle/cinn/poly/schedule.h" diff --git a/paddle/cinn/lang/compute_test.cc b/paddle/cinn/lang/compute_test.cc index d666a47547ac7..695ee9e9514bd 100644 --- a/paddle/cinn/lang/compute_test.cc +++ b/paddle/cinn/lang/compute_test.cc @@ -17,7 +17,7 @@ #include #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/buffer.h" #include "paddle/cinn/lang/placeholder.h" diff --git a/paddle/cinn/lang/lower.cc b/paddle/cinn/lang/lower.cc index 5d09b7e1eb983..1661f65975c8f 100755 --- a/paddle/cinn/lang/lower.cc +++ b/paddle/cinn/lang/lower.cc @@ -22,7 +22,7 @@ #include #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower_impl.h" #include "paddle/cinn/optim/optimize.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/lang/lower_impl.cc b/paddle/cinn/lang/lower_impl.cc index 9441b0a828dcf..f313d52938a93 100644 --- a/paddle/cinn/lang/lower_impl.cc +++ b/paddle/cinn/lang/lower_impl.cc @@ -23,8 +23,8 @@ #include "paddle/cinn/common/context.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/remove_nested_block.h" #include "paddle/cinn/optim/replace_var_with_expr.h" #include "paddle/cinn/optim/transform_polyfor_to_for.h" diff --git a/paddle/cinn/lang/lower_impl.h b/paddle/cinn/lang/lower_impl.h index bc7494f57f669..3e52279b19566 100644 --- a/paddle/cinn/lang/lower_impl.h +++ b/paddle/cinn/lang/lower_impl.h @@ -27,7 +27,7 @@ #include "paddle/cinn/common/graph_utils.h" #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/buffer_assign.h" #include "paddle/cinn/optim/compute_inline_expand.h" #include "paddle/cinn/optim/fold_cinn_call_arguments.h" diff --git a/paddle/cinn/lang/packed_func_test.cc b/paddle/cinn/lang/packed_func_test.cc index b5e941f1abed2..f5683e492a8d5 100644 --- a/paddle/cinn/lang/packed_func_test.cc +++ b/paddle/cinn/lang/packed_func_test.cc @@ -16,8 +16,8 @@ #include -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/lang/placeholder.h b/paddle/cinn/lang/placeholder.h index a0eaaab5ddc51..88d60f21cf2f5 100644 --- a/paddle/cinn/lang/placeholder.h +++ b/paddle/cinn/lang/placeholder.h @@ -19,9 +19,9 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/ir/buffer.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" #include "paddle/cinn/ir/operation.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/runtime/intrinsic.h" namespace cinn { diff --git a/paddle/cinn/lang/placeholder_test.cc b/paddle/cinn/lang/placeholder_test.cc index 158d818f0e02e..ebf813e75f6c6 100644 --- a/paddle/cinn/lang/placeholder_test.cc +++ b/paddle/cinn/lang/placeholder_test.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace lang { diff --git a/paddle/cinn/optim/buffer_assign.cc b/paddle/cinn/optim/buffer_assign.cc index dcfd6d8b8fb23..eb059a30ea26d 100644 --- a/paddle/cinn/optim/buffer_assign.cc +++ b/paddle/cinn/optim/buffer_assign.cc @@ -15,8 +15,8 @@ #include "paddle/cinn/optim/buffer_assign.h" #include "paddle/cinn/common/union_find.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/lower_impl.h" #include "paddle/cinn/optim/ir_replace.h" diff --git a/paddle/cinn/optim/call_arg_list_to_pod_value.cc b/paddle/cinn/optim/call_arg_list_to_pod_value.cc index 62afec620f364..f5e178c96ee78 100644 --- a/paddle/cinn/optim/call_arg_list_to_pod_value.cc +++ b/paddle/cinn/optim/call_arg_list_to_pod_value.cc @@ -19,7 +19,7 @@ #include #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/runtime/intrinsic.h" namespace cinn { diff --git a/paddle/cinn/optim/cast_bool_to_int8.cc b/paddle/cinn/optim/cast_bool_to_int8.cc index 64385623bcd21..de8947fe4b655 100644 --- a/paddle/cinn/optim/cast_bool_to_int8.cc +++ b/paddle/cinn/optim/cast_bool_to_int8.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/cast_simplify.cc b/paddle/cinn/optim/cast_simplify.cc index 9a6f80b7e302a..a6431e42e467c 100644 --- a/paddle/cinn/optim/cast_simplify.cc +++ b/paddle/cinn/optim/cast_simplify.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/optim/cast_simplify.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/cast_simplify_test.cc b/paddle/cinn/optim/cast_simplify_test.cc index eebd935efd9ff..5b7a21bae86f4 100644 --- a/paddle/cinn/optim/cast_simplify_test.cc +++ b/paddle/cinn/optim/cast_simplify_test.cc @@ -16,8 +16,8 @@ #include -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/collect_undefined_vars.cc b/paddle/cinn/optim/collect_undefined_vars.cc index a912a484fce1b..2f925d1333f39 100644 --- a/paddle/cinn/optim/collect_undefined_vars.cc +++ b/paddle/cinn/optim/collect_undefined_vars.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/compute_inline_expand.cc b/paddle/cinn/optim/compute_inline_expand.cc index 8c38090db94dd..d18d5a45f6375 100644 --- a/paddle/cinn/optim/compute_inline_expand.cc +++ b/paddle/cinn/optim/compute_inline_expand.cc @@ -18,7 +18,7 @@ #include #include "paddle/cinn/common/graph_utils.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/replace_var_with_expr.h" diff --git a/paddle/cinn/optim/eliminate_broadcast_in_forloop.cc b/paddle/cinn/optim/eliminate_broadcast_in_forloop.cc index d9f65cdb80a3e..a4feec97626cb 100644 --- a/paddle/cinn/optim/eliminate_broadcast_in_forloop.cc +++ b/paddle/cinn/optim/eliminate_broadcast_in_forloop.cc @@ -17,9 +17,9 @@ #include #include -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/ir_replace.h" namespace cinn { diff --git a/paddle/cinn/optim/extern_call_process.cc b/paddle/cinn/optim/extern_call_process.cc index be3636c81982e..1b8204093c6fa 100644 --- a/paddle/cinn/optim/extern_call_process.cc +++ b/paddle/cinn/optim/extern_call_process.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/optim/extern_call_process.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/fold_cinn_call_arguments.cc b/paddle/cinn/optim/fold_cinn_call_arguments.cc index 8ce5743d2230c..ebff4c68e2254 100644 --- a/paddle/cinn/optim/fold_cinn_call_arguments.cc +++ b/paddle/cinn/optim/fold_cinn_call_arguments.cc @@ -17,8 +17,8 @@ #include #include -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/optim/if_simplify.cc b/paddle/cinn/optim/if_simplify.cc index b3b46385d6270..cc90b119302f1 100644 --- a/paddle/cinn/optim/if_simplify.cc +++ b/paddle/cinn/optim/if_simplify.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/optim/if_simplify.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/if_simplify_test.cc b/paddle/cinn/optim/if_simplify_test.cc index 2be36eb14c3fa..5cd69a0ba46a3 100644 --- a/paddle/cinn/optim/if_simplify_test.cc +++ b/paddle/cinn/optim/if_simplify_test.cc @@ -18,7 +18,7 @@ #include -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/insert_debug_log_callee.cc b/paddle/cinn/optim/insert_debug_log_callee.cc index fdab377bc88cc..24583a5bdb3b3 100644 --- a/paddle/cinn/optim/insert_debug_log_callee.cc +++ b/paddle/cinn/optim/insert_debug_log_callee.cc @@ -19,8 +19,8 @@ #include #include "paddle/cinn/common/common.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/runtime/intrinsic.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/optim/ir_copy.cc b/paddle/cinn/optim/ir_copy.cc index 6ec7bd35201f9..3bf7eb323a8fe 100644 --- a/paddle/cinn/optim/ir_copy.cc +++ b/paddle/cinn/optim/ir_copy.cc @@ -21,10 +21,10 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule.h" #include "paddle/cinn/ir/module.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/ir_copy_test.cc b/paddle/cinn/optim/ir_copy_test.cc index 5aba015617d77..91128264853a1 100644 --- a/paddle/cinn/optim/ir_copy_test.cc +++ b/paddle/cinn/optim/ir_copy_test.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/ir_replace.cc b/paddle/cinn/optim/ir_replace.cc index 5b80d8e59e28d..815fe4a15b2d9 100755 --- a/paddle/cinn/optim/ir_replace.cc +++ b/paddle/cinn/optim/ir_replace.cc @@ -16,8 +16,8 @@ #include -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/optim/ir_simplify.cc b/paddle/cinn/optim/ir_simplify.cc index 51915c925007e..5144543e05bad 100644 --- a/paddle/cinn/optim/ir_simplify.cc +++ b/paddle/cinn/optim/ir_simplify.cc @@ -24,11 +24,11 @@ #include "paddle/cinn/common/arithmatic.h" #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/cast_simplify.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/optim/lower_function_call_bind_vars.cc b/paddle/cinn/optim/lower_function_call_bind_vars.cc index 90ef5a1606a5a..c5b09eb3cc0b3 100644 --- a/paddle/cinn/optim/lower_function_call_bind_vars.cc +++ b/paddle/cinn/optim/lower_function_call_bind_vars.cc @@ -17,7 +17,7 @@ #include #include -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/lower_intrin.cc b/paddle/cinn/optim/lower_intrin.cc index f6fce4009c548..b53f81ab7f53a 100644 --- a/paddle/cinn/optim/lower_intrin.cc +++ b/paddle/cinn/optim/lower_intrin.cc @@ -19,8 +19,8 @@ #include "paddle/cinn/backends/llvm/llvm_intrin_rule.h" #include "paddle/cinn/cinn.h" #include "paddle/cinn/ir/intrinsic_ops.h" -#include "paddle/cinn/ir/ir_mutator.h" #include "paddle/cinn/ir/registry.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/map_extern_call.cc b/paddle/cinn/optim/map_extern_call.cc index 3a9531391ca9d..40c5adf3b7c96 100644 --- a/paddle/cinn/optim/map_extern_call.cc +++ b/paddle/cinn/optim/map_extern_call.cc @@ -16,7 +16,7 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/hlir/op/op_util.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/runtime/cpu/host_intrinsics.h" namespace cinn { diff --git a/paddle/cinn/optim/optimize.cc b/paddle/cinn/optim/optimize.cc index 4899c73254ea0..2acf8c331d11a 100644 --- a/paddle/cinn/optim/optimize.cc +++ b/paddle/cinn/optim/optimize.cc @@ -14,8 +14,8 @@ #include "paddle/cinn/optim/optimize.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_schedule_util.h" +#include "paddle/cinn/ir/schedule/ir_schedule_util.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/call_arg_list_to_pod_value.h" #include "paddle/cinn/optim/cast_bool_to_int8.h" #include "paddle/cinn/optim/cast_simplify.h" diff --git a/paddle/cinn/optim/optimize_test.cc b/paddle/cinn/optim/optimize_test.cc index bd1515fd7924c..2a152d70a21c0 100755 --- a/paddle/cinn/optim/optimize_test.cc +++ b/paddle/cinn/optim/optimize_test.cc @@ -17,7 +17,7 @@ #include #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/optim/remove_nested_block.cc b/paddle/cinn/optim/remove_nested_block.cc index de42ad46f03fc..06050ec5b123c 100644 --- a/paddle/cinn/optim/remove_nested_block.cc +++ b/paddle/cinn/optim/remove_nested_block.cc @@ -14,8 +14,8 @@ #include "paddle/cinn/optim/remove_nested_block.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/remove_nested_block_test.cc b/paddle/cinn/optim/remove_nested_block_test.cc index b91c8204e242f..27238329dfbd7 100644 --- a/paddle/cinn/optim/remove_nested_block_test.cc +++ b/paddle/cinn/optim/remove_nested_block_test.cc @@ -19,7 +19,7 @@ #include #include -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/optim/remove_schedule_block.cc b/paddle/cinn/optim/remove_schedule_block.cc index 007174801550d..a4478335b8a81 100644 --- a/paddle/cinn/optim/remove_schedule_block.cc +++ b/paddle/cinn/optim/remove_schedule_block.cc @@ -14,8 +14,8 @@ #include "paddle/cinn/optim/remove_schedule_block.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/replace_var_with_expr.h" namespace cinn { diff --git a/paddle/cinn/optim/remove_schedule_block_test.cc b/paddle/cinn/optim/remove_schedule_block_test.cc index 4fd2d7999e426..4c1082b155e5a 100755 --- a/paddle/cinn/optim/remove_schedule_block_test.cc +++ b/paddle/cinn/optim/remove_schedule_block_test.cc @@ -21,8 +21,8 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/optim/replace_call_with_expr.cc b/paddle/cinn/optim/replace_call_with_expr.cc index 3f1344fd6f021..26dc7662ec5ac 100644 --- a/paddle/cinn/optim/replace_call_with_expr.cc +++ b/paddle/cinn/optim/replace_call_with_expr.cc @@ -14,8 +14,8 @@ #include "paddle/cinn/optim/replace_call_with_expr.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/replace_var_with_expr.h" diff --git a/paddle/cinn/optim/replace_call_with_expr_test.cc b/paddle/cinn/optim/replace_call_with_expr_test.cc index c422ceb0d4be2..627937e57d10c 100644 --- a/paddle/cinn/optim/replace_call_with_expr_test.cc +++ b/paddle/cinn/optim/replace_call_with_expr_test.cc @@ -17,8 +17,8 @@ #include #include "paddle/cinn/ir/buffer.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/placeholder.h" #include "paddle/cinn/poly/ast_gen.h" diff --git a/paddle/cinn/optim/replace_const_param_to_integer.cc b/paddle/cinn/optim/replace_const_param_to_integer.cc index ad72439a1631a..cca56a76d1bd7 100644 --- a/paddle/cinn/optim/replace_const_param_to_integer.cc +++ b/paddle/cinn/optim/replace_const_param_to_integer.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/optim/replace_const_param_to_integer.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" #include "paddle/cinn/poly/ast_gen.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/optim/replace_var_with_expr.cc b/paddle/cinn/optim/replace_var_with_expr.cc index f994eeb2e2a55..a8c9f8cd961d0 100644 --- a/paddle/cinn/optim/replace_var_with_expr.cc +++ b/paddle/cinn/optim/replace_var_with_expr.cc @@ -16,10 +16,10 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/replace_const_param_to_integer.h" diff --git a/paddle/cinn/optim/tensor_write_tell.h b/paddle/cinn/optim/tensor_write_tell.h index 6e7b8b9f48f32..f8ee114561a30 100644 --- a/paddle/cinn/optim/tensor_write_tell.h +++ b/paddle/cinn/optim/tensor_write_tell.h @@ -17,7 +17,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/transform_gpu_forloop.cc b/paddle/cinn/optim/transform_gpu_forloop.cc index a95d0a3425af9..0b95313034ba2 100644 --- a/paddle/cinn/optim/transform_gpu_forloop.cc +++ b/paddle/cinn/optim/transform_gpu_forloop.cc @@ -24,8 +24,8 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/replace_var_with_expr.h" diff --git a/paddle/cinn/optim/transform_polyfor_to_for.cc b/paddle/cinn/optim/transform_polyfor_to_for.cc index ebee754b787ba..82d500d5dca06 100644 --- a/paddle/cinn/optim/transform_polyfor_to_for.cc +++ b/paddle/cinn/optim/transform_polyfor_to_for.cc @@ -21,10 +21,10 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/common/type.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" diff --git a/paddle/cinn/optim/unroll_loops.cc b/paddle/cinn/optim/unroll_loops.cc old mode 100755 new mode 100644 index 6d48104bd47fa..0510774805992 --- a/paddle/cinn/optim/unroll_loops.cc +++ b/paddle/cinn/optim/unroll_loops.cc @@ -17,9 +17,9 @@ #include #include -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_replace.h" diff --git a/paddle/cinn/optim/unroll_loops_test.cc b/paddle/cinn/optim/unroll_loops_test.cc index 56014524514a6..5ce412a245e3e 100644 --- a/paddle/cinn/optim/unroll_loops_test.cc +++ b/paddle/cinn/optim/unroll_loops_test.cc @@ -19,7 +19,7 @@ #include #include "paddle/cinn/cinn.h" -#include "paddle/cinn/ir/ir_schedule.h" +#include "paddle/cinn/ir/schedule/ir_schedule.h" #include "paddle/cinn/lang/lower.h" namespace cinn { diff --git a/paddle/cinn/optim/var_mod_simplify.cc b/paddle/cinn/optim/var_mod_simplify.cc index dcd6de24fef2e..20e02ec0cc191 100644 --- a/paddle/cinn/optim/var_mod_simplify.cc +++ b/paddle/cinn/optim/var_mod_simplify.cc @@ -17,8 +17,8 @@ #include #include "paddle/cinn/common/cas.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn::optim { diff --git a/paddle/cinn/optim/vectorize_loops.cc b/paddle/cinn/optim/vectorize_loops.cc index 4a4cbfcef6481..e15ab71d46729 100644 --- a/paddle/cinn/optim/vectorize_loops.cc +++ b/paddle/cinn/optim/vectorize_loops.cc @@ -25,9 +25,9 @@ #include "paddle/cinn/common/cas.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_replace.h" #include "paddle/cinn/optim/ir_simplify.h" diff --git a/paddle/cinn/optim/vectorize_loops.h b/paddle/cinn/optim/vectorize_loops.h index 6dfeefda6cdc5..bf053c28335a8 100644 --- a/paddle/cinn/optim/vectorize_loops.h +++ b/paddle/cinn/optim/vectorize_loops.h @@ -14,7 +14,7 @@ #pragma once -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace optim { diff --git a/paddle/cinn/optim/vectorize_loops_test.cc b/paddle/cinn/optim/vectorize_loops_test.cc index 8c589e23027d5..f3ad6ee07f3c4 100644 --- a/paddle/cinn/optim/vectorize_loops_test.cc +++ b/paddle/cinn/optim/vectorize_loops_test.cc @@ -21,7 +21,7 @@ #include "paddle/cinn/cinn.h" #include "paddle/cinn/common/common.h" #include "paddle/cinn/common/ir_util.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/optim/optimize.h" #include "paddle/cinn/optim/transform_polyfor_to_for.h" diff --git a/paddle/cinn/poly/ast_gen.cc b/paddle/cinn/poly/ast_gen.cc index f71ec5fed9ed6..6cfebe63a5d43 100644 --- a/paddle/cinn/poly/ast_gen.cc +++ b/paddle/cinn/poly/ast_gen.cc @@ -20,7 +20,7 @@ #include "paddle/cinn/common/common.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/poly/domain_add_unit_loop_mutator.h" #include "paddle/cinn/poly/isl_utils.h" diff --git a/paddle/cinn/poly/ast_gen_test.cc b/paddle/cinn/poly/ast_gen_test.cc index ed4861d43dd8f..01605b6008dee 100644 --- a/paddle/cinn/poly/ast_gen_test.cc +++ b/paddle/cinn/poly/ast_gen_test.cc @@ -22,7 +22,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/lang/builtin.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/placeholder.h" diff --git a/paddle/cinn/poly/dim.cc b/paddle/cinn/poly/dim.cc index e72a3e5ab264c..d5e47b65fee5f 100644 --- a/paddle/cinn/poly/dim.cc +++ b/paddle/cinn/poly/dim.cc @@ -14,7 +14,7 @@ #include "paddle/cinn/poly/dim.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/poly/domain.cc b/paddle/cinn/poly/domain.cc index 09f988b920620..309fa5aaa3db4 100644 --- a/paddle/cinn/poly/domain.cc +++ b/paddle/cinn/poly/domain.cc @@ -23,7 +23,7 @@ #include #include "paddle/cinn/common/context.h" -#include "paddle/cinn/ir/ir_visitor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/poly/domain_add_unit_loop_mutator.cc b/paddle/cinn/poly/domain_add_unit_loop_mutator.cc index d526012e7862d..8fb65797d33e9 100644 --- a/paddle/cinn/poly/domain_add_unit_loop_mutator.cc +++ b/paddle/cinn/poly/domain_add_unit_loop_mutator.cc @@ -20,7 +20,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_printer.h" #include "paddle/cinn/utils/string.h" namespace cinn { diff --git a/paddle/cinn/poly/domain_add_unit_loop_mutator.h b/paddle/cinn/poly/domain_add_unit_loop_mutator.h index 6c0a289ef3675..0514f1a0081c8 100644 --- a/paddle/cinn/poly/domain_add_unit_loop_mutator.h +++ b/paddle/cinn/poly/domain_add_unit_loop_mutator.h @@ -18,7 +18,7 @@ #include #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" namespace cinn { namespace poly { diff --git a/paddle/cinn/poly/graph_test.cc b/paddle/cinn/poly/graph_test.cc index 9860816d9afb9..743e9440b0675 100644 --- a/paddle/cinn/poly/graph_test.cc +++ b/paddle/cinn/poly/graph_test.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/lang/buffer.h" namespace cinn { diff --git a/paddle/cinn/poly/schedule.cc b/paddle/cinn/poly/schedule.cc index 43357dbdfb104..6d059331ac4c9 100644 --- a/paddle/cinn/poly/schedule.cc +++ b/paddle/cinn/poly/schedule.cc @@ -19,9 +19,9 @@ #include #include "paddle/cinn/common/graph_utils.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/poly/naive_scheduler.h" #include "paddle/cinn/poly/poly_scheduler.h" #include "paddle/cinn/utils/string.h" diff --git a/paddle/cinn/poly/schedule_test.cc b/paddle/cinn/poly/schedule_test.cc index bc17551269585..af63ee34f4334 100755 --- a/paddle/cinn/poly/schedule_test.cc +++ b/paddle/cinn/poly/schedule_test.cc @@ -16,7 +16,7 @@ #include -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/tensor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/lang/lower.h" diff --git a/paddle/cinn/poly/stage.cc b/paddle/cinn/poly/stage.cc index 149a285f77558..e5faafc5348fc 100644 --- a/paddle/cinn/poly/stage.cc +++ b/paddle/cinn/poly/stage.cc @@ -22,12 +22,12 @@ #include #include "paddle/cinn/common/axis.h" -#include "paddle/cinn/ir/collect_ir_nodes.h" -#include "paddle/cinn/ir/ir_mutator.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/operation.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_mutator.h" +#include "paddle/cinn/ir/utils/ir_nodes_collector.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/lang/compute.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_replace.h" diff --git a/paddle/cinn/poly/stage_test.cc b/paddle/cinn/poly/stage_test.cc index 693fef4783724..151c1cedcbf79 100755 --- a/paddle/cinn/poly/stage_test.cc +++ b/paddle/cinn/poly/stage_test.cc @@ -24,8 +24,8 @@ #include "paddle/cinn/common/ir_util.h" #include "paddle/cinn/common/test_helper.h" #include "paddle/cinn/ir/ir.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" +#include "paddle/cinn/ir/op/ir_operators.h" +#include "paddle/cinn/ir/utils/ir_printer.h" namespace cinn { namespace poly { diff --git a/paddle/cinn/pybind/bind_utils.h b/paddle/cinn/pybind/bind_utils.h index 397ee42dd4bf1..09d0972b760f2 100644 --- a/paddle/cinn/pybind/bind_utils.h +++ b/paddle/cinn/pybind/bind_utils.h @@ -22,8 +22,8 @@ #include "paddle/cinn/common/shared.h" #include "paddle/cinn/ir/ir.h" #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/pybind/bind.h" #include "paddle/cinn/runtime/cinn_runtime.h" diff --git a/paddle/cinn/pybind/common.cc b/paddle/cinn/pybind/common.cc index b2ae44f82d591..170ebfc6d6916 100644 --- a/paddle/cinn/pybind/common.cc +++ b/paddle/cinn/pybind/common.cc @@ -17,7 +17,7 @@ #include "paddle/cinn/common/shared.h" #include "paddle/cinn/common/target.h" #include "paddle/cinn/common/type.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/pybind/bind.h" #include "paddle/cinn/pybind/bind_utils.h" #include "paddle/cinn/runtime/flags.h" diff --git a/paddle/cinn/pybind/ir.cc b/paddle/cinn/pybind/ir.cc index 4498314e6495d..b03b7181509d8 100644 --- a/paddle/cinn/pybind/ir.cc +++ b/paddle/cinn/pybind/ir.cc @@ -23,13 +23,13 @@ #include #include "paddle/cinn/ir/ir_base.h" -#include "paddle/cinn/ir/ir_operators.h" -#include "paddle/cinn/ir/ir_printer.h" -#include "paddle/cinn/ir/ir_visitor.h" #include "paddle/cinn/ir/lowered_func.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/ir/operation.h" #include "paddle/cinn/ir/registry.h" #include "paddle/cinn/ir/tensor.h" +#include "paddle/cinn/ir/utils/ir_printer.h" +#include "paddle/cinn/ir/utils/ir_visitor.h" #include "paddle/cinn/lang/packed_func.h" #include "paddle/cinn/poly/stage.h" #include "paddle/cinn/pybind/bind.h" diff --git a/paddle/cinn/pybind/optim.cc b/paddle/cinn/pybind/optim.cc index 728965c46af34..dfb159a23f352 100755 --- a/paddle/cinn/pybind/optim.cc +++ b/paddle/cinn/pybind/optim.cc @@ -17,7 +17,7 @@ #include "paddle/cinn/common/shared.h" #include "paddle/cinn/common/target.h" #include "paddle/cinn/common/type.h" -#include "paddle/cinn/ir/ir_operators.h" +#include "paddle/cinn/ir/op/ir_operators.h" #include "paddle/cinn/optim/ir_copy.h" #include "paddle/cinn/optim/ir_simplify.h" #include "paddle/cinn/pybind/bind.h"