Enable AOT validator in build configuration and update related source files

Author: lum1n0us

build-scripts/config_common.cmake

@@ -610,4 +610,8 @@ if (WAMR_BUILD_SHRUNK_MEMORY EQUAL 1)
 else ()
   add_definitions (-DWASM_ENABLE_SHRUNK_MEMORY=0)
   message ("     Shrunk memory disabled")
+endif()
+if (WAMR_BUILD_AOT_VALIDATOR EQUAL 1)
+  message ("     AOT validator enabled")
+  add_definitions (-DWASM_ENABLE_AOT_VALIDATOR=1)
 endif ()

core/config.h

@@ -702,4 +702,8 @@
 #define WASM_ENABLE_SHRUNK_MEMORY 1
 #endif
 
+#ifndef WASM_ENABLE_AOT_VALIDATOR
+#define WASM_ENABLE_AOT_VALIDATOR 0
+#endif
+
 #endif /* end of _CONFIG_H_ */

core/iwasm/aot/SConscript

@@ -14,7 +14,6 @@ src = Split('''
 aot_loader.c
 aot_runtime.c
 aot_intrinsic.c
-aot_validator.c
 ''')
 
 if rtconfig.ARCH == 'arm':

core/iwasm/aot/aot_loader.c

@@ -10,7 +10,9 @@
 #include "../common/wasm_native.h"
 #include "../common/wasm_loader_common.h"
 #include "../compilation/aot.h"
+#if WASM_ENABLE_AOT_VALIDATOR != 0
 #include "aot_validator.h"
+#endif
 
 #if WASM_ENABLE_DEBUG_AOT != 0
 #include "debug/elf_parser.h"
@@ -4401,11 +4403,12 @@ aot_load_from_aot_file(const uint8 *buf, uint32 size, const LoadArgs *args,
     os_thread_jit_write_protect_np(true); /* Make memory executable */
     os_icache_flush(module->code, module->code_size);
 
-    /*TODO: use a CLI option to control? */
+#if WASM_ENABLE_AOT_VALIDATOR != 0
     if (!aot_module_validate(module, error_buf, error_buf_size)) {
         aot_unload(module);
         return NULL;
     }
+#endif /* WASM_ENABLE_AOT_VALIDATOR != 0 */
 
     LOG_VERBOSE("Load module success.\n");
     return module;

core/iwasm/aot/aot_perf_map.c

@@ -7,7 +7,6 @@
 #include "bh_log.h"
 #include "bh_platform.h"
 
-#if WASM_ENABLE_LINUX_PERF != 0
 struct func_info {
     uint32 idx;
     void *ptr;
@@ -117,4 +116,3 @@ aot_create_perf_map(const AOTModule *module, char *error_buf,
 
     return ret;
 }
-#endif /* WASM_ENABLE_LINUX_PERF != 0 */

core/iwasm/aot/aot_validator.c

@@ -42,4 +42,4 @@ aot_module_validate(const AOTModule *module, char *error_buf,
     }
 
     return true;
-}
+}

core/iwasm/aot/iwasm_aot.cmake

@@ -7,7 +7,19 @@ add_definitions (-DWASM_ENABLE_AOT=1)
 
 include_directories (${IWASM_AOT_DIR})
 
-file (GLOB c_source_all ${IWASM_AOT_DIR}/*.c)
+list (APPEND c_source_all
+  ${IWASM_AOT_DIR}/aot_intrinsic.c
+  ${IWASM_AOT_DIR}/aot_loader.c
+  ${IWASM_AOT_DIR}/aot_runtime.c
+)
+
+if (WAMR_BUILD_LINUX_PERF EQUAL 1)
+  list (APPEND c_source_all ${IWASM_AOT_DIR}/aot_perf_map.c)
+endif ()
+
+if (WAMR_BUILD_AOT_VALIDATOR EQUAL 1)
+  list (APPEND c_source_all ${IWASM_AOT_DIR}/aot_validator.c)
+endif ()
 
 if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
   set (arch_source ${IWASM_AOT_DIR}/arch/aot_reloc_x86_64.c)

product-mini/platforms/nuttx/wamr.mk

@@ -126,8 +126,7 @@ CFLAGS += -DWASM_ENABLE_AOT=1
 CSRCS += aot_loader.c \
          $(AOT_RELOC) \
          aot_intrinsic.c \
-         aot_runtime.c \
-         aot_validator.c
+         aot_runtime.c
 ifeq ($(CONFIG_INTERPRETERS_WAMR_DEBUG_AOT),y)
 CFLAGS += -DWASM_ENABLE_DEBUG_AOT=1
 CSRCS += elf_parser.c \

wamr-compiler/CMakeLists.txt

@@ -58,6 +58,7 @@ if (WAMR_BUILD_LLVM_LEGACY_PM EQUAL 1)
 endif ()
 
 if (LINUX)
+  set(WAMR_BUILD_LINUX_PERF 1)
   add_definitions(-DWASM_ENABLE_LINUX_PERF=1)
 endif ()