Skip to content

[CINN] Fix bug of cinn pass order #63095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tc20042008 merged 2 commits into from
Mar 29, 2024
Merged

[CINN] Fix bug of cinn pass order #63095

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ae058a
fix bug of pass order
zyfncg Mar 28, 2024
0594294
polish code
zyfncg Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions paddle/cinn/hlir/dialect/operator/transforms/add_cinn_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "paddle/pir/include/dialect/shape/ir/shape_dialect.h"
#include "paddle/pir/include/pass/pass_manager.h"

#include "paddle/cinn/hlir/dialect/operator/ir/manual_op.h"
#include "paddle/cinn/hlir/dialect/operator/ir/op_dialect.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/add_broadcast_to_elementwise_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/add_store_in_fusion_op_pass.h"
Expand Down Expand Up @@ -74,23 +75,27 @@ bool HasDynamicShape(const pir::Program& program) {
}
} // namespace

void ApplyPdToCinnPass(
::pir::Program* program,
const std::function<std::shared_ptr<::pir::PassManager>()>&
CreatePassManager) {
std::shared_ptr<pir::PassManager> pass_manager = CreatePassManager();
pass_manager->AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
pass_manager->AddPass(pir::CreateDeadCodeEliminationPass());
pass_manager->Run(program);
}

void ApplyCinnPreprocessPass(
::pir::Program* program,
const std::function<std::shared_ptr<::pir::PassManager>()>&
CreatePassManager) {
std::shared_ptr<pir::PassManager> pass_manager = CreatePassManager();
bool has_dynamic_shape = HasDynamicShape(*program);

pass_manager->AddPass(cinn::dialect::ir::CreateConvert0DTo1DPass());
if (!has_dynamic_shape && FLAGS_check_infer_symbolic) {
pass_manager->AddPass(pir::CreateShapeOptimizationPass());
pass_manager->AddPass(cinn::dialect::ir::CreateCheckInferSymbolicPass());
}
pass_manager->AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());

pass_manager->AddPass(
cinn::dialect::ir::CreateAddBroadcastToElementwisePass());
pass_manager->AddPass(pir::CreateDeadCodeEliminationPass());

if (has_dynamic_shape) {
pass_manager->AddPass(cinn::dialect::ir::CreateConvert0DTo1DPass());
Expand Down Expand Up @@ -124,6 +129,8 @@ void ApplyGroupOpPass(::pir::Program* program,
const std::function<std::shared_ptr<pir::PassManager>()>&
CreatePassManager) {
std::shared_ptr<pir::PassManager> pass_manager = CreatePassManager();
pass_manager->AddPass(
cinn::dialect::ir::CreateAddBroadcastToElementwisePass());
if (HasDynamicShape(*program)) {
pass_manager->AddPass(::pir::CreateShapeOptimizationPass());
pass_manager->AddPass(cinn::dialect::ir::CreateInsertBroadcastPass());
Expand Down Expand Up @@ -188,13 +195,36 @@ void ApplyCinnLowerPass(
pass_manager->Run(program);
}

template <typename OP_TYPE>
int64_t GetOpCount(const ::pir::Operation* op) {
int64_t count = 0;
for (auto& region : *op) {
for (auto& block : region) {
for (auto& sub_op : block) {
if (sub_op.isa<OP_TYPE>()) {
count++;
continue;
}
if (sub_op.num_regions() > 0) {
count += GetOpCount<OP_TYPE>(&sub_op);
}
}
}
}
return count;
}

void ApplyCinnPass(::pir::Program* program,
const std::function<std::shared_ptr<pir::PassManager>()>&
CreatePassManager) {
ApplyPdToCinnPass(program, CreatePassManager);
ApplyCinnPreprocessPass(program, CreatePassManager);
ApplyBuildGroupOpPass(program, CreatePassManager);
ApplyGroupOpPass(program, CreatePassManager);
ApplyDivideGroupOpToFusionOpPass(program, CreatePassManager);
LOG(INFO) << "FusionOp count before lowering : *****[ "
<< GetOpCount<cinn::dialect::FusionOp>(program->module_op())
<< " ]*****";
ApplyCinnLowerPass(program, CreatePassManager);
}

Expand Down