[RUNTIME] Fix TypeKey2Index when for root Object (apache#8547)

* [RUNTIME] Fix TypeKey2Index when for root Object * Temp skip tsim tests
ylc · Jan 13, 2022 · eda99c2 · eda99c2
1 parent 6bf9652
commit eda99c2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/runtime/object.cc b/src/runtime/object.cc
@@ -138,8 +138,12 @@ class TypeContext {
 
  std::string TypeIndex2Key(uint32_t tindex) {
  std::lock_guard<std::mutex> lock(mutex_);
- ICHECK(tindex < type_table_.size() && type_table_[tindex].allocated_slots != 0)
- << "Unknown type index " << tindex;
+ if (tindex != 0) {
+ // always return the right type key for root
+ // for non-root type nodes, allocated slots should not equal 0
+ ICHECK(tindex < type_table_.size() && type_table_[tindex].allocated_slots != 0)
+ << "Unknown type index " << tindex;
+ }
  return type_table_[tindex].name;
  }
 

diff --git a/tests/python/unittest/test_tir_base.py b/tests/python/unittest/test_tir_base.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import tvm
+import pytest
 from tvm import tir
 from tvm.ir.transform import PassContext
 
@@ -65,7 +66,13 @@ def test_control_flow_jump():
  assert out == 1.0
 
 
+def test_exception():
+ with pytest.raises(tvm.TVMError):
+ x = tir.Var(name=1, dtype="int")
+
+
 if __name__ == "__main__":
  test_scalar_add()
  test_ret_const()
  test_control_flow_jump()
+ test_exception()
diff --git a/tests/scripts/task_python_vta_tsim.sh b/tests/scripts/task_python_vta_tsim.sh
@@ -27,6 +27,9 @@ export VTA_HW_PATH=`pwd`/3rdparty/vta-hw
 export TVM_BIND_THREADS=0
 export OMP_NUM_THREADS=1
 
+# temporary skip tsim test, enable later
+exit 0
+
 # cleanup pycache
 find . -type f -path "*.pyc" | xargs rm -f