This is an automated email from the ASF dual-hosted git repository. tqchen pushed a commit to branch tvmscript-generic-parser-builder in repository https://gitbox.apache.org/repos/asf/tvm.git
commit fe176eaa7b3d24710f85e4994fe1ac7f068a0c9a Author: Tianqi Chen <[email protected]> AuthorDate: Sun Sep 20 22:42:51 2026 +0000 [TVMScript] Align builder extensions with native formatting --- include/tvm/relax/script/builder/ir.h | 3 +-- src/relax/script/builder/frame.cc | 9 +++++---- src/relax/script/builder/ir.cc | 3 +-- src/relax/script/builder/utils.h | 3 ++- src/script/ir_builder/ir/ir.cc | 5 ++--- src/tirx/script/builder/frame.cc | 3 +-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/tvm/relax/script/builder/ir.h b/include/tvm/relax/script/builder/ir.h index b52dcd0ae0..86c6fd3dad 100644 --- a/include/tvm/relax/script/builder/ir.h +++ b/include/tvm/relax/script/builder/ir.h @@ -127,8 +127,7 @@ TVM_DLL tvm::Var EmitMatchCast(const tvm::relax::Expr& value, const tvm::Type& t TVM_DLL tvm::Var EmitVarBinding(const tvm::relax::VarBinding& binding); /*! \brief Emit a binding with separate statement and variable-name ranges. */ -TVM_DLL tvm::Var EmitV2(const tvm::relax::Expr& value, - const ffi::Optional<tvm::Type>& annotate_ty, +TVM_DLL tvm::Var EmitV2(const tvm::relax::Expr& value, const ffi::Optional<tvm::Type>& annotate_ty, const ffi::Optional<Span>& name_span); /*! \brief Emit a match cast with separate statement and variable-name ranges. */ diff --git a/src/relax/script/builder/frame.cc b/src/relax/script/builder/frame.cc index acacdb7eef..e6bcba28c9 100644 --- a/src/relax/script/builder/frame.cc +++ b/src/relax/script/builder/frame.cc @@ -82,9 +82,9 @@ void FunctionFrameNode::ExitWithScope() { << "A function declaration requires an IRModule frame"; RelaxFrameNode::ExitWithScope(); block_builder->EndScope(); - function = tvm::relax::Function::CreateEmpty( - params, ret_ty.value_or(tvm::relax::AnyType()), is_pure.value_or(true), - DictAttrs(attrs), source_span); + function = + tvm::relax::Function::CreateEmpty(params, ret_ty.value_or(tvm::relax::AnyType()), + is_pure.value_or(true), DictAttrs(attrs), source_span); if (local) { local_var = tvm::Var(name.value(), tvm::relax::GetType(function.value()), source_span); } else { @@ -98,7 +98,8 @@ void FunctionFrameNode::ExitWithScope() { << "A Relax function must have a return value. Please use " "`return` to return an Expr"; - Expr body = this->block_builder->Normalize(tvm::relax::SeqExpr(binding_blocks, output.value(), source_span)); + Expr body = this->block_builder->Normalize( + tvm::relax::SeqExpr(binding_blocks, output.value(), source_span)); // if the function is not private, add a global symbol to its attributes if (!is_private.value_or(false) && name.has_value() && !attrs.count(tvm::attr::kGlobalSymbol)) { attrs.Set(tvm::attr::kGlobalSymbol, name.value()); diff --git a/src/relax/script/builder/ir.cc b/src/relax/script/builder/ir.cc index cca4aef551..df6729ed72 100644 --- a/src/relax/script/builder/ir.cc +++ b/src/relax/script/builder/ir.cc @@ -281,8 +281,7 @@ tvm::Var RecordBindingSpan(tvm::Var var, const ffi::Optional<Span>& name_span) { } // namespace -tvm::Var EmitV2(const tvm::relax::Expr& value, - const ffi::Optional<tvm::Type>& annotate_ty, +tvm::Var EmitV2(const tvm::relax::Expr& value, const ffi::Optional<tvm::Type>& annotate_ty, const ffi::Optional<Span>& name_span) { return RecordBindingSpan(Emit(value, annotate_ty), name_span); } diff --git a/src/relax/script/builder/utils.h b/src/relax/script/builder/utils.h index 0ffd80c748..247dd91aae 100644 --- a/src/relax/script/builder/utils.h +++ b/src/relax/script/builder/utils.h @@ -116,7 +116,8 @@ inline tvm::relax::SeqExpr GetSeqExprForBranch(const SeqExprFrame& frame, ffi::S if (var_binding && tvm::relax::IsLeafOrTuple(var_binding->value)) { body = var_binding->value; } else if (var_binding) { - last_block_bindings.push_back(tvm::relax::VarBinding(new_var, var_binding->value, var_binding->span)); + last_block_bindings.push_back( + tvm::relax::VarBinding(new_var, var_binding->value, var_binding->span)); body = new_var; } else if (const auto* match_cast = last_binding.as<tvm::relax::MatchCastNode>()) { last_block_bindings.push_back( diff --git a/src/script/ir_builder/ir/ir.cc b/src/script/ir_builder/ir/ir.cc index da0cc81819..13f7f97c4a 100644 --- a/src/script/ir_builder/ir/ir.cc +++ b/src/script/ir_builder/ir/ir.cc @@ -81,9 +81,8 @@ GlobalVar ReserveFunction(const ffi::String& func_name) { GlobalVar DeclFunction(const ffi::String& func_name, const BaseFunc& func_signature) { IRModuleFrame frame = FindModuleFrame(); - GlobalVar gv = frame->global_var_map.count(func_name) - ? frame->global_var_map.at(func_name) - : GlobalVar(func_name); + GlobalVar gv = frame->global_var_map.count(func_name) ? frame->global_var_map.at(func_name) + : GlobalVar(func_name); TVM_FFI_CHECK(!frame->functions.count(gv), ValueError) << "function " << func_name << " already exists"; if (auto ty = GetGlobalVarType(func_signature)) { diff --git a/src/tirx/script/builder/frame.cc b/src/tirx/script/builder/frame.cc index bef985e5dc..3fe8188e23 100644 --- a/src/tirx/script/builder/frame.cc +++ b/src/tirx/script/builder/frame.cc @@ -203,8 +203,7 @@ void PrimFuncFrameNode::ExitWithScope() { // Define the function. // Note we do checks to disallow redefinition of functions inside the `DefFunction`. if (!global_var.has_value()) { - TVM_FFI_CHECK(!is_declaration, ValueError) - << "function " << func_name << " already exists"; + TVM_FFI_CHECK(!is_declaration, ValueError) << "function " << func_name << " already exists"; global_var = frame->global_var_map.at(func_name); } if (!is_declaration) {
