Skip to content
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

[CINN] Move directory of lower_cinn_fusion_op_pass #61619

Merged
merged 3 commits into from
Feb 7, 2024
Merged

[CINN] Move directory of lower_cinn_fusion_op_pass #61619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9e2c5
move lower_cinn_fusion_op_pass
zyfncg Feb 5, 2024
77d9980
fix complie
zyfncg Feb 5, 2024
4ac6195
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zyfncg Feb 7, 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
55 changes: 27 additions & 28 deletions .../group_merge/lower_cinn_fusion_op_pass.cc → ...r/transforms/lower_cinn_fusion_op_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#pragma once

#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/lower_cinn_fusion_op_pass.h"

#include <unordered_map>

Expand All @@ -25,9 +25,9 @@
#include "paddle/cinn/hlir/dialect/operator/ir/manual_op.h"
#include "paddle/cinn/hlir/dialect/operator/ir/op_attribute.h"
#include "paddle/cinn/hlir/dialect/operator/ir/op_dialect.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.h"
#include "paddle/cinn/hlir/dialect/runtime/ir/jit_kernel_op.h"
#include "paddle/cinn/hlir/dialect/runtime/ir/runtime_dialect.h"
#include "paddle/cinn/hlir/framework/pir/group.h"
#include "paddle/cinn/hlir/framework/pir/utils.h"
#include "paddle/cinn/hlir/framework/pir_compiler.h"
#include "paddle/cinn/runtime/flags.h"
Expand All @@ -46,7 +46,8 @@ PD_DECLARE_bool(cinn_enable_map_expr);

namespace {

using cinn::dialect::ir::Group;
using Group = cinn::hlir::framework::pir::Group;
using GroupPtr = std::shared_ptr<Group>;
using cinn::hlir::framework::pir::CompatibleInfo;

using ShapeOrDataDimExprs4ValueT =
Expand Down Expand Up @@ -99,7 +100,7 @@ void EraseUneccessaryExpandsInBlock(

void ReplaceExpandWithBroadcast(pir::IrContext* ir_context,
pir::Block* block,
const cinn::dialect::ir::GroupPtr& group) {
const GroupPtr& group) {
std::vector<pir::Operation*> op_list;
for (auto& op : *block) {
op_list.push_back(&op);
Expand Down Expand Up @@ -226,15 +227,15 @@ std::tuple<pir::Value, pir::Value, pir::Value> BroadcastableToCondValue(
lhs_eq_rhs_cond, lhs_eq_one_cond, rhs_eq_one_cond);
}

cinn::dialect::ir::GroupPtr CloneGroup(const cinn::dialect::ir::GroupPtr& group,
pir::Block* block,
pir::IrMapping* ir_mapping) {
GroupPtr CloneGroup(const GroupPtr& group,
pir::Block* block,
pir::IrMapping* ir_mapping) {
return group->Clone(block, *ir_mapping);
}

void UpdateGroupShapeExprs(
const cinn::dialect::ir::GroupPtr& new_group,
const cinn::dialect::ir::GroupPtr& origin_group,
const GroupPtr& new_group,
const GroupPtr& origin_group,
const pir::IrMapping& ir_mapping,
const cinn::common::BroadcastLeaf& value_dim_exprs_list,
const std::unordered_map<pir::Value, size_t>& value_to_dim_expr_idx) {
Expand All @@ -259,12 +260,12 @@ void UpdateGroupShapeExprs(
}

void SetLeafBlockByGroupView(
const cinn::dialect::ir::GroupPtr& origin_group,
const GroupPtr& origin_group,
const cinn::common::BroadcastLeaf& value_dim_exprs_list,
const std::unordered_map<pir::Value, size_t>& value_to_dim_expr_idx,
pir::Builder& builder, // NOLINT
pir::Block* block,
std::unordered_map<pir::Block*, cinn::dialect::ir::GroupPtr>* group_map) {
std::unordered_map<pir::Block*, GroupPtr>* group_map) {
pir::IrMapping ir_mapping;
auto origin_group_inputs = GetBlockOutsideInput(origin_group->ops);
for (auto input : origin_group_inputs) {
Expand Down Expand Up @@ -310,14 +311,14 @@ void InsertYieldOpForCondBlock(pir::Operation* cond_op,
// Visit broadcast_tree by dfs
pir::Operation* CreateConditionBlock(
const cinn::common::BroadcastTree& broadcast_tree,
const cinn::dialect::ir::GroupPtr& origin_group,
const GroupPtr& origin_group,
pir::ShapeConstraintIRAnalysis& shape_analysis, // NOLINT
const std::unordered_map<pir::Value, size_t>& value_to_dim_expr_idx,
const std::vector<pir::Value>& group_inputs,
const std::vector<pir::Type>& output_types,
pir::Builder& builder, // NOLINT
pir::Block* block,
std::unordered_map<pir::Block*, cinn::dialect::ir::GroupPtr>* group_map) {
std::unordered_map<pir::Block*, GroupPtr>* group_map) {
if (broadcast_tree.Has<cinn::common::BroadcastLeaf>()) {
const auto& broadcast_leaf =
broadcast_tree.Get<cinn::common::BroadcastLeaf>();
Expand Down Expand Up @@ -392,15 +393,13 @@ pir::Operation* CreateConditionBlock(
}
}

std::unordered_map<cinn::dialect::ir::GroupPtr,
std::unordered_map<std::string, pir::Attribute>>
std::unordered_map<GroupPtr, std::unordered_map<std::string, pir::Attribute>>
ComplieGroupAsOpAttribute(
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
const std::vector<cinn::dialect::ir::GroupPtr>& group_list) {
const std::vector<GroupPtr>& group_list) {
auto fn_ptr_res = pir_compiler->BuildCUDAJITInfo(group_list);

std::unordered_map<cinn::dialect::ir::GroupPtr,
std::unordered_map<std::string, pir::Attribute>>
std::unordered_map<GroupPtr, std::unordered_map<std::string, pir::Attribute>>
result;
for (size_t i = 0; i < group_list.size(); ++i) {
std::unordered_map<std::string, ::pir::Attribute> op_attrs{
Expand All @@ -415,10 +414,10 @@ ComplieGroupAsOpAttribute(

void SimplyConditionBlock(
pir::PatternRewriter& rewriter, // NOLINT
std::unordered_map<pir::Block*, cinn::dialect::ir::GroupPtr>* group_map) {
std::unordered_map<pir::Block*, GroupPtr>* group_map) {
VLOG(4) << "simply condition block";
using DoEachMutBlockGroupT =
std::function<void(pir::Block*, const cinn::dialect::ir::GroupPtr&)>;
std::function<void(pir::Block*, const GroupPtr&)>;
const auto& ForEachMutBlockGroup = [&](const DoEachMutBlockGroupT& DoEach) {
for (auto& [block, group] : *group_map) {
DoEach(block, group);
Expand Down Expand Up @@ -451,9 +450,9 @@ void CompileGroupToJitKernelOp(
const std::vector<pir::Value>& group_inputs,
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
pir::PatternRewriter& rewriter, // NOLINT
std::unordered_map<pir::Block*, cinn::dialect::ir::GroupPtr>* group_map) {
std::unordered_map<pir::Block*, GroupPtr>* group_map) {
// prepare attribute for jit_kernel_op
std::vector<cinn::dialect::ir::GroupPtr> group_list;
std::vector<GroupPtr> group_list;
group_list.reserve(group_map->size());
for (const auto& [_, group] : *group_map) {
group_list.push_back(group);
Expand Down Expand Up @@ -494,7 +493,7 @@ void CompileGroupToJitKernelOp(

pir::Operation* ComplieBroadcastTreeToConditionBlock(
const cinn::common::BroadcastTree& broadcast_tree,
const cinn::dialect::ir::GroupPtr& group,
const GroupPtr& group,
pir::ShapeConstraintIRAnalysis& shape_analysis, // NOLINT
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
const std::unordered_map<pir::Value, size_t>& value_to_dim_expr_idx,
Expand All @@ -503,7 +502,7 @@ pir::Operation* ComplieBroadcastTreeToConditionBlock(
pir::PatternRewriter& rewriter) { // NOLINT
// 1. broadcast tree to condition op
VLOG(4) << "broadcast tree to condition op";
std::unordered_map<pir::Block*, cinn::dialect::ir::GroupPtr> group_map;
std::unordered_map<pir::Block*, GroupPtr> group_map;
pir::Operation* cond_op = CreateConditionBlock(broadcast_tree,
group,
shape_analysis,
Expand All @@ -528,7 +527,7 @@ pir::Operation* ComplieBroadcastTreeToConditionBlock(
}

pir::Operation* ProcessDyShapeGroup(
const cinn::dialect::ir::GroupPtr& group,
const GroupPtr& group,
pir::ShapeConstraintIRAnalysis& shape_analysis, // NOLINT
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
pir::PatternRewriter& rewriter) { // NOLINT
Expand Down Expand Up @@ -597,7 +596,7 @@ pir::Operation* ProcessDyShapeGroup(

std::unordered_map<::pir::Value, symbol::ShapeOrDataDimExprs>
CreateGroupShapeOrDataExprs(
const cinn::dialect::ir::GroupPtr& group,
const GroupPtr& group,
pir::ShapeConstraintIRAnalysis& shape_analysis) { // NOLINT
std::unordered_map<::pir::Value, symbol::ShapeOrDataDimExprs> value2shape;
for (auto* op : group->ops) {
Expand Down Expand Up @@ -672,7 +671,7 @@ class FusionOpPattern : public pir::OpRewritePattern<cinn::dialect::FusionOp> {

protected:
virtual pir::Operation* ProcessGroup(
const cinn::dialect::ir::GroupPtr& group,
const GroupPtr& group,
pir::ShapeConstraintIRAnalysis& shape_analysis, // NOLINT
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
pir::PatternRewriter& rewriter) const { // NOLINT
Expand Down Expand Up @@ -725,7 +724,7 @@ class DyShapeFusionOpPattern : public FusionOpPattern {

protected:
virtual pir::Operation* ProcessGroup(
const cinn::dialect::ir::GroupPtr& group,
const GroupPtr& group,
pir::ShapeConstraintIRAnalysis& shape_analysis, // NOLINT
const std::shared_ptr<cinn::hlir::framework::PirCompiler>& pir_compiler,
pir::PatternRewriter& rewriter) const { // NOLINT
Expand Down
0 ...s/group_merge/lower_cinn_fusion_op_pass.h → ...or/transforms/lower_cinn_fusion_op_pass.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion paddle/fluid/pybind/pir.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/convert_dynamic_to_static_dim_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/convert_static_dim_to_dynamic_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/move_generate_shape_ops_to_prologue_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/insert_broadcast_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/remove_unchanged_reshape_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/replace_dynamic_expand_pass.h"
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/sub_graph/sub_graph_checker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#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/group_merge/divide_group_op_to_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.h"
#include "paddle/fluid/framework/new_executor/interpretercore.h"
#include "paddle/fluid/pir/dialect/operator/ir/op_attribute.h"
Expand Down
2 changes: 1 addition & 1 deletion test/cpp/pir/cinn/group_op_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#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/group_merge/divide_group_op_to_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/framework/pir/group.h"
#include "paddle/fluid/framework/new_executor/interpretercore.h"
#include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
Expand Down
2 changes: 1 addition & 1 deletion test/cpp/pir/cinn/pir_all_path_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#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/group_merge/divide_group_op_to_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/lower_cinn_fusion_op_pass.h"
#include "paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.h"
#include "paddle/fluid/framework/new_executor/interpretercore.h"
#include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
Expand Down