Skip to content

[Hexagon] Pass stack size to simulator #11046

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
kparzysz-quic merged 2 commits into from
Apr 19, 2022
Merged

[Hexagon] Pass stack size to simulator #11046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd095d1
[Hexagon] Pass stack size to simulator
Apr 18, 2022
6cbfc62
Merge branch 'main' into simulator-stack-size
Apr 19, 2022
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
2 changes: 1 addition & 1 deletion python/tvm/contrib/hexagon/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def __init__(
launcher: "HexagonLauncherRPC",
remote_kw: dict,
session_name: str = "hexagon-rpc",
remote_stack_size_bytes: int = 128 * 1024,
remote_stack_size_bytes: int = 256 * 1024, # Min size for main thread in QuRT/sim
):
self._launcher = launcher
self._session_name = session_name
Expand Down
12 changes: 7 additions & 5 deletions src/runtime/hexagon/rpc/simulator/session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ MaybeRange<T> to_range(const MaybeString& str) {

class SimulatorRPCChannel final : public RPCChannel {
public:
SimulatorRPCChannel(std::string args);
SimulatorRPCChannel(int stack_size, std::string args);
~SimulatorRPCChannel() final;
size_t Send(const void* data, size_t size) final;
size_t Recv(void* data, size_t size) final;
Expand Down Expand Up @@ -520,7 +520,7 @@ detail::Optional<HEXAPI_Cpu> SimulatorRPCChannel::GetCPU(const detail::MaybeStri
.Default(none);
}

SimulatorRPCChannel::SimulatorRPCChannel(std::string args) {
SimulatorRPCChannel::SimulatorRPCChannel(int stack_size, std::string args) {
const auto* api_v2 = tvm::runtime::Registry::Get("device_api.hexagon.v2");
ICHECK(api_v2 != nullptr);
tvm::runtime::Registry::Register("device_api.hexagon", true).set_body(*api_v2);
Expand Down Expand Up @@ -573,7 +573,9 @@ SimulatorRPCChannel::SimulatorRPCChannel(std::string args) {
CHECKED_CALL(ConfigureCosim, cosim_file_);
CHECKED_CALL(ConfigureExecutableBinary, sdk.runelf.c_str());

std::string cmdline = sdk.runelf + " " + sdk.runmain + " -- libhexagon_rpc_sim.so";
std::string stack_arg =
stack_size > 0 ? std::string(" -stack_size=") + std::to_string(stack_size) : "";
std::string cmdline = sdk.runelf + " " + sdk.runmain + stack_arg + " -- libhexagon_rpc_sim.so";
char* parg = &cmdline[0];
CHECKED_CALL(ConfigureAppCommandLine, 1, &parg);

Expand Down Expand Up @@ -1312,9 +1314,9 @@ detail::Optional<HEXAPI_Nullptr> SimulatorRPCChannel::to_nullptr(const detail::M
TVM_REGISTER_GLOBAL("tvm.contrib.hexagon.create_hexagon_session")
.set_body([](TVMArgs args, TVMRetValue* rv) {
std::string session_name = args[0];
// For target, the second parameter is remote_stack_size_bytes, ignore it.
int stack_size = args[1];
std::string sim_args = args[2];
auto channel = std::make_unique<SimulatorRPCChannel>(sim_args);
auto channel = std::make_unique<SimulatorRPCChannel>(stack_size, sim_args);
std::shared_ptr<RPCEndpoint> endpoint =
RPCEndpoint::Create(std::move(channel), session_name, "", nullptr);
std::shared_ptr<RPCSession> session = CreateClientSession(endpoint);
Expand Down