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

[IR] Add type_check for Atomic/SNodeOpExpression #3444

Merged
merged 4 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions taichi/ir/frontend_ir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,31 @@ void IdExpression::flatten(FlattenContext *ctx) {
}
}

void AtomicOpExpression::type_check() {
// TODO: assert no unknowns after type_check for all expressions are
// implemented
if (dest->ret_type == PrimitiveType::unknown ||
val->ret_type == PrimitiveType::unknown)
return;
auto error = [&]() {
throw std::runtime_error(fmt::format(
"TypeError: unsupported operand type(s) for 'atomic_{}': '{}' and '{}'",
atomic_op_type_name(op_type), dest->ret_type->to_string(),
val->ret_type->to_string()));
};
if (!val->ret_type->is<PrimitiveType>())
error();
if (auto cit = dest->ret_type->cast<CustomIntType>()) {
ret_type = cit->get_compute_type();
} else if (auto cft = dest->ret_type->cast<CustomFloatType>()) {
ret_type = cft->get_compute_type();
} else if (dest->ret_type->is<PrimitiveType>()) {
ret_type = dest->ret_type;
} else {
error();
}
}

void AtomicOpExpression::serialize(std::ostream &ss) {
if (op_type == AtomicOpType::add) {
ss << "atomic_add(";
Expand Down Expand Up @@ -537,6 +562,14 @@ void AtomicOpExpression::flatten(FlattenContext *ctx) {
stmt = ctx->back_stmt();
}

void SNodeOpExpression::type_check() {
if (op_type == SNodeOpType::get_addr) {
ret_type = PrimitiveType::u64;
} else {
ret_type = PrimitiveType::i32;
}
}

void SNodeOpExpression::serialize(std::ostream &ss) {
ss << snode_op_type_name(op_type);
ss << '(';
Expand Down
4 changes: 4 additions & 0 deletions taichi/ir/frontend_ir.h
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,8 @@ class AtomicOpExpression : public Expression {
: op_type(op_type), dest(dest), val(val) {
}

void type_check() override;

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

void flatten(FlattenContext *ctx) override;
Expand All @@ -674,6 +676,8 @@ class SNodeOpExpression : public Expression {
: snode(snode), op_type(op_type), indices(indices), value(value) {
}

void type_check() override;

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

void flatten(FlattenContext *ctx) override;
Expand Down
22 changes: 22 additions & 0 deletions tests/cpp/ir/frontend_type_inference_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,27 @@ TEST(FrontendTypeInference, TensorElement) {
EXPECT_EQ(load_tensor_element->ret_type, PrimitiveType::u32);
}

TEST(FrontendTypeInference, AtomicOp) {
auto const_i32 = Expr::make<ConstExpression, int32>(-(1 << 20));
const_i32->type_check();
auto const_f32 = Expr::make<ConstExpression, float32>(5.0);
const_f32->type_check();
auto atomic_add_i32 =
Expr::make<AtomicOpExpression>(AtomicOpType::add, const_i32, const_f32);
atomic_add_i32->type_check();
EXPECT_EQ(atomic_add_i32->ret_type, PrimitiveType::i32);
}

TEST(FrontendTypeInference, SNodeOp) {
auto snode = std::make_unique<SNode>(0, SNodeType::root);
snode->dt = PrimitiveType::u8;
auto index = Expr::make<ConstExpression, int32>(2);
index->type_check();
auto snode_op = Expr::make<SNodeOpExpression>(
snode.get(), SNodeOpType::get_addr, ExprGroup(index));
snode_op->type_check();
EXPECT_EQ(snode_op->ret_type, PrimitiveType::u64);
}

} // namespace lang
} // namespace taichi