[Lang] [type] Disallow reading a whole bit_struct

taichi-dev · May 30, 2022 · 08d09a0 · 08d09a0
1 parent 359afd2
commit 08d09a0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 211 deletions.
diff --git a/misc/visualize_quant_types.py b/misc/visualize_quant_types.py
diff --git a/python/taichi/lang/impl.py b/python/taichi/lang/impl.py
@@ -191,14 +191,6 @@ def subscript(value, *_indices, skip_reordered=False):
         ])
         ret.any_array_access = any_array_access
         return ret
-    if isinstance(value, SNode):
-        # When reading bit structure we only support the 0-D case for now.
-        field_dim = 0
-        if field_dim != index_dim:
-            raise IndexError(
-                f'Field with dim {field_dim} accessed with indices of dim {index_dim}'
-            )
-        return Expr(_ti_core.subscript(value.ptr, indices_expr_group))
     # Directly evaluate in Python for non-Taichi types
     return value.__getitem__(*_indices)
 

diff --git a/taichi/ir/expression_printer.h b/taichi/ir/expression_printer.h
@@ -101,11 +101,7 @@ class ExpressionHumanFriendlyPrinter : public ExpressionPrinter {
   }
 
   void visit(GlobalPtrExpression *expr) override {
-    if (expr->snode) {
-      emit(expr->snode->get_node_type_name_hinted());
-    } else {
-      expr->var->accept(this);
-    }
+    expr->var->accept(this);
     emit('[');
     emit_vector(expr->indices.exprs);
     emit(']');

diff --git a/taichi/ir/frontend_ir.cpp b/taichi/ir/frontend_ir.cpp
@@ -365,10 +365,7 @@ void GlobalVariableExpression::flatten(FlattenContext *ctx) {
 
 void GlobalPtrExpression::type_check(CompileConfig *) {
   // Currently, dimension compatibility check happens in Python
-  if (snode != nullptr) {
-    TI_ASSERT(snode->dt->is<BitStructType>());
-    ret_type = snode->dt->cast<BitStructType>()->get_physical_type();
-  } else if (var.is<GlobalVariableExpression>()) {
+  if (var.is<GlobalVariableExpression>()) {
     ret_type =
         var.cast<GlobalVariableExpression>()->snode->dt->get_compute_type();
   } else if (var.is<ExternalTensorExpression>()) {
@@ -391,10 +388,7 @@ void GlobalPtrExpression::flatten(FlattenContext *ctx) {
   std::vector<Stmt *> index_stmts;
   std::vector<int> offsets;
   SNode *snode = nullptr;
-  if (this->snode != nullptr) {
-    snode = this->snode;
-  }
-  if (bool(var) && var.is<GlobalVariableExpression>()) {
+  if (var.is<GlobalVariableExpression>()) {
     snode = var.cast<GlobalVariableExpression>()->snode;
     offsets = snode->index_offsets;
   }

diff --git a/taichi/ir/frontend_ir.h b/taichi/ir/frontend_ir.h
@@ -463,18 +463,13 @@ class GlobalVariableExpression : public Expression {
 
 class GlobalPtrExpression : public Expression {
  public:
-  SNode *snode{nullptr};
   Expr var;
   ExprGroup indices;
 
   GlobalPtrExpression(const Expr &var, const ExprGroup &indices)
       : var(var), indices(indices) {
   }
 
-  GlobalPtrExpression(SNode *snode, const ExprGroup &indices)
-      : snode(snode), indices(indices) {
-  }
-
   void type_check(CompileConfig *config) override;
 
   void flatten(FlattenContext *ctx) override;

diff --git a/taichi/python/export_lang.cpp b/taichi/python/export_lang.cpp
@@ -865,10 +865,6 @@ void export_lang(py::module &m) {
         Expr::make<TensorElementExpression, const Expr &, const ExprGroup &,
                    const std::vector<int> &, int>);
 
-  m.def("subscript", [](SNode *snode, const ExprGroup &indices) {
-    return Expr::make<GlobalPtrExpression>(snode, indices);
-  });
-
   m.def("get_external_tensor_dim", [](const Expr &expr) {
     TI_ASSERT(expr.is<ExternalTensorExpression>());
     return expr.cast<ExternalTensorExpression>()->dim;

diff --git a/taichi/transforms/type_check.cpp b/taichi/transforms/type_check.cpp
@@ -123,11 +123,7 @@ class TypeCheck : public IRVisitor {
 
   void visit(GlobalLoadStmt *stmt) override {
     auto pointee_type = stmt->src->ret_type.ptr_removed();
-    if (auto bit_struct = pointee_type->cast<BitStructType>()) {
-      stmt->ret_type = bit_struct->get_physical_type();
-    } else {
-      stmt->ret_type = pointee_type->get_compute_type();
-    }
+    stmt->ret_type = pointee_type->get_compute_type();
   }
 
   void visit(SNodeOpStmt *stmt) override {