Merge branch 'dev/checkpoint_and_restore' into main

Signed-off-by: victoryang00 <[email protected]>
victoryang00 · May 26, 2024 · 2da0ccf · 2da0ccf
1 parent 6cd3e89
commit 2da0ccf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 65 deletions.
diff --git a/core/iwasm/compilation/aot_compiler.c b/core/iwasm/compilation/aot_compiler.c
@@ -358,20 +358,19 @@ aot_gen_commit_value(AOTCompFrame *frame, bool reset_dirty_bit,
     }
     if (local_idx < func_ctx->aot_func->func_type->param_count
                         + func_ctx->aot_func->local_count) {
-        fprintf(stderr, "LLVMBuildLoad2 %d < %d\n", local_idx,
-                func_ctx->aot_func->local_count);
         value =
             LLVMBuildLoad2(comp_ctx->builder, llvm_value_type,
                            func_ctx->locals[local_idx], "commit_stack_load");
-        fprintf(stderr, "DONE LLVMBuildLoad2 %d\n", local_idx);
     }
     else {
         if (!(*p)->value) {
             fprintf(stderr, "value is null, %d %d\n", local_idx, n);
             exit(-1);
         }
-        value = LLVMBuildLoad2(comp_ctx->builder, llvm_value_type, (*p)->value,
-                               "commit_stack_load");
+        value = (*p)->value;
+        // value = LLVMBuildLoad2(comp_ctx->builder, llvm_value_type,
+        // (*p)->value,
+        //                        "commit_stack_load");
     }
     if (value == NULL) {
         fprintf(stderr, "gen value load error\n");

diff --git a/core/iwasm/compilation/aot_emit_function.c b/core/iwasm/compilation/aot_emit_function.c
@@ -1420,21 +1420,6 @@ aot_compile_op_call(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     /* Get param cell number */
     param_cell_num = func_type->param_cell_num;
 
-    // #if (WASM_ENABLE_DUMP_CALL_STACK != 0) || (WASM_ENABLE_PERF_PROFILING !=
-    // 0)
-    //     if (comp_ctx->enable_aux_stack_frame) {
-    //         LLVMValueRef func_idx_const;
-
-    //         if (!(func_idx_const = I32_CONST(func_idx))) {
-    //             aot_set_last_error("llvm build const failed.");
-    //             return false;
-    //         }
-    //         if (!call_aot_alloc_frame_func(comp_ctx, func_ctx,
-    //         func_idx_const))
-    //             return false;
-    //     }
-    // #endif
-
     /* Allocate memory for parameters.
      * Parameters layout:
      *   - exec env

diff --git a/core/iwasm/libraries/ckpt-restore/get_func_name.py b/core/iwasm/libraries/ckpt-restore/get_func_name.py
diff --git a/core/iwasm/libraries/ckpt-restore/wamr_wasi_arguments.h b/core/iwasm/libraries/ckpt-restore/wamr_wasi_arguments.h
@@ -17,12 +17,12 @@
 #include "wamr_serializer.h"
 #include "wasm_runtime.h"
 #include <atomic>
-#include <filesystem>
 #include <map>
 #include <memory>
 #include <ranges>
 #include <string>
 #include <unordered_map>
+#include <tuple>
 #include <vector>
 
 struct WAMRAddrPool {

diff --git a/test-tools/addr2line/addr2line.py b/test-tools/addr2line/addr2line.py
@@ -346,7 +346,6 @@ def main():
             if splitted is None:
                 print(f"{line}")
                 continue
-            index = index[2:]
 
             _, offset, index = splitted
             if args.no_addr: