Skip to content

Fix: assert/LOG paths failing when pto2_current_runtime() is null on AICPU #519

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

Open
yanghaoran29 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: assert/LOG paths failing when pto2_current_runtime() is null on AICPU #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/a2a3/runtime/tensormap_and_ringbuffer/aicpu/aicpu_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ typedef void (*DeviceOrchestrationBindRuntimeFunc)(PTO2Runtime *rt);
// Config function exported by orchestration .so
typedef PTO2OrchestrationConfig (*DeviceOrchestrationConfigFunc)(const ChipStorageTaskArgs &orch_args);

// From orchestration/common.cpp linked into this DSO — updates g_pto2_current_runtime here (distinct from
// pto2_framework_bind_runtime in the dlopen'd libdevice_orch_*.so).
extern "C" void pto2_framework_bind_runtime(PTO2Runtime *rt);

constexpr int32_t MAX_AICPU_THREADS = PLATFORM_MAX_AICPU_THREADS;
constexpr int32_t MAX_CORES_PER_THREAD = PLATFORM_MAX_CORES_PER_THREAD;

Expand Down Expand Up @@ -2112,6 +2116,7 @@ int32_t AicpuExecutor::run(Runtime *runtime) {
#if PTO2_PROFILING
orch_cycle_start = get_sys_cnt_aicpu();
#endif
pto2_framework_bind_runtime(rt);
if (orch_bind_runtime_ != nullptr) {
orch_bind_runtime_(rt);
}
Expand Down Expand Up @@ -2353,8 +2358,8 @@ int32_t AicpuExecutor::run(Runtime *runtime) {
finished_.store(true, std::memory_order_release);
// Destroy PTO2 runtime and close orchestration SO (moved from orchestrator path)
if (!runtime->get_orch_built_on_host() && orch_so_handle_ != nullptr) {
// Clear the borrowed pointer in the orchestration SO before destroying
// rt, so g_pto2_current_runtime never points to freed memory.
// Clear g_pto2_current_runtime in this DSO and in the orchestration SO before destroying rt.
pto2_framework_bind_runtime(nullptr);
if (orch_bind_runtime_ != nullptr) {
orch_bind_runtime_(nullptr);
}
Expand Down
9 changes: 7 additions & 2 deletions src/a5/runtime/tensormap_and_ringbuffer/aicpu/aicpu_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ typedef void (*DeviceOrchestrationBindRuntimeFunc)(PTO2Runtime *rt);
// Config function exported by orchestration .so
typedef PTO2OrchestrationConfig (*DeviceOrchestrationConfigFunc)(const ChipStorageTaskArgs &orch_args);

// From orchestration/common.cpp linked into this DSO — updates g_pto2_current_runtime here (distinct from
// pto2_framework_bind_runtime in the dlopen'd libdevice_orch_*.so).
extern "C" void pto2_framework_bind_runtime(PTO2Runtime *rt);

constexpr int32_t MAX_AICPU_THREADS = PLATFORM_MAX_AICPU_THREADS;
constexpr int32_t MAX_CORES_PER_THREAD = PLATFORM_MAX_CORES_PER_THREAD;

Expand Down Expand Up @@ -2091,6 +2095,7 @@ int32_t AicpuExecutor::run(Runtime *runtime) {
#if PTO2_PROFILING
orch_cycle_start = get_sys_cnt_aicpu();
#endif
pto2_framework_bind_runtime(rt);
if (orch_bind_runtime_ != nullptr) {
orch_bind_runtime_(rt);
}
Expand Down Expand Up @@ -2330,8 +2335,8 @@ int32_t AicpuExecutor::run(Runtime *runtime) {
finished_.store(true, std::memory_order_release);
// Destroy PTO2 runtime and close orchestration SO (moved from orchestrator path)
if (!runtime->get_orch_built_on_host() && orch_so_handle_ != nullptr) {
// Clear the borrowed pointer in the orchestration SO before destroying
// rt, so g_pto2_current_runtime never points to freed memory.
// Clear g_pto2_current_runtime in this DSO and in the orchestration SO before destroying rt.
pto2_framework_bind_runtime(nullptr);
if (orch_bind_runtime_ != nullptr) {
orch_bind_runtime_(nullptr);
}
Expand Down
Loading