Skip to content

Refactoring: Remove unnecessary code duplication in aot runtime #3767

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
wenyongh merged 1 commit into from
Sep 5, 2024
Merged

Refactoring: Remove unnecessary code duplication in aot runtime #3767

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
31 changes: 3 additions & 28 deletions core/iwasm/aot/aot_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3668,33 +3668,6 @@ aot_alloc_frame(WASMExecEnv *exec_env, uint32 func_index)
return true;
}

static inline void
aot_free_frame_internal(WASMExecEnv *exec_env)
{
AOTFrame *cur_frame = (AOTFrame *)exec_env->cur_frame;
AOTFrame *prev_frame = cur_frame->prev_frame;

#if WASM_ENABLE_PERF_PROFILING != 0
uint64 time_elapsed =
(uintptr_t)os_time_thread_cputime_us() - cur_frame->time_started;

cur_frame->func_perf_prof_info->total_exec_time += time_elapsed;
cur_frame->func_perf_prof_info->total_exec_cnt++;

/* parent function */
if (prev_frame)
prev_frame->func_perf_prof_info->children_exec_time += time_elapsed;
#endif

exec_env->cur_frame = (struct WASMInterpFrame *)prev_frame;
}

void
aot_free_frame(WASMExecEnv *exec_env)
{
aot_free_frame_internal(exec_env);
}

#else /* else of WASM_ENABLE_GC == 0 */

bool
Expand Down Expand Up @@ -3752,6 +3725,7 @@ aot_alloc_frame(WASMExecEnv *exec_env, uint32 func_index)
frame->func_index = func_index;
return true;
}
#endif /* end of WASM_ENABLE_GC == 0 */

static inline void
aot_free_frame_internal(WASMExecEnv *exec_env)
Expand All @@ -3771,7 +3745,9 @@ aot_free_frame_internal(WASMExecEnv *exec_env)
prev_frame->func_perf_prof_info->children_exec_time += time_elapsed;
#endif

#if WASM_ENABLE_GC != 0
wasm_exec_env_free_wasm_frame(exec_env, cur_frame);
#endif
exec_env->cur_frame = (struct WASMInterpFrame *)prev_frame;
}

Expand All @@ -3781,7 +3757,6 @@ aot_free_frame(WASMExecEnv *exec_env)
aot_free_frame_internal(exec_env);
}

#endif /* end of WASM_ENABLE_GC == 0 */

void
aot_frame_update_profile_info(WASMExecEnv *exec_env, bool alloc_frame)
Expand Down