PaddlePaddle
diff --git a/‎paddle/cinn/auto_schedule/auto_tuner_test.cc
Copy file name to clipboard
+14-11Lines changed: 14 additions & 11 deletions b/‎paddle/cinn/auto_schedule/auto_tuner_test.cc
Copy file name to clipboard
+14-11Lines changed: 14 additions & 11 deletions
diff --git a/‎paddle/cinn/auto_schedule/measure/measurer_test.cc
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion b/‎paddle/cinn/auto_schedule/measure/measurer_test.cc
Copy file name to clipboard
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎paddle/cinn/auto_schedule/measure/simple_builder.cc
Copy file name to clipboard
+9-8Lines changed: 9 additions & 8 deletions b/‎paddle/cinn/auto_schedule/measure/simple_builder.cc
Copy file name to clipboard
+9-8Lines changed: 9 additions & 8 deletions
diff --git a/‎paddle/cinn/auto_schedule/measure/simple_builder.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/cinn/auto_schedule/measure/simple_builder.h
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/cinn/auto_schedule/measure/simple_runner_test.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions b/‎paddle/cinn/auto_schedule/measure/simple_runner_test.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎paddle/cinn/auto_schedule/tests/performance_comparison_test.cc
Copy file name to clipboard
+15-13Lines changed: 15 additions & 13 deletions b/‎paddle/cinn/auto_schedule/tests/performance_comparison_test.cc
Copy file name to clipboard
+15-13Lines changed: 15 additions & 13 deletions
diff --git a/‎paddle/cinn/backends/compiler.h
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎paddle/cinn/backends/compiler.h
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎paddle/cinn/frontend/computation.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions b/‎paddle/cinn/frontend/computation.cc
Copy file name to clipboard
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎paddle/cinn/frontend/computation.h
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎paddle/cinn/frontend/computation.h
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎paddle/cinn/frontend/decomposer/activation_test.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎paddle/cinn/frontend/decomposer/activation_test.cc
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
@@ -26,6 +26,7 @@
 #include "paddle/cinn/frontend/syntax.h"
 #include "paddle/cinn/hlir/framework/graph.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
+#include "paddle/cinn/hlir/framework/graph_compiler_util.h"
 #include "paddle/cinn/hlir/framework/node.h"
 #include "paddle/cinn/hlir/framework/pass.h"
 #include "paddle/cinn/ir/ir_base.h"
@@ -37,6 +38,7 @@ namespace cinn {
 namespace auto_schedule {
 
 using ::cinn::hlir::framework::BuildScope;
+using ::cinn::hlir::framework::CompilationContext;
 using ::cinn::hlir::framework::Graph;
 using ::cinn::hlir::framework::GraphCompiler;
 using ::cinn::hlir::framework::Instruction;
@@ -53,6 +55,7 @@ class TestAutoTuner : public ::testing::Test {
 
   std::shared_ptr<Graph> graph;
   std::shared_ptr<Scope> compiled_scope;
+  CompilationContext context;
   std::unique_ptr<GraphCompiler> graph_compiler;
   std::unique_ptr<AutoTuner> tuner;
 
@@ -73,8 +76,10 @@ class TestAutoTuner : public ::testing::Test {
     auto program = CreateAddReluProgram();
     auto graph = cinn::frontend::Optimize(&program, fetch_ids, target);
     compiled_scope = BuildScope(target, graph);
-    graph_compiler =
-        std::make_unique<GraphCompiler>(target, compiled_scope, graph);
+    context.graph = graph;
+    context.scope = compiled_scope;
+    context.target = target;
+    graph_compiler = std::make_unique<GraphCompiler>(context);
     tuner = std::make_unique<AutoTuner>(target, graph.get());
   }
 
@@ -99,16 +104,14 @@ class TestAutoTuner : public ::testing::Test {
 
   virtual void ApplyTunedAndRun(const TuningResult& result) {
     // build runtime program with tuning result
-    GraphCompiler::CompileOptions compile_options;
-    compile_options.with_instantiate_variables = true;
-    compile_options.Apply(result);
-    ASSERT_EQ(1, compile_options.groups.size());
-    ASSERT_EQ(1, compile_options.lowered_funcs.size());
+    context.with_instantiate_variables = true;
+    context.ApplyTuningResult(result);
+    ASSERT_EQ(1, context.groups.size());
+    ASSERT_EQ(1, context.lowered_funcs.size());
     VLOG(6) << "Print lowered_funcs before building";
-    VLOG(6) << compile_options.lowered_funcs[0][0];
-    VLOG(6) << compile_options.lowered_funcs[1][0];
-    auto runtime_program =
-        graph_compiler->Build(compile_options).runtime_program;
+    VLOG(6) << context.lowered_funcs[0][0];
+    VLOG(6) << context.lowered_funcs[1][0];
+    auto runtime_program = graph_compiler->Build(&context).runtime_program;
     ASSERT_EQ(1, runtime_program->size());
     runtime_program->Execute();
   }
 
@@ -25,12 +25,14 @@
 #include "paddle/cinn/frontend/optimize.h"
 #include "paddle/cinn/frontend/syntax.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
+#include "paddle/cinn/hlir/framework/graph_compiler_util.h"
 #include "paddle/cinn/runtime/flags.h"
 
 namespace cinn {
 namespace auto_schedule {
 
 using ::cinn::hlir::framework::BuildScope;
+using ::cinn::hlir::framework::CompilationContext;
 using ::cinn::hlir::framework::Graph;
 using ::cinn::hlir::framework::GraphCompiler;
 
@@ -62,7 +64,8 @@ class TestMeasurer : public ::testing::Test {
     auto program = CreateAddReluProgram();
     auto graph = cinn::frontend::Optimize(&program, fetch_ids, target);
     auto scope = BuildScope(target, graph);
-    graph_compiler = std::make_unique<GraphCompiler>(target, scope, graph);
+    CompilationContext context(graph, scope, target);
+    graph_compiler = std::make_unique<GraphCompiler>(context);
     TaskCreator task_creator;
     tasks = task_creator.CreateTuneTaskOpLevel(graph.get());
     const auto& dtype_dict =
 
@@ -17,6 +17,8 @@
 namespace cinn {
 namespace auto_schedule {
 
+using hlir::framework::CompilationContext;
+using hlir::framework::CompilationResult;
 using hlir::framework::GraphCompiler;
 
 SimpleBuilder::SimpleBuilder(hlir::framework::GraphCompiler* graph_compiler)
@@ -25,15 +27,14 @@ SimpleBuilder::SimpleBuilder(hlir::framework::GraphCompiler* graph_compiler)
 BuildResult SimpleBuilder::Build(const MeasureInput& input) {
   CHECK_NE(graph_compiler_, static_cast<GraphCompiler*>(nullptr))
       << "empty handle to GraphCompiler";
-  GraphCompiler::CompileOptions compile_options;
-  compile_options.groups.emplace_back(input.task->subgraph);
-  compile_options.lowered_funcs.emplace_back(input.lowered_funcs);
-  compile_options.remove_unused_variables = false;
+  CompilationContext& context = graph_compiler_->GetCompilationContext();
+  context.groups.emplace_back(input.task->subgraph);
+  context.lowered_funcs.emplace_back(input.lowered_funcs);
+  context.remove_unused_variables = false;
   VLOG(5) << "call GraphCompiler to Build with Graph::Group size="
-          << compile_options.groups.size() << ", lowered_funcs group size="
-          << compile_options.lowered_funcs.size();
-  GraphCompiler::CompilationResult compiled_result =
-      graph_compiler_->Build(compile_options);
+          << context.groups.size()
+          << ", lowered_funcs group size=" << context.lowered_funcs.size();
+  CompilationResult compiled_result = graph_compiler_->Build(&context);
 
   BuildResult build_result;
   build_result.compiled_scope = graph_compiler_->GetScope().get();
 
@@ -16,6 +16,7 @@
 
 #include "paddle/cinn/auto_schedule/measure/measure.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
+#include "paddle/cinn/hlir/framework/graph_compiler_util.h"
 
 namespace cinn {
 namespace auto_schedule {
 
@@ -25,11 +25,13 @@
 #include "paddle/cinn/frontend/optimize.h"
 #include "paddle/cinn/frontend/syntax.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
+#include "paddle/cinn/hlir/framework/graph_compiler_util.h"
 
 namespace cinn {
 namespace auto_schedule {
 
 using ::cinn::hlir::framework::BuildScope;
+using ::cinn::hlir::framework::CompilationContext;
 using ::cinn::hlir::framework::Graph;
 using ::cinn::hlir::framework::GraphCompiler;
 using ::cinn::hlir::framework::Instruction;
@@ -56,8 +58,8 @@ class TestSimpleRunner : public ::testing::Test {
     auto program = CreateAddReluProgram();
     auto graph = cinn::frontend::Optimize(&program, fetch_ids, target);
     compiled_scope = BuildScope(target, graph);
-    graph_compiler =
-        std::make_unique<GraphCompiler>(target, compiled_scope, graph);
+    CompilationContext context(graph, compiled_scope, target);
+    graph_compiler = std::make_unique<GraphCompiler>(context);
     auto runtime_program = graph_compiler->Build();
     const auto& instructions = runtime_program->GetRunInstructions();
     ASSERT_EQ(1, instructions.size());
@@ -123,8 +125,8 @@ TEST_F(TestSimpleRunner, TimeMeasured) {
                                             "sleep_fn"));
   instructions.back()->SetLoweredFunc(reinterpret_cast<void*>(sleep_fn));
   instructions.back()->Finalize();
-  build_result.runtime_program.reset(
-      new hlir::framework::Program(nullptr, std::move(instructions)));
+  build_result.runtime_program = std::make_unique<hlir::framework::Program>(
+      nullptr, std::move(instructions));
 
   // to skip the condition check of params in Instruction::PreparePodArgs
   std::map<std::string, cinn_pod_value_t> preset_args;
 
@@ -25,6 +25,7 @@
 #include "paddle/cinn/frontend/paddle_model_convertor.h"
 #include "paddle/cinn/frontend/syntax.h"
 #include "paddle/cinn/hlir/framework/graph_compiler.h"
+#include "paddle/cinn/hlir/framework/graph_compiler_util.h"
 #include "paddle/cinn/hlir/framework/node.h"
 #include "paddle/cinn/hlir/framework/pass.h"
 #include "paddle/cinn/ir/ir_base.h"
@@ -61,6 +62,7 @@ namespace cinn {
 namespace auto_schedule {
 
 using ::cinn::hlir::framework::BuildScope;
+using ::cinn::hlir::framework::CompilationContext;
 using ::cinn::hlir::framework::Graph;
 using ::cinn::hlir::framework::GraphCompiler;
 using ::cinn::hlir::framework::Instruction;
@@ -94,8 +96,8 @@ class PerformanceTester : public ::testing::Test {
       hlir::framework::ApplyPass(graph.get(), "OpFusionPass");
       VLOG(3) << "Build " << schedule_name << " program.";
       auto scope = BuildScope(target_, graph);
-      auto graph_compiler =
-          std::make_unique<GraphCompiler>(target_, scope, graph);
+      CompilationContext context(graph, scope, target_);
+      auto graph_compiler = std::make_unique<GraphCompiler>(context);
       auto runtime_program =
           (this->*build_fn)(graph.get(), graph_compiler.get());
       if (execute) {
@@ -145,32 +147,32 @@ class PerformanceTester : public ::testing::Test {
         std::make_unique<hlir::framework::OpLowerer>(
             dtype_dict, shape_dict, target_);
 
-    GraphCompiler::CompileOptions compile_options;
-    compile_options.with_instantiate_variables = true;
+    CompilationContext& context = graph_compiler->GetCompilationContext();
+    context.with_instantiate_variables = true;
 
     if (graph->fusion_groups.empty()) {
       hlir::framework::ApplyPasses(graph, {"BuildNonFusedGroupsPass"});
     }
-    compile_options.groups = graph->fusion_groups;
+    context.groups = graph->fusion_groups;
 
     for (auto group : graph->fusion_groups) {
-      compile_options.lowered_funcs.push_back(
+      context.lowered_funcs.push_back(
           op_lowerer->Lower(group,
                             /*apply_op_schedule = */ false,
                             /*apply_group_schedule=*/false));
     }
 
     VLOG(3) << "===========================No Schedule LoweredFunc "
                "Begin===========================";
-    for (const auto& funcvec : compile_options.lowered_funcs) {
+    for (const auto& funcvec : context.lowered_funcs) {
       for (const auto& func : funcvec) {
         VLOG(3) << func;
       }
     }
     VLOG(3) << "===========================No Schedule LoweredFunc "
                "End=============================";
 
-    return graph_compiler->Build(compile_options).runtime_program;
+    return graph_compiler->Build();
   }
 
   std::unique_ptr<hlir::framework::Program> BuildManualScheduleProgram(
@@ -191,21 +193,21 @@ class PerformanceTester : public ::testing::Test {
     tuner->Initialize(tuning_config, graph_compiler);
     TuningResult tuning_result = tuner->Tune(tuning_options);
 
-    GraphCompiler::CompileOptions compile_options;
-    compile_options.with_instantiate_variables = true;
-    compile_options.Apply(tuning_result);
+    CompilationContext& context = graph_compiler->GetCompilationContext();
+    context.with_instantiate_variables = true;
+    context.ApplyTuningResult(tuning_result);
 
     VLOG(3) << "===========================Auto Schedule LoweredFunc "
                "Begin===========================";
-    for (const auto& funcvec : compile_options.lowered_funcs) {
+    for (const auto& funcvec : context.lowered_funcs) {
       for (const auto& func : funcvec) {
         VLOG(3) << func;
       }
     }
     VLOG(3) << "===========================Auto Schedule LoweredFunc "
                "End=============================";
 
-    return graph_compiler->Build(compile_options).runtime_program;
+    return graph_compiler->Build();
   }
 
 #ifdef CINN_WITH_CUDA
 
@@ -43,8 +43,7 @@ namespace backends {
  */
 class CompilationInfoDumper {
  public:
-  explicit CompilationInfoDumper(
-      const hlir::framework::ParallelCompiler::CompilationResult& info)
+  explicit CompilationInfoDumper(const hlir::framework::CompilationResult& info)
       : info_(info) {
     DumpLoweredFunc();
     DumpSourceCode();
@@ -62,7 +61,7 @@ class CompilationInfoDumper {
             const std::string& file_name,
             const std::string& content);
 
-  const hlir::framework::ParallelCompiler::CompilationResult& info_;
+  const hlir::framework::CompilationResult& info_;
 };
 
 class SourceCodePrint {
 
@@ -72,16 +72,18 @@ std::shared_ptr<ComputationContext> CompileProgram(
   }
 
   ctx->scope = hlir::framework::BuildScope(target, ctx->graph, scope);
-  ctx->graph_compiler.reset(
-      new hlir::framework::GraphCompiler(target, ctx->scope, ctx->graph));
 
   std::unordered_set<std::string> fetch_var_ids;
   for (auto &out : outputs) {
     fetch_var_ids.insert(out->id);
   }
 
-  ctx->program = ctx->graph_compiler->Build(options, std::move(fetch_var_ids))
-                     .runtime_program;
+  ctx->compile_options.graph = ctx->graph;
+  ctx->compile_options.scope = ctx->scope;
+  ctx->compile_options.fetch_var_ids = fetch_var_ids;
+  ctx->graph_compiler.reset(
+      new hlir::framework::GraphCompiler(ctx->compile_options));
+  ctx->program = ctx->graph_compiler->Build();
   if (ctx->compile_options.do_prerun) {
     ctx->program->PreRun();
   }
 
@@ -27,8 +27,7 @@ struct ComputationContext;
 
 class CinnComputation {
  public:
-  struct CompileOptions
-      : public hlir::framework::GraphCompiler::CompileOptions {
+  struct CompileOptions : public hlir::framework::CompilationContext {
     bool use_decomposer = false;
     bool do_prerun = true;
     bool use_default_passes = true;
 
@@ -86,7 +86,8 @@ TEST(Decomposer, softmax_decomposer) {
   hlir::framework::ApplyPass(graph.get(), "FusionMergePass");
 
   auto scope = BuildScope(target, graph);
-  hlir::framework::GraphCompiler gc(target, scope, graph);
+  hlir::framework::CompilationContext context(graph, scope, target);
+  hlir::framework::GraphCompiler gc(context);
   auto run_program = gc.Build();
 
   std::vector<float> x(n * c * h * w);