Skip to content

[Unity][VM] Improved error message in CodeGenVM::EmitKillObject #15822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masahi merged 2 commits into from
Oct 13, 2023
Merged

[Unity][VM] Improved error message in CodeGenVM::EmitKillObject #15822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43cbf44
[Unity][VM] Improved error message in CodeGenVM::EmitKillObject
Lunderberg Sep 26, 2023
602f292
ci bump
Lunderberg Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions include/tvm/runtime/relax_vm/bytecode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,28 @@ struct Instruction {
* \brief The kind of instruction's argument.
*/
enum class ArgKind : int { kRegister = 0, kImmediate = 1, kConstIdx = 2, kFuncIdx = 3 };

friend std::ostream& operator<<(std::ostream& os, const ArgKind& kind) {
switch (kind) {
case ArgKind::kRegister:
os << "kRegister";
break;
case ArgKind::kImmediate:
os << "kImmediate";
break;
case ArgKind::kConstIdx:
os << "kConstIdx";
break;
case ArgKind::kFuncIdx:
os << "kFuncIdx";
break;
default:
LOG(FATAL) << "Internal error: "
<< "Invalid ArgKind with integer value " << static_cast<int>(kind);
}
return os;
}

/*!
* \brief The auxiliary data structure for instruction argument.
*/
Expand Down
5 changes: 4 additions & 1 deletion src/relax/backend/vm/codegen_vm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,10 @@ class CodeGenVM : public ExprFunctor<Instruction::Arg(const Expr&)> {
RegName EmitKillObject(const Call& call_node) {
ICHECK_EQ(call_node->args.size(), 1);
Instruction::Arg arg = this->VisitExpr(call_node->args[0]);
ICHECK(arg.kind() == Instruction::ArgKind::kRegister);
ICHECK(arg.kind() == Instruction::ArgKind::kRegister)
<< "Expected the object to be killed to be stored in a register, "
<< "but argument " << call_node->args[0] << " produced VM instruction of type "
<< arg.kind();
RegName dst_reg = arg.value();
builder_->EmitCall("vm.builtin.null_value", {}, dst_reg);
return dst_reg;
Expand Down