[ExecScope] Add cur scope name to ScopeIdDef (apache#7)

Author: spectrometerHBH

include/tvm/tir/exec_scope.h

@@ -49,32 +49,36 @@ class ScopeIdDefNode : public Object {
   Array<ScopeId> def_ids;
   /*! \brief The extents of the ScopeId */
   Array<PrimExpr> extents;
-  /*! \brief Parent ExecScope name*/
+  /*! \brief Parent ExecScope name */
   String parent;
+  /*! \brief Current ExecScope name */
+  String cur;
 
   void VisitAttrs(AttrVisitor* v) {
     v->Visit("def_ids", &def_ids);
     v->Visit("extents", &extents);
     v->Visit("parent", &parent);
+    v->Visit("cur", &cur);
   }
 
   bool SEqualReduce(const ScopeIdDefNode* other, SEqualReducer equal) const {
     return equal(def_ids, other->def_ids) && equal(extents, other->extents) &&
-           equal(parent, other->parent);
+           equal(parent, other->parent) && equal(cur, other->cur);
   }
 
   void SHashReduce(SHashReducer hash_reduce) const {
     hash_reduce(def_ids);
     hash_reduce(extents);
     hash_reduce(parent);
+    hash_reduce(cur);
   }
   static constexpr const char* _type_key = "tir.ScopeIdDef";
   TVM_DECLARE_FINAL_OBJECT_INFO(ScopeIdDefNode, Object);
 };
 
 class ScopeIdDef : public ObjectRef {
  public:
-  TVM_DLL ScopeIdDef(Array<ScopeId> def_ids, Array<PrimExpr> extents, String parent);
+  TVM_DLL ScopeIdDef(Array<ScopeId> def_ids, Array<PrimExpr> extents, String parent, String cur);
 
   TVM_DEFINE_OBJECT_REF_METHODS(ScopeIdDef, ObjectRef, ScopeIdDefNode);
 };

python/tvm/tir/exec_scope.py

@@ -36,9 +36,10 @@ class ScopeIdDef(Object):
     def_ids: List[ScopeId]
     extents: List[PrimExpr]
     parent: str
+    cur: str
 
-    def __init__(self, def_ids: List[ScopeId], extents: List[PrimExpr], parent: str):
-        self.__init_handle_by_constructor__(_ffi_api.ScopeIdDef, def_ids, extents, parent)
+    def __init__(self, def_ids: List[ScopeId], extents: List[PrimExpr], parent: str, cur: str):
+        self.__init_handle_by_constructor__(_ffi_api.ScopeIdDef, def_ids, extents, parent, cur)
 
 
 @register_object("tir.ExecScope")

src/tir/ir/exec_scope.cc

@@ -37,20 +37,21 @@ TVM_REGISTER_NODE_TYPE(ScopeIdNode);
 TVM_REGISTER_GLOBAL("tir.ScopeId").set_body_typed([](String name) { return ScopeId(name); });
 
 // ScopeIdDef
-ScopeIdDef::ScopeIdDef(Array<ScopeId> ids, Array<PrimExpr> extents, String parent) {
+ScopeIdDef::ScopeIdDef(Array<ScopeId> ids, Array<PrimExpr> extents, String parent, String cur) {
   auto n = make_object<ScopeIdDefNode>();
   ICHECK_EQ(ids.size(), extents.size()) << "Number of dimensions must match";
   n->def_ids = std::move(ids);
   n->extents = std::move(extents);
   n->parent = std::move(parent);
+  n->cur = std::move(cur);
   data_ = std::move(n);
 }
 
 TVM_REGISTER_NODE_TYPE(ScopeIdDefNode);
 
 TVM_REGISTER_GLOBAL("tir.ScopeIdDef")
-    .set_body_typed([](Array<ScopeId> vars, Array<PrimExpr> extents, String parent) {
-      return ScopeIdDef(vars, extents, parent);
+    .set_body_typed([](Array<ScopeId> vars, Array<PrimExpr> extents, String parent, String cur) {
+      return ScopeIdDef(vars, extents, parent, cur);
     });
 
 // ExecScope