unique group struct (#58940)

phlrain · web-flow · commit 4f22b6608a60 · 2023-11-15T08:33:10.000+08:00
* unique group struct

* update

* update
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/cinn_group_lowering_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/cinn_group_lowering_pass.cc
@@ -148,9 +148,7 @@ std::unique_ptr<pir::Program> CINNGroupLoweringPass(::pir::Program* program) {
         auto ir_compiler = std::make_shared<cinn::hlir::framework::PirCompiler>(
             *program, target, scope);
         hlir::framework::PirCompilerManager::Instance().insert(ir_compiler);
-        auto group1 =
-            std::make_shared<cinn::hlir::framework::pir::Group>(group->ops);
-        auto fn_ptr_res = ir_compiler->BuildCUDAJITInfo({group1});
+        auto fn_ptr_res = ir_compiler->BuildCUDAJITInfo({group});
         std::unordered_map<std::string, ::pir::Attribute> op_attrs{
             {cinn::dialect::JitKernelOp::kAttrName,
              cinn::dialect::CUDAJITInfoAttribute::get(ctx, fn_ptr_res[0])},
@@ -174,9 +172,9 @@ std::unique_ptr<pir::Program> CINNGroupLoweringPass(::pir::Program* program) {
         std::unordered_map<size_t, size_t> codegen2orig;
 
         std::vector<pir::Type> vec_types;
-        for (size_t i = 0; i < group1->output_values.size(); ++i) {
-          vec_types.push_back(group1->output_values[i].type());
-          codegen2orig[value2id.at(group1->output_values[i])] = i;
+        for (size_t i = 0; i < group->output_values.size(); ++i) {
+          vec_types.push_back(group->output_values[i].type());
+          codegen2orig[value2id.at(group->output_values[i])] = i;
         }
 
         ::pir::Operation* cinn_op =
diff --git a/paddle/cinn/hlir/framework/pir/op_lowering_impl.cc b/paddle/cinn/hlir/framework/pir/op_lowering_impl.cc
@@ -575,7 +575,7 @@ ir::Expr OpLowererImpl::DoGroupSchedule(
         LoopAssignReduce(
             ir_sch, op, greducer, this->target_, tensor_map, tmp_tensor_info);
       }
-    } else {
+    } else if (master) {
       VLOG(3) << "Before assign node " << op_name
               << " into horizontal link reducer, ir is:\n"
               << ir_sch.GetModule().GetExprs().at(0);

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ ir::Expr OpLowererImpl::DoGroupSchedule(`
`575`	`575`	`LoopAssignReduce(`
`576`	`576`	`ir_sch, op, greducer, this->target_, tensor_map, tmp_tensor_info);`
`577`	`577`	`}`
`578`		`- } else {`
	`578`	`+ } else if (master) {`
`579`	`579`	`VLOG(3) << "Before assign node " << op_name`
`580`	`580`	`<< " into horizontal link reducer, ir is:\n"`
`581`	`581`	`<< ir_sch.GetModule().GetExprs().at(0);`