Skip to content

[mlir][drr] Fix variadic destination emission #95855

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
merged 1 commit into from
Jun 17, 2024
Merged

[mlir][drr] Fix variadic destination emission #95855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions mlir/test/mlir-tblgen/rewriter-static-matcher.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ def COp : NS_Op<"c_op", []> {
let results = (outs AnyInteger);
}

def DOp : NS_Op<"d_op", []> {
let arguments = (ins
Variadic<AnyInteger>:$any_integer
);

let results = (outs AnyInteger);
}

def Foo : NativeCodeCall<"foo($_builder, $0)">;

// Test static matcher for duplicate DagNode
// ---

Expand All @@ -53,3 +63,8 @@ def : Pat<(AOp (BOp I32Attr:$attr, I32:$int)),
// CHECK: if(::mlir::failed([[$DAG_MATCHER]](rewriter, op1, tblgen_ops
def : Pat<(COp $_, (BOp I32Attr:$attr, I32:$int)),
(COp $attr, $int)>;

// CHECK: auto [[$VAR:.*]] = foo(
// CHECK: ::llvm::SmallVector<::mlir::Value, 4> [[$ARR:tblgen_variadic_values_.*]];
// CHECK: [[$ARR]].push_back([[$VAR]]);
def : Pat<(AOp $x), (DOp (variadic (Foo $x)))>;
15 changes: 9 additions & 6 deletions mlir/tools/mlir-tblgen/RewriterGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,20 +1261,23 @@ std::string PatternEmitter::handleResultPattern(DagNode resultTree,
std::string PatternEmitter::handleVariadic(DagNode tree, int depth) {
assert(tree.isVariadic());

std::string output;
llvm::raw_string_ostream oss(output);
auto name = std::string(formatv("tblgen_variadic_values_{0}", nextValueId++));
symbolInfoMap.bindValue(name);
os << "::llvm::SmallVector<::mlir::Value, 4> " << name << ";\n";
oss << "::llvm::SmallVector<::mlir::Value, 4> " << name << ";\n";
for (int i = 0, e = tree.getNumArgs(); i != e; ++i) {
if (auto child = tree.getArgAsNestedDag(i)) {
os << name << ".push_back(" << handleResultPattern(child, i, depth + 1)
<< ");\n";
oss << name << ".push_back(" << handleResultPattern(child, i, depth + 1)
<< ");\n";
} else {
os << name << ".push_back("
<< handleOpArgument(tree.getArgAsLeaf(i), tree.getArgName(i))
<< ");\n";
oss << name << ".push_back("
<< handleOpArgument(tree.getArgAsLeaf(i), tree.getArgName(i))
<< ");\n";
}
}

os << oss.str();
return name;
}

Expand Down