maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Cleanup spurious printing bits in EDSCs 

This CL also makes ScopedEDSCContexts to reset the Bindable numbering when
creating a new context.
This is useful to write minimal tests that don't use FileCheck pattern
captures for now.

PiperOrigin-RevId: 230079997
This commit is contained in:
Nicolas Vasilache 2019-01-19 13:20:28 -08:00 committed by jpienaar
parent 9f3f39d61a
commit 119af6712e
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/include/mlir/EDSC/Types.h
View File

@ -227,7 +227,10 @@ struct Bindable : public Expr {
assert(!ptr || isa<Bindable>() && "expected Bindable");
}
friend struct ScopedEDSCContext;
private:
static void resetIds() { newId() = 0; }
static unsigned &newId();
};

15
mlir/lib/EDSC/Types.cpp
View File

@ -78,7 +78,10 @@ struct StmtStorage {
} // namespace detail
ScopedEDSCContext::ScopedEDSCContext() { Expr::globalAllocator() = &allocator; }
ScopedEDSCContext::ScopedEDSCContext() {
Expr::globalAllocator() = &allocator;
Bindable::resetIds();
}
ScopedEDSCContext::~ScopedEDSCContext() { Expr::globalAllocator() = nullptr; }
@ -241,7 +244,7 @@ void Expr::print(raw_ostream &os) const {
} else if (auto un = this->dyn_cast<UnaryExpr>()) {
os << "unknown_unary";
} else if (auto bin = this->dyn_cast<BinaryExpr>()) {
os << bin.getLHS();
os << "(" << bin.getLHS();
switch (bin.getKind()) {
case ExprKind::Add:
os << " + ";
@ -271,7 +274,8 @@ void Expr::print(raw_ostream &os) const {
os << "unknown_binary";
}
}
os << bin.getRHS();
os << bin.getRHS() << ")";
return;
} else if (auto ter = this->dyn_cast<TernaryExpr>()) {
switch (ter.getKind()) {
case ExprKind::Select:
@ -451,8 +455,7 @@ void Stmt::print(raw_ostream &os, Twine indent) const {
if (auto stmtExpr = rhs.dyn_cast<StmtBlockLikeExpr>()) {
switch (stmtExpr.getKind()) {
case ExprKind::For:
os << indent << "for(idx(" << lhs << ")=" << stmtExpr << ") {";
os << " // @" << storage;
os << indent << "for(" << lhs << " = " << stmtExpr << ") {";
os << "\n";
for (const auto &s : getEnclosedStmts()) {
if (!s.getRHS().isa<StmtBlockLikeExpr>()) {
@ -477,7 +480,7 @@ void Stmt::print(raw_ostream &os, Twine indent) const {
}
}
} else {
os << "lhs(" << lhs << ") = " << rhs;
os << lhs << " = " << rhs;
}
}

16
mlir/test/EDSC/lower-edsc.mlir
View File

@ -10,20 +10,20 @@ func @fn() {
}
// CHECK: block {
// CHECK: for(idx({{.*}})=[[zero1:.*]] to {{.*}} step [[step1:.*]]) {
// CHECK: for(idx({{.*}})=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: for(idx({{.*}})=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: for(idx({{.*}})=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: lhs({{.*}}) = store( ... );
// CHECK: for({{.*}}=[[zero1:.*]] to {{.*}} step [[step1:.*]]) {
// CHECK: for({{.*}}=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: for({{.*}}=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: for({{.*}}=[[zero1]] to {{.*}} step [[step1]]) {
// CHECK: {{.*}} = store( ... );
// CHECK: };
// CHECK: };
// CHECK: };
// CHECK: }
// CHECK: }
// CHECK: block {
// CHECK: for(idx({{.*}})=[[zero2:.*]] to {{.*}} step [[step2:.*]]) {
// CHECK: for(idx({{.*}})=[[zero2]] to {{.*}} step [[step2]]) {
// CHECK: lhs({{.*}}) = store( ... );
// CHECK: for({{.*}}=[[zero2:.*]] to {{.*}} step [[step2:.*]]) {
// CHECK: for({{.*}}=[[zero2]] to {{.*}} step [[step2]]) {
// CHECK: {{.*}} = store( ... );
// CHECK: };
// CHECK: }
// CHECK: }