PaddlePaddle
diff --git a/‎paddle/cinn/auto_schedule/auto_tuner_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎paddle/cinn/auto_schedule/auto_tuner_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎paddle/cinn/auto_schedule/measure/measurer_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎paddle/cinn/auto_schedule/measure/measurer_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions b/‎paddle/cinn/auto_schedule/search_space/auto_gen_rule/auto_inline_test.cc
Copy file name to clipboard
-3Lines changed: 0 additions & 3 deletions
diff --git a/‎paddle/cinn/auto_schedule/task/task_registry_test.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/cinn/auto_schedule/task/task_registry_test.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎paddle/cinn/auto_schedule/task/tune_task_test.cc
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions b/‎paddle/cinn/auto_schedule/task/tune_task_test.cc
Copy file name to clipboard
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎paddle/cinn/hlir/framework/graph_compiler.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/cinn/hlir/framework/graph_compiler.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/framework/op_lowering.cc
Copy file name to clipboard
+22-27Lines changed: 22 additions & 27 deletions b/‎paddle/cinn/hlir/framework/op_lowering.cc
Copy file name to clipboard
+22-27Lines changed: 22 additions & 27 deletions
diff --git a/‎paddle/cinn/hlir/framework/op_test.cc
Copy file name to clipboard
+11-29Lines changed: 11 additions & 29 deletions b/‎paddle/cinn/hlir/framework/op_test.cc
Copy file name to clipboard
+11-29Lines changed: 11 additions & 29 deletions
diff --git a/‎paddle/cinn/hlir/op/broadcast.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/cinn/hlir/op/broadcast.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎paddle/cinn/hlir/op/contrib/argmax.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎paddle/cinn/hlir/op/contrib/argmax.cc
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
@@ -32,7 +32,6 @@
 #include "paddle/cinn/runtime/flags.h"
 
 DECLARE_bool(auto_schedule_use_cost_model);
-DECLARE_bool(cinn_ir_schedule);
 
 namespace cinn {
 namespace auto_schedule {
@@ -70,8 +69,6 @@ class TestAutoTuner : public ::testing::Test {
 
   void SetUp() override {
     srand(0);
-    // AutoTuner is combined with new IR Schedule
-    FLAGS_cinn_ir_schedule = true;
     std::unordered_set<std::string> fetch_ids;
     auto program = CreateAddReluProgram();
     auto graph = cinn::frontend::Optimize(&program, fetch_ids, target);
 
@@ -27,8 +27,6 @@
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
 #include "paddle/cinn/runtime/flags.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace auto_schedule {
 
@@ -55,7 +53,6 @@ class TestMeasurer : public ::testing::Test {
   std::vector<MeasureInput> inputs;
 
   void SetUp() override {
-    FLAGS_cinn_ir_schedule = true;
 #ifdef CINN_WITH_CUDA
     Target target = common::DefaultNVGPUTarget();
 #else
 
@@ -40,8 +40,6 @@
 #include "paddle/cinn/utils/string.h"
 #include "test/cpp/cinn/concrete_program_builder.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace auto_schedule {
 
@@ -155,7 +153,6 @@ TEST(AutoInline, AddReluInline) {
 
   frontend::Program program = builder.Build();
 
-  FLAGS_cinn_ir_schedule = true;
   auto graph = std::make_shared<Graph>(program, target);
   hlir::framework::ApplyPass(graph.get(), "OpFusionPass");
 
 
@@ -29,7 +29,6 @@
 #include "paddle/cinn/utils/type_defs.h"
 
 DECLARE_bool(auto_schedule_use_cost_model);
-DECLARE_bool(cinn_ir_schedule);
 
 namespace cinn {
 namespace auto_schedule {
@@ -70,7 +69,6 @@ std::shared_ptr<hlir::framework::Graph> CreateAddProgram(
 
 TEST(TestTaskRegistry, basic) {
   FLAGS_auto_schedule_use_cost_model = true;
-  FLAGS_cinn_ir_schedule = true;
 
 #ifdef CINN_WITH_CUDA
   Target target = common::DefaultNVGPUTarget();
 
@@ -35,8 +35,6 @@
 #include "paddle/cinn/ir/utils/ir_printer.h"
 #include "paddle/cinn/utils/string.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace auto_schedule {
 
@@ -59,8 +57,6 @@ Program CreateAddProgram() {
 }
 
 TEST(TuneTask, GraphToUnoptLoweredFunc_NoPass) {
-  // Auto tuner is combined with IR schedule
-  FLAGS_cinn_ir_schedule = true;
   Context::Global().ResetNameId();
 #ifdef CINN_WITH_CUDA
   Target target = common::DefaultNVGPUTarget();
@@ -170,8 +166,6 @@ TEST(TuneTask, GraphToUnoptLoweredFunc_NoPass) {
 }
 
 TEST(TuneTask, GraphToUnoptLoweredFunc_ApplyPass) {
-  // Auto tuner is combined with IR schedule
-  FLAGS_cinn_ir_schedule = true;
   Context::Global().ResetNameId();
 #ifdef CINN_WITH_CUDA
   Target target = common::DefaultNVGPUTarget();
 
@@ -30,8 +30,6 @@
 #include "paddle/cinn/poly/stage.h"
 #include "paddle/cinn/utils/profiler.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace hlir {
 namespace framework {
 
@@ -19,7 +19,6 @@
 #include "paddle/cinn/ir/schedule/ir_schedule.h"
 #include "paddle/cinn/optim/transform_gpu_forloop.h"
 
-DECLARE_bool(cinn_ir_schedule);
 DECLARE_bool(cinn_use_cuda_vectorize);
 
 namespace cinn {
@@ -52,32 +51,28 @@ std::vector<ir::LoweredFunc> OpLowerer::Lower(const GroupPtr& group,
           << " , Op Pattern : " << group->op_pattern_kind;
   group->input_names.clear();
   group->output_names.clear();
-  if (FLAGS_cinn_ir_schedule) {
-    switch (group->op_pattern_kind) {
-      case framework::kElementWise:
-      case framework::kBroadcast:
-      case framework::kInjective:
-        return LowerGroup(group,
-                          apply_op_schedule,
-                          apply_group_schedule,
-                          &OpLowerer::ElementwiseScheduleDetermineFunction);
-      case framework::kReduction:
-        return LowerGroup(group,
-                          apply_op_schedule,
-                          apply_group_schedule,
-                          &OpLowerer::ReduceScheduleDetermineFunction);
-      case framework::kOutFusible:
-        LOG(FATAL) << "Group Pattern Kind kOutFusible Is Not Implemented!";
-      case framework::kNonFusible:
-        return LowerGroup(group,
-                          apply_op_schedule,
-                          apply_group_schedule,
-                          &OpLowerer::NonFusibleScheduleDetermineFunction);
-      default:
-        LOG(FATAL) << "Group Pattern Kind Is Unknown!";
-    }
-  } else {
-    LOG(FATAL) << "Previous IR Schedule Is Not Implemented!";
+  switch (group->op_pattern_kind) {
+    case framework::kElementWise:
+    case framework::kBroadcast:
+    case framework::kInjective:
+      return LowerGroup(group,
+                        apply_op_schedule,
+                        apply_group_schedule,
+                        &OpLowerer::ElementwiseScheduleDetermineFunction);
+    case framework::kReduction:
+      return LowerGroup(group,
+                        apply_op_schedule,
+                        apply_group_schedule,
+                        &OpLowerer::ReduceScheduleDetermineFunction);
+    case framework::kOutFusible:
+      LOG(FATAL) << "Group Pattern Kind kOutFusible Is Not Implemented!";
+    case framework::kNonFusible:
+      return LowerGroup(group,
+                        apply_op_schedule,
+                        apply_group_schedule,
+                        &OpLowerer::NonFusibleScheduleDetermineFunction);
+    default:
+      LOG(FATAL) << "Group Pattern Kind Is Unknown!";
   }
 }
 
 
@@ -27,8 +27,6 @@
 #include "paddle/cinn/hlir/pe/broadcast.h"
 #include "paddle/cinn/runtime/flags.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace hlir {
 namespace framework {
@@ -57,35 +55,19 @@ TEST(Operator, GetAttrs) {
 
   std::string func_name = "add1";
 
-  if (FLAGS_cinn_ir_schedule) {
-    std::string out_name = "C";
-    common::CINNValuePack cinn_input =
-        common::CINNValuePack{{common::CINNValue(A),
-                               common::CINNValue(B),
-                               common::CINNValue(out_name)}};
-    std::vector<std::string> input_output_names{"A", "B", out_name};
+  std::string out_name = "C";
+  common::CINNValuePack cinn_input =
+      common::CINNValuePack{{common::CINNValue(A),
+                             common::CINNValue(B),
+                             common::CINNValue(out_name)}};
+  std::vector<std::string> input_output_names{"A", "B", out_name};
 
-    auto funcs = framework::GetFuncFromImpl(
-        impl, cinn_input, inputs, input_output_names, func_name, target);
+  auto funcs = framework::GetFuncFromImpl(
+      impl, cinn_input, inputs, input_output_names, func_name, target);
 
-    for (auto func : funcs) {
-      LOG(INFO) << "Test Operator_ElementWise_Add_Test0's Strategy, func is :\n"
-                << func;
-    }
-  } else {
-    common::CINNValuePack cinn_input =
-        common::CINNValuePack{{common::CINNValue(A), common::CINNValue(B)}};
-    common::CINNValuePack rets = impl->fcompute(cinn_input);
-    ASSERT_EQ(rets.size(), 2UL);
-    rets = impl->fschedule(rets);
-    ASSERT_EQ(rets.size(), 2UL);
-    // the last element is a StageMap
-    for (int i = 0; i < rets->size() - 1; i++) {
-      ir::Expr temp = rets[i];
-      inputs.push_back(temp.as_tensor_ref());
-    }
-    auto func = Lower(func_name, rets.back(), inputs);
-    LOG(INFO) << "Test Strategy Codegen:\n" << func;
+  for (auto func : funcs) {
+    LOG(INFO) << "Test Operator_ElementWise_Add_Test0's Strategy, func is :\n"
+              << func;
   }
 }
 
 
@@ -26,8 +26,6 @@
 #include "paddle/cinn/ir/layout.h"
 #include "paddle/cinn/ir/op/ir_operators.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace hlir {
 namespace op {
 
@@ -35,8 +35,6 @@
 #include "paddle/cinn/lang/builtin.h"
 #include "paddle/cinn/lang/compute.h"
 
-DECLARE_bool(cinn_ir_schedule);
-
 namespace cinn {
 namespace hlir {
 namespace op {