add micro AMR_BUILD_LIME1 to enable minimal lime1 feature set (#4571)

Signed-off-by: zhenweijin <[email protected]>

Author: kylo5aby

.github/workflows/compilation_on_android_ubuntu.yml

@@ -166,6 +166,7 @@ jobs:
             "-DWAMR_BUILD_MULTI_MEMORY=1",
             "-DWAMR_BUILD_SHARED=1",
             "-DWAMR_BUILD_EXTENDED_CONST_EXPR=1",
+            "-DWAMR_BUILD_LIME1=1 -DWAMR_BUILD_BULK_MEMORY=0 -DWAMR_BUILD_REF_TYPES=0 -DWAMR_BUILD_SIMD=0",
           ]
         os: [ubuntu-22.04]
         platform: [android, linux]

build-scripts/config_common.cmake

@@ -221,6 +221,14 @@ if (NOT DEFINED WAMR_BUILD_BULK_MEMORY)
   set (WAMR_BUILD_BULK_MEMORY 1)
 endif ()
 
+if (NOT DEFINED WAMR_BUILD_BULK_MEMORY_OPT)
+  set (WAMR_BUILD_BULK_MEMORY_OPT 0)
+endif ()
+
+if (NOT DEFINED WAMR_BUILD_CALL_INDIRECT_OVERLONG)
+  set (WAMR_BUILD_CALL_INDIRECT_OVERLONG 0)
+endif ()
+
 if (NOT DEFINED WAMR_BUILD_EXCE_HANDLING)
   set (WAMR_BUILD_EXCE_HANDLING 0)
 endif ()
@@ -253,10 +261,27 @@ if (NOT DEFINED WAMR_BUILD_EXTENDED_CONST_EXPR)
   set (WAMR_BUILD_EXTENDED_CONST_EXPR 0)
 endif ()
 
+if (NOT DEFINED WAMR_BUILD_LIME1)
+  set (WAMR_BUILD_LIME1 0)
+endif ()
+
 ########################################
 # Compilation options to marco
 ########################################
 
+if (WAMR_BUILD_LIME1 EQUAL 1)
+  set (WAMR_BUILD_BULK_MEMORY_OPT 1)
+  set (WAMR_BUILD_CALL_INDIRECT_OVERLONG 1)
+  set (WAMR_BUILD_EXTENDED_CONST_EXPR 1)
+endif ()
+
+if (WAMR_BUILD_BULK_MEMORY EQUAL 1)
+  set (WAMR_BUILD_BULK_MEMORY_OPT 1)
+endif ()
+if (WAMR_BUILD_REF_TYPES EQUAL 1)
+  set (WAMR_BUILD_CALL_INDIRECT_OVERLONG 1)
+endif ()
+
 message ("-- Build Configurations:")
 message ("     Build as target ${WAMR_BUILD_TARGET}")
 message ("     Build for platform ${WAMR_BUILD_PLATFORM}")
@@ -366,6 +391,11 @@ if (WAMR_BUILD_BULK_MEMORY EQUAL 1)
 else ()
   add_definitions (-DWASM_ENABLE_BULK_MEMORY=0)
 endif ()
+if (WAMR_BUILD_BULK_MEMORY_OPT EQUAL 1)
+  add_definitions (-DWASM_ENABLE_BULK_MEMORY_OPT=1)
+else()
+  add_definitions (-DWASM_ENABLE_BULK_MEMORY_OPT=0)
+endif ()
 if (WAMR_BUILD_SHARED_MEMORY EQUAL 1)
   add_definitions (-DWASM_ENABLE_SHARED_MEMORY=1)
   message ("     Shared memory enabled")
@@ -457,6 +487,11 @@ endif ()
 if (WAMR_BUILD_REF_TYPES EQUAL 1)
   add_definitions (-DWASM_ENABLE_REF_TYPES=1)
 endif ()
+if (WAMR_BUILD_CALL_INDIRECT_OVERLONG EQUAL 1)
+  add_definitions (-DWASM_ENABLE_CALL_INDIRECT_OVERLONG=1)
+else ()
+  add_definitions(-DWASM_ENABLE_CALL_INDIRECT_OVERLONG=0)
+endif ()
 if (WAMR_BUILD_GC EQUAL 1)
   if (WAMR_TEST_GC EQUAL 1)
     message("      GC testing enabled")
@@ -727,6 +762,9 @@ else()
   message ("     Extended constant expression disabled")
   add_definitions(-DWASM_ENABLE_EXTENDED_CONST_EXPR=0)
 endif ()
+if (WAMR_BUILD_LIME1 EQUAL 1)
+  message ("     Lime1 enabled")
+endif ()
 ########################################
 # Show Phase4 Wasm proposals status.
 ########################################
@@ -742,6 +780,8 @@ message (
 "       \"Branch Hinting\"\n"
 "     Configurable. 0 is OFF. 1 is ON:\n"
 "       \"Bulk Memory Operation\" via WAMR_BUILD_BULK_MEMORY: ${WAMR_BUILD_BULK_MEMORY}\n"
+"       \"Bulk-memory-opt\" via WAMR_BUILD_BULK_MEMORY_OPT: ${WAMR_BUILD_BULK_MEMORY_OPT}\n"
+"       \"Call-indirect-overlong\" via WAMR_BUILD_CALL_INDIRECT_OVERLONG: ${WAMR_BUILD_CALL_INDIRECT_OVERLONG}\n"
 "       \"Extended Constant Expressions\" via WAMR_BUILD_EXTENDED_CONST_EXPR: ${WAMR_BUILD_EXTENDED_CONST_EXPR}\n"
 "       \"Fixed-width SIMD\" via WAMR_BUILD_SIMD: ${WAMR_BUILD_SIMD}\n"
 "       \"Garbage Collection\" via WAMR_BUILD_GC: ${WAMR_BUILD_GC}\n"

core/config.h

@@ -214,6 +214,10 @@
 #define WASM_ENABLE_BULK_MEMORY 0
 #endif
 
+#ifndef WASM_ENABLE_BULK_MEMORY_OPT
+#define WASM_ENABLE_BULK_MEMORY_OPT 0
+#endif
+
 /* Shared memory */
 #ifndef WASM_ENABLE_SHARED_MEMORY
 #define WASM_ENABLE_SHARED_MEMORY 0
@@ -579,6 +583,10 @@ unless used elsewhere */
 #define WASM_ENABLE_REF_TYPES 0
 #endif
 
+#ifndef WASM_ENABLE_CALL_INDIRECT_OVERLONG
+#define WASM_ENABLE_CALL_INDIRECT_OVERLONG 0
+#endif
+
 #ifndef WASM_ENABLE_BRANCH_HINTS
 #define WASM_ENABLE_BRANCH_HINTS 0
 #endif

core/iwasm/compilation/aot_compiler.c

@@ -1236,8 +1236,8 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
                 uint32 tbl_idx;
 
                 read_leb_uint32(frame_ip, frame_ip_end, type_idx);
-
-                if (comp_ctx->enable_gc || comp_ctx->enable_ref_types) {
+                if (comp_ctx->enable_gc
+                    || comp_ctx->enable_call_indirect_overlong) {
                     read_leb_uint32(frame_ip, frame_ip_end, tbl_idx);
                 }
                 else {
@@ -2462,6 +2462,14 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
                    UINT8_MAX */
                 opcode = (uint8)opcode1;
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
+                if (WASM_OP_MEMORY_COPY <= opcode
+                    && opcode <= WASM_OP_MEMORY_FILL
+                    && !comp_ctx->enable_bulk_memory_opt) {
+                    goto unsupport_bulk_memory_opt;
+                }
+#endif
+
 #if WASM_ENABLE_BULK_MEMORY != 0
                 if (WASM_OP_MEMORY_INIT <= opcode
                     && opcode <= WASM_OP_MEMORY_FILL
@@ -2530,6 +2538,8 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
                             return false;
                         break;
                     }
+#endif /* WASM_ENABLE_BULK_MEMORY */
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
                     case WASM_OP_MEMORY_COPY:
                     {
                         frame_ip += 2;
@@ -2544,7 +2554,7 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
                             return false;
                         break;
                     }
-#endif /* WASM_ENABLE_BULK_MEMORY */
+#endif /* WASM_ENABLE_BULK_MEMORY_OPT */
 #if WASM_ENABLE_REF_TYPES != 0 || WASM_ENABLE_GC != 0
                     case WASM_OP_TABLE_INIT:
                     {
@@ -3971,6 +3981,13 @@ aot_compile_func(AOTCompContext *comp_ctx, uint32 func_index)
     return false;
 #endif
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
+unsupport_bulk_memory_opt:
+    aot_set_last_error("bulk memory opt instruction was found, "
+                       "try enabling bulk-memory-opt or bulk-memory option");
+    return false;
+#endif
+
 #if WASM_ENABLE_BULK_MEMORY != 0
 unsupport_bulk_memory:
     aot_set_last_error("bulk memory instruction was found, "

core/iwasm/compilation/aot_emit_memory.c

@@ -1481,7 +1481,7 @@ aot_compile_op_memory_grow(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
     return false;
 }
 
-#if WASM_ENABLE_BULK_MEMORY != 0 || WASM_ENABLE_STRINGREF != 0
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0 || WASM_ENABLE_STRINGREF != 0
 LLVMValueRef
 check_bulk_memory_overflow(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
                            LLVMValueRef offset, LLVMValueRef bytes)
@@ -1769,7 +1769,9 @@ aot_compile_op_data_drop(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 fail:
     return false;
 }
+#endif /* end of WASM_ENABLE_BULK_MEMORY */
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
 bool
 aot_compile_op_memory_copy(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
 {
@@ -1931,7 +1933,7 @@ aot_compile_op_memory_fill(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx)
 fail:
     return false;
 }
-#endif /* end of WASM_ENABLE_BULK_MEMORY */
+#endif /* end of WASM_ENABLE_BULK_MEMORY_OPT */
 
 #if WASM_ENABLE_SHARED_MEMORY != 0
 bool

core/iwasm/compilation/aot_emit_memory.h

@@ -78,7 +78,9 @@ aot_compile_op_memory_init(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 bool
 aot_compile_op_data_drop(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
                          uint32 seg_index);
+#endif
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
 bool
 aot_compile_op_memory_copy(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx);
 

core/iwasm/compilation/aot_llvm.c

@@ -2731,6 +2731,9 @@ aot_create_comp_context(const AOTCompData *comp_data, aot_comp_option_t option)
     if (option->enable_bulk_memory)
         comp_ctx->enable_bulk_memory = true;
 
+    if (option->enable_bulk_memory_opt)
+        comp_ctx->enable_bulk_memory_opt = true;
+
     if (option->enable_thread_mgr)
         comp_ctx->enable_thread_mgr = true;
 
@@ -2740,6 +2743,9 @@ aot_create_comp_context(const AOTCompData *comp_data, aot_comp_option_t option)
     if (option->enable_ref_types)
         comp_ctx->enable_ref_types = true;
 
+    if (option->enable_call_indirect_overlong)
+        comp_ctx->enable_call_indirect_overlong = true;
+
     comp_ctx->aux_stack_frame_type = option->aux_stack_frame_type;
     comp_ctx->call_stack_features = option->call_stack_features;
 
@@ -3324,7 +3330,7 @@ aot_create_comp_context(const AOTCompData *comp_data, aot_comp_option_t option)
 
     /* Return error if ref-types and GC are disabled by command line but
        ref-types instructions are used */
-    if (!option->enable_ref_types && !option->enable_gc
+    if (!option->enable_call_indirect_overlong && !option->enable_gc
         && wasm_module->is_ref_types_used) {
         aot_set_last_error("ref-types instruction was found, "
                            "try removing --disable-ref-types option "
@@ -3338,9 +3344,13 @@ aot_create_comp_context(const AOTCompData *comp_data, aot_comp_option_t option)
     }
     if (!wasm_module->is_ref_types_used) {
         option->enable_ref_types = comp_ctx->enable_ref_types = false;
+        option->enable_call_indirect_overlong =
+            comp_ctx->enable_call_indirect_overlong = false;
     }
     if (!wasm_module->is_bulk_memory_used) {
         option->enable_bulk_memory = comp_ctx->enable_bulk_memory = false;
+        option->enable_bulk_memory_opt = comp_ctx->enable_bulk_memory_opt =
+            false;
     }
 #endif
 

core/iwasm/compilation/aot_llvm.h

@@ -416,6 +416,10 @@ typedef struct AOTCompContext {
     /* Bulk memory feature */
     bool enable_bulk_memory;
 
+    /*  Bulk memory opt feature. will be enabled alongside the
+     * enable_bulk_memory */
+    bool enable_bulk_memory_opt;
+
     /* Boundary Check */
     bool enable_bound_check;
 
@@ -452,6 +456,9 @@ typedef struct AOTCompContext {
     /* Reference Types */
     bool enable_ref_types;
 
+    /* Call Indirect Overlong. will be enabled alongside the enable_ref_types */
+    bool enable_call_indirect_overlong;
+
     /* Disable LLVM built-in intrinsics */
     bool disable_llvm_intrinsics;
 

core/iwasm/fast-jit/fe/jit_emit_memory.c

@@ -713,7 +713,9 @@ jit_compile_op_data_drop(JitCompContext *cc, uint32 seg_idx)
     return jit_emit_callnative(cc, wasm_data_drop, 0, args,
                                sizeof(args) / sizeof(args[0]));
 }
+#endif
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
 static int
 wasm_copy_memory(WASMModuleInstance *inst, uint32 src_mem_idx,
                  uint32 dst_mem_idx, uint32 len, uint32 src_offset,

core/iwasm/fast-jit/fe/jit_emit_memory.h

@@ -55,7 +55,9 @@ jit_compile_op_memory_init(JitCompContext *cc, uint32 mem_idx, uint32 seg_idx);
 
 bool
 jit_compile_op_data_drop(JitCompContext *cc, uint32 seg_idx);
+#endif
 
+#if WASM_ENABLE_BULK_MEMORY_OPT != 0
 bool
 jit_compile_op_memory_copy(JitCompContext *cc, uint32 src_mem_idx,
                            uint32 dst_mem_idx);