This is an automated email from the ASF dual-hosted git repository.
tqchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm-tirx.git
The following commit(s) were added to refs/heads/main by this push:
new b40bf2d23 [FIX] Preserve void error-call types during lowering (#125)
b40bf2d23 is described below
commit b40bf2d23fc9d60de2b10a30cd901d73ca55239c
Author: Tianqi Chen <[email protected]>
AuthorDate: Thu Oct 29 12:25:16 2026 -0400
[FIX] Preserve void error-call types during lowering (#125)
Use the declared void result type for throw_last_error calls introduced
by packed API and workspace lowering. This preserves structural
TVMScript round-trips for CUDA host wrappers.
---
src/tirx/transform/lower_tvm_builtin.cc | 4 ++--
src/tirx/transform/make_packed_api.cc | 2 +-
tests/python/tirx/transform/test_lower_tvm_builtin.py | 8 ++++----
tests/python/tirx/transform/test_make_packed_api.py | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/tirx/transform/lower_tvm_builtin.cc
b/src/tirx/transform/lower_tvm_builtin.cc
index a2a7279c2..6d8af98c6 100644
--- a/src/tirx/transform/lower_tvm_builtin.cc
+++ b/src/tirx/transform/lower_tvm_builtin.cc
@@ -302,7 +302,7 @@ class BuiltinLower : public StmtExprMutator {
TVM_FFI_ICHECK(device_type_) << "Unknown device type in current IR";
TVM_FFI_ICHECK(device_id_) << "Unknown device id in current IR";
Stmt throw_last_error =
- Evaluate(Call(PrimType::Int(32), throw_last_error_op(),
{}).as_or_throw<PrimExpr>());
+ Evaluate(Call(PrimType::Void(), throw_last_error_op(),
{}).as_or_throw<PrimExpr>());
Stmt alloc_nullptr_check =
If(Call(PrimType::Bool(), isnullptr_op(),
{op->var.as_or_throw<TensorVar>().data()})
@@ -711,7 +711,7 @@ class BuiltinLower : public StmtExprMutator {
TVM_FFI_ICHECK(device_type_) << "Unknown device type in current IR";
TVM_FFI_ICHECK(device_id_) << "Unknown device id in current IR";
Stmt throw_last_error =
- Evaluate(Call(PrimType::Int(32), throw_last_error_op(),
{}).as_or_throw<PrimExpr>());
+ Evaluate(Call(PrimType::Void(), throw_last_error_op(),
{}).as_or_throw<PrimExpr>());
const auto* dtype_node =
let->var->ty.as<PtrTypeObj>()->element_type.as<PrimTypeObj>();
TVM_FFI_ICHECK(dtype_node);
diff --git a/src/tirx/transform/make_packed_api.cc
b/src/tirx/transform/make_packed_api.cc
index 7b8d50611..c95beaf70 100644
--- a/src/tirx/transform/make_packed_api.cc
+++ b/src/tirx/transform/make_packed_api.cc
@@ -286,7 +286,7 @@ Function MakePackedAPI(Function func) {
Stmt check_status = If(
status != IntImm::Int32(0),
SeqStmt({Evaluate(
- Call(PrimType::Int(32), tirx::throw_last_error_op(),
{}).as_or_throw<PrimExpr>())}));
+ Call(PrimType::Void(), tirx::throw_last_error_op(),
{}).as_or_throw<PrimExpr>())}));
body = SeqStmt({set_device, check_status, body});
}
}
diff --git a/tests/python/tirx/transform/test_lower_tvm_builtin.py
b/tests/python/tirx/transform/test_lower_tvm_builtin.py
index 87465fca5..e4a2985b2 100644
--- a/tests/python/tirx/transform/test_lower_tvm_builtin.py
+++ b/tests/python/tirx/transform/test_lower_tvm_builtin.py
@@ -245,7 +245,7 @@ def test_lower_overflow_int32():
ty_args=[T.Tensor((822083584,), T.float32)],
)
if T.isnullptr(T_subtract.data):
- T.throw_last_error(ty="int32")
+ T.throw_last_error()
rxplaceholder_red_1 = T.decl_tensor(
rxplaceholder_red.data, ty_args=[T.Tensor((T.int64(32),),
T.float32)]
)
@@ -260,7 +260,7 @@ def test_lower_overflow_int32():
cse_v1: T.let[T.int32] = ax1 * 25690112 + ax2
T_subtract_1[cse_v1] = rxplaceholder_1[cse_v1] -
rxplaceholder_red_1[ax1]
if T.free_workspace(1, 0, T_subtract.data) != 0:
- T.throw_last_error(ty="int32")
+ T.throw_last_error()
After = tvm_tirx.tirx.transform.LowerTVMBuiltin()(Before)
tvm_tirx.ir.assert_structural_equal(After, Expected)
@@ -290,11 +290,11 @@ def test_lower_device_allocate():
ty_args=[T.Tensor((16,), T.float32)],
)
if T.isnullptr(ptr.data):
- T.throw_last_error(ty="int32")
+ T.throw_last_error()
buf = T.decl_tensor(ptr.data, ty_args=[T.Tensor((16,), T.float32)])
buf[0] = T.float32(0.0)
if T.free_workspace(2, 0, ptr.data) != 0:
- T.throw_last_error(ty="int32")
+ T.throw_last_error()
After = tvm_tirx.tirx.transform.LowerTVMBuiltin()(Before)
tvm_tirx.ir.assert_structural_equal(After, Expected)
diff --git a/tests/python/tirx/transform/test_make_packed_api.py
b/tests/python/tirx/transform/test_make_packed_api.py
index e35e4ce7a..184368f91 100644
--- a/tests/python/tirx/transform/test_make_packed_api.py
+++ b/tests/python/tirx/transform/test_make_packed_api.py
@@ -285,7 +285,7 @@ def test_target_host_removed():
"TVMBackendSetDevice", 2, dev_id, ty="int32"
)
if set_device_status != 0:
- T.throw_last_error(ty="int32")
+ T.throw_last_error()
with T.compute_scope("main_compute_"):
pass
return 0