Skip to content
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

Jump to bottom

[Hexagon] - Fix problems in sim_host.cpp #7725

Merged
merged 3 commits into from
Aug 1, 2023
Merged

[Hexagon] - Fix problems in sim_host.cpp #7725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0109d28
Fix problems in src/runtime/hexagon_remote/sim_host.cpp reported by c…
pranavb-ca Jul 28, 2023
b6605ce
Update hexagon_remote runtime after changes to sim_host.cpp
pranavb-ca Jul 28, 2023
27338d2
fix clang-format problems
pranavb-ca Jul 28, 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
Binary file modified src/runtime/hexagon_remote/bin/host/libhalide_hexagon_host.so
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions src/runtime/hexagon_remote/bin/src/.clang-format
View file
Open in desktop

This file was deleted.

Binary file modified src/runtime/hexagon_remote/bin/v65/libhalide_hexagon_remote_skel.so
View file
Open in desktop
Binary file not shown.
Binary file modified src/runtime/hexagon_remote/bin/v65/signed_by_debug/libhalide_hexagon_remote_skel.so
View file
Open in desktop
Binary file not shown.
37 changes: 24 additions & 13 deletions src/runtime/hexagon_remote/sim_host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ std::unique_ptr<HexagonWrapper> sim;
bool debug_mode = false;

int init_sim() {
if (sim) return 0;
if (sim) {
return 0;
}

sim = std::unique_ptr<HexagonWrapper>(new HexagonWrapper(HEX_CPU_V65));
sim = std::make_unique<HexagonWrapper>(HEX_CPU_V65);

HEXAPI_Status status = HEX_STAT_SUCCESS;

Expand Down Expand Up @@ -168,12 +170,13 @@ int read_memory(void *dest, int src, int size) {
while (size > 0) {
// This is the same logic as in write_memory above.
int next = 1;
if (size >= 8)
if (size >= 8) {
next = 8;
else if (size >= 4)
} else if (size >= 4) {
next = 4;
else if (size >= 2)
} else if (size >= 2) {
next = 2;
}
HEXAPI_Status status = sim->ReadMemory(src, next, dest);
if (status != HEX_STAT_SUCCESS) {
printf("HexagonWrapper::ReadMemory failed: %d\n", status);
Expand Down Expand Up @@ -324,12 +327,12 @@ class remote_buffer {
}

// Enable usage with std::vector.
remote_buffer(remote_buffer &&move)
remote_buffer(remote_buffer &&move) noexcept
: remote_buffer() {
std::swap(data, move.data);
std::swap(dataLen, move.dataLen);
}
remote_buffer &operator=(remote_buffer &&move) {
remote_buffer &operator=(remote_buffer &&move) noexcept {
std::swap(data, move.data);
std::swap(dataLen, move.dataLen);
return *this;
Expand All @@ -352,7 +355,9 @@ int halide_hexagon_remote_load_library(const char *soname, int sonameLen, const
std::lock_guard<std::mutex> guard(mutex);

int ret = init_sim();
if (ret != 0) return -1;
if (ret != 0) {
return -1;
}

// Copy the pointer arguments to the simulator.
remote_buffer remote_soname(soname, sonameLen);
Expand All @@ -361,7 +366,9 @@ int halide_hexagon_remote_load_library(const char *soname, int sonameLen, const

// Run the init kernels command.
ret = send_message(Message::LoadLibrary, {remote_soname.data, sonameLen, remote_code.data, codeLen, remote_module_ptr.data});
if (ret != 0) return ret;
if (ret != 0) {
return ret;
}

// Get the module ptr.
ret = read_memory(module_ptr, remote_module_ptr.data, 4);
Expand Down Expand Up @@ -422,7 +429,9 @@ int halide_hexagon_remote_run(handle_t module_ptr, handle_t function,
remote_input_buffersPtrs.data, input_buffersLen,
remote_output_buffersPtrs.data, output_buffersLen,
remote_input_scalarsPtrs.data, input_scalarsLen});
if (ret != 0) return ret;
if (ret != 0) {
return ret;
}

HEX_8u_t cycles_end = 0;
sim->GetSimulatedCycleCount(&cycles_end);
Expand All @@ -435,7 +444,9 @@ int halide_hexagon_remote_run(handle_t module_ptr, handle_t function,
// Copy the outputs back.
for (int i = 0; i < output_buffersLen; i++) {
ret = read_memory(output_buffersPtrs[i].data, remote_output_buffers[i].data, output_buffersPtrs[i].dataLen);
if (ret != 0) return ret;
if (ret != 0) {
return ret;
}
}

return ret;
Expand Down Expand Up @@ -477,8 +488,8 @@ void *halide_hexagon_host_malloc(size_t x) {
// Allocate enough space for aligning the pointer we return.
const size_t alignment = 4096;
void *orig = malloc(x + alignment);
if (orig == NULL) {
return NULL;
if (orig == nullptr) {
return nullptr;
}

// We want to store the original pointer prior to the pointer we return.
Expand Down