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.

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

[refactor] Remove Expression::serialize and add ExpressionHumanFriendlyPrinter #4657

Merged
merged 1 commit into from
Apr 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions taichi/inc/expressions.inc.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
PER_EXPRESSION(ArgLoadExpression)
PER_EXPRESSION(RandExpression)
PER_EXPRESSION(UnaryOpExpression)
PER_EXPRESSION(BinaryOpExpression)
PER_EXPRESSION(TernaryOpExpression)
PER_EXPRESSION(InternalFuncCallExpression)
PER_EXPRESSION(ExternalTensorExpression)
PER_EXPRESSION(GlobalVariableExpression)
PER_EXPRESSION(GlobalPtrExpression)
PER_EXPRESSION(TensorElementExpression)
PER_EXPRESSION(RangeAssumptionExpression)
PER_EXPRESSION(LoopUniqueExpression)
PER_EXPRESSION(IdExpression)
PER_EXPRESSION(AtomicOpExpression)
PER_EXPRESSION(SNodeOpExpression)
PER_EXPRESSION(ConstExpression)
PER_EXPRESSION(ExternalTensorShapeAlongAxisExpression)
PER_EXPRESSION(FuncCallExpression)
PER_EXPRESSION(MeshPatchIndexExpression)
PER_EXPRESSION(MeshRelationAccessExpression)
PER_EXPRESSION(MeshIndexConversionExpression)
11 changes: 0 additions & 11 deletions taichi/ir/expr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@

TLANG_NAMESPACE_BEGIN

void Expr::serialize(std::ostream &ss) const {
TI_ASSERT(expr);
expr->serialize(ss);
}

std::string Expr::serialize() const {
std::stringstream ss;
serialize(ss);
return ss.str();
}

void Expr::set_tb(const std::string &tb) {
expr->tb = tb;
}
Expand Down
3 changes: 0 additions & 3 deletions taichi/ir/expr.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ class Expr {

Expr operator[](const ExprGroup &indices) const;

std::string serialize() const;
void serialize(std::ostream &ss) const;

Expr operator!();

template <typename T, typename... Args>
Expand Down
15 changes: 0 additions & 15 deletions taichi/ir/expression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,5 @@ std::string Expression::get_attribute(const std::string &key) const {
}
}

void ExprGroup::serialize(std::ostream &ss) const {
for (int i = 0; i < (int)exprs.size(); i++) {
exprs[i].serialize(ss);
if (i + 1 < (int)exprs.size()) {
ss << ", ";
}
}
}

std::string ExprGroup::serialize() const {
std::stringstream ss;
serialize(ss);
return ss.str();
}

} // namespace lang
} // namespace taichi
57 changes: 52 additions & 5 deletions taichi/ir/expression.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

TLANG_NAMESPACE_BEGIN

class ExpressionVisitor;

// always a tree - used as rvalues
class Expression {
public:
Expand Down Expand Up @@ -42,7 +44,7 @@ class Expression {
// implemented
}

virtual void serialize(std::ostream &ss) = 0;
virtual void accept(ExpressionVisitor *visitor) = 0;

virtual void flatten(FlattenContext *ctx) {
TI_NOT_IMPLEMENTED;
Expand Down Expand Up @@ -110,10 +112,6 @@ class ExprGroup {
Expr &operator[](int i) {
return exprs[i];
}

void serialize(std::ostream &ss) const;

std::string serialize() const;
};

inline ExprGroup operator,(const Expr &a, const Expr &b) {
Expand All @@ -124,4 +122,53 @@ inline ExprGroup operator,(const ExprGroup &a, const Expr &b) {
return ExprGroup(a, b);
}

#define PER_EXPRESSION(x) class x;
#include "taichi/inc/expressions.inc.h"
#undef PER_EXPRESSION

class ExpressionVisitor {
public:
ExpressionVisitor(bool allow_undefined_visitor = false,
bool invoke_default_visitor = false)
: allow_undefined_visitor_(allow_undefined_visitor),
invoke_default_visitor_(invoke_default_visitor) {
}

virtual ~ExpressionVisitor() = default;

virtual void visit(ExprGroup &expr_group) = 0;

void visit(Expr &expr) {
expr.expr->accept(this);
}

virtual void visit(Expression *expr) {
if (!allow_undefined_visitor_) {
TI_ERROR("missing visitor function");
}
}

#define DEFINE_VISIT(T) \
virtual void visit(T *expr) { \
if (allow_undefined_visitor_) { \
if (invoke_default_visitor_) \
visit((Expression *)expr); \
} else \
TI_NOT_IMPLEMENTED; \
}

#define PER_EXPRESSION(x) DEFINE_VISIT(x)
#include "taichi/inc/expressions.inc.h"
#undef PER_EXPRESSION
#undef DEFINE_VISIT
private:
bool allow_undefined_visitor_{false};
bool invoke_default_visitor_{false};
};

#define TI_DEFINE_ACCEPT_FOR_EXPRESSION \
void accept(ExpressionVisitor *visitor) override { \
visitor->visit(this); \
}

TLANG_NAMESPACE_END
Loading