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

@@ -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)

paddle/cinn/auto_schedule/analysis/analyze_ir.cc

@@ -21,13 +21,13 @@
 #include <unordered_set>
 
 #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"

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 {

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"

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;

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 {

paddle/cinn/auto_schedule/cost_model/expr_cost_model.h

@@ -18,7 +18,7 @@
 #include <vector>
 
 #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 {

paddle/cinn/auto_schedule/cost_model/feature.h

@@ -18,7 +18,7 @@
 #include <vector>
 
 #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 {

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"
 

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 {

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"

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 {

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 {

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 {

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 {

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 {

paddle/cinn/auto_schedule/post_schedule_rule/cooperative_process_test.cc

@@ -17,7 +17,7 @@
 #include <gtest/gtest.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/utils/ir_printer.h"
 #include "test/cpp/cinn/program_builder.h"
 
 namespace cinn {

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 {

paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind.cc

@@ -16,9 +16,9 @@
 
 #include <glog/logging.h>
 
-#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 {

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 {

paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_bind_test.cc

@@ -22,7 +22,7 @@
 #include <numeric>
 
 #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 {

paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_gen_rule.cc

@@ -19,7 +19,7 @@
 #include <cstdlib>
 
 #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 {

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 {

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 {

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 {

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"

paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_unroll.cc

@@ -18,9 +18,9 @@
 
 #include <cstdlib>
 
-#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 {

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 {

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 {

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 {

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 {

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"

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 {

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 {

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"

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 {

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"
 

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 {

paddle/cinn/auto_schedule/search_space/search_state.cc

@@ -20,9 +20,9 @@
 #include <vector>
 
 #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"
 

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 {

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 {

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 {

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 {

paddle/cinn/auto_schedule/search_strategy/mutate_rule/mutate_tile_size_test.cc

@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #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 {

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"

paddle/cinn/auto_schedule/task/task_registry.h

@@ -19,7 +19,7 @@
 #include <mutex>
 #include <string>
 
-#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"
 

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 {

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 {

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);

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"

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"
 

paddle/cinn/backends/codegen_cuda_dev.cc

@@ -21,8 +21,8 @@
 #include <set>
 #include <unordered_set>
 
-#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"
 

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"
 

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"

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 {

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 {

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 <gtest/gtest.h>
 #include <stdlib.h>
@@ -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"

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"

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 {

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"
 

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"
 

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"

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 {

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 {

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"

paddle/cinn/common/arithmatic.cc

@@ -21,9 +21,9 @@
 #include <string>
 
 #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 {

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 {

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"

paddle/cinn/common/cas.h

@@ -20,7 +20,7 @@
 #include <vector>
 
 #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 {

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 {

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 {

paddle/cinn/common/ir_util.cc

@@ -18,9 +18,9 @@
 #include <unordered_set>
 
 #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 {

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);

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:

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);
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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);

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 {

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 {

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);

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"

paddle/cinn/hlir/pe/elementwise.cc

@@ -18,7 +18,7 @@
 #include <string>
 
 #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"
 

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"
 

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"

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"

paddle/cinn/ir/CMakeLists.txt

-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)

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"
 

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 {

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 {