Refactor interpreter/AOT module instance layout (#1559)

Refactor the layout of interpreter and AOT module instance:
- Unify the interp/AOT module instance, use the same WASMModuleInstance/
  WASMMemoryInstance/WASMTableInstance data structures for both interpreter
  and AOT
- Make the offset of most fields the same in module instance for both interpreter
  and AOT, append memory instance structure, global data and table instances to
  the end of module instance for interpreter mode (like AOT mode)
- For extra fields in WASM module instance, use WASMModuleInstanceExtra to
  create a field `e` for interpreter
- Change the LLVM JIT module instance creating process, LLVM JIT uses the WASM
  module and module instance same as interpreter/Fast-JIT mode. So that Fast JIT
  and LLVM JIT can access the same data structures, and make it possible to
  implement the Multi-tier JIT (tier-up from Fast JIT to LLVM JIT) in the future
- Unify some APIs: merge some APIs for module instance and memory instance's
  related operations (only implement one copy)

Note that the AOT ABI is same, the AOT file format, AOT relocation types, how AOT
code accesses the AOT module instance and so on are kept unchanged.

Refer to:
#1384

Author: wenyongh

.gitignore

@@ -28,4 +28,7 @@ tests/wamr-test-suites/workspace
 
 samples/socket-api/wasm-src/inc/pthread.h
 
-**/__pycache__
+**/__pycache__
+
+# ignore benchmarks generated
+tests/benchmarks/coremark/coremark*

build-scripts/config_common.cmake

@@ -3,7 +3,6 @@
 
 string(TOUPPER ${WAMR_BUILD_TARGET} WAMR_BUILD_TARGET)
 
-
 # Add definitions for the build target
 if (WAMR_BUILD_TARGET STREQUAL "X86_64")
   add_definitions(-DBUILD_TARGET_X86_64)
@@ -85,33 +84,29 @@ endif ()
 endif ()
 
 if (WAMR_BUILD_JIT EQUAL 1)
-  if (WAMR_BUILD_AOT EQUAL 1)
-    add_definitions("-DWASM_ENABLE_JIT=1")
-    if (NOT WAMR_BUILD_LAZY_JIT EQUAL 0)
-      # Enable Lazy JIT by default
-      set (WAMR_BUILD_LAZY_JIT 1)
-      add_definitions("-DWASM_ENABLE_LAZY_JIT=1")
+  add_definitions("-DWASM_ENABLE_JIT=1")
+  if (NOT WAMR_BUILD_LAZY_JIT EQUAL 0)
+    # Enable Lazy JIT by default
+    set (WAMR_BUILD_LAZY_JIT 1)
+    add_definitions("-DWASM_ENABLE_LAZY_JIT=1")
+  endif ()
+  if (NOT DEFINED LLVM_DIR)
+    set (LLVM_SRC_ROOT "${WAMR_ROOT_DIR}/core/deps/llvm")
+    set (LLVM_BUILD_ROOT "${LLVM_SRC_ROOT}/build")
+    if (WAMR_BUILD_PLATFORM STREQUAL "windows")
+      set (LLVM_BUILD_ROOT "${LLVM_SRC_ROOT}/win32build")
     endif ()
-    if (NOT DEFINED LLVM_DIR)
-      set (LLVM_SRC_ROOT "${WAMR_ROOT_DIR}/core/deps/llvm")
-      set (LLVM_BUILD_ROOT "${LLVM_SRC_ROOT}/build")
-      if (WAMR_BUILD_PLATFORM STREQUAL "windows")
-        set (LLVM_BUILD_ROOT "${LLVM_SRC_ROOT}/win32build")
-      endif ()
-      if (NOT EXISTS "${LLVM_BUILD_ROOT}")
+    if (NOT EXISTS "${LLVM_BUILD_ROOT}")
         message (FATAL_ERROR "Cannot find LLVM dir: ${LLVM_BUILD_ROOT}")
-      endif ()
-      set (CMAKE_PREFIX_PATH "${LLVM_BUILD_ROOT};${CMAKE_PREFIX_PATH}")
     endif ()
-    find_package(LLVM REQUIRED CONFIG)
-    include_directories(${LLVM_INCLUDE_DIRS})
-    add_definitions(${LLVM_DEFINITIONS})
-    message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-    message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-  else ()
-    set (WAMR_BUILD_JIT 0)
-    message ("-- WAMR JIT disabled due to WAMR AOT is disabled")
- endif ()
+    set (CMAKE_PREFIX_PATH "${LLVM_BUILD_ROOT};${CMAKE_PREFIX_PATH}")
+    set (LLVM_DIR ${LLVM_BUILD_ROOT}/lib/cmake/llvm)
+  endif ()
+  find_package(LLVM REQUIRED CONFIG)
+  include_directories(${LLVM_INCLUDE_DIRS})
+  add_definitions(${LLVM_DEFINITIONS})
+  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 else ()
   unset (LLVM_AVAILABLE_LIBS)
 endif ()
@@ -139,9 +134,6 @@ message ("     Build as target ${WAMR_BUILD_TARGET}")
 message ("     CMAKE_BUILD_TYPE " ${CMAKE_BUILD_TYPE})
 if (WAMR_BUILD_INTERP EQUAL 1)
   message ("     WAMR Interpreter enabled")
-elseif (WAMR_BUILD_JIT EQUAL 1)
-  set (WAMR_BUILD_INTERP 1)
-  message ("     WAMR Interpreter enabled due to WAMR JIT is enabled")
 else ()
   message ("     WAMR Interpreter disabled")
 endif ()
@@ -150,16 +142,19 @@ if (WAMR_BUILD_AOT EQUAL 1)
 else ()
   message ("     WAMR AOT disabled")
 endif ()
+if (WAMR_BUILD_FAST_JIT EQUAL 1)
+  message ("     WAMR Fast JIT enabled")
+else ()
+  message ("     WAMR Fast JIT disabled")
+endif ()
 if (WAMR_BUILD_JIT EQUAL 1)
   if (WAMR_BUILD_LAZY_JIT EQUAL 1)
     message ("     WAMR LLVM Orc Lazy JIT enabled")
   else ()
     message ("     WAMR LLVM MC JIT enabled")
   endif ()
-elseif (WAMR_BUILD_FAST_JIT EQUAL 1)
-  message ("     WAMR Fast JIT enabled")
 else ()
-  message ("     WAMR JIT disabled")
+  message ("     WAMR LLVM JIT disabled")
 endif ()
 if (WAMR_BUILD_LIBC_BUILTIN EQUAL 1)
   message ("     Libc builtin enabled")

build-scripts/runtime_lib.cmake

@@ -1,7 +1,6 @@
 # Copyright (C) 2019 Intel Corporation. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-
 if (NOT DEFINED WAMR_ROOT_DIR)
     set (WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../)
 endif ()
@@ -50,25 +49,30 @@ if (NOT DEFINED WAMR_BUILD_TARGET)
 endif ()
 
 ################ optional according to settings ################
-if (WAMR_BUILD_INTERP EQUAL 1 OR WAMR_BUILD_JIT EQUAL 1
-    OR WAMR_BUILD_FAST_JIT EQUAL 1)
-    if (WAMR_BUILD_FAST_JIT EQUAL 1 OR WAMR_BUILD_JIT EQUAL 1)
-        set (WAMR_BUILD_FAST_INTERP 0)
-    endif ()
-    include (${IWASM_DIR}/interpreter/iwasm_interp.cmake)
+if (WAMR_BUILD_FAST_JIT EQUAL 1 OR WAMR_BUILD_JIT EQUAL 1)
+    # Enable classic interpreter if Fast JIT or LLVM JIT is enabled
+    set (WAMR_BUILD_INTERP 1)
+    set (WAMR_BUILD_FAST_INTERP 0)
 endif ()
 
-if (WAMR_BUILD_AOT EQUAL 1)
-    include (${IWASM_DIR}/aot/iwasm_aot.cmake)
-    if (WAMR_BUILD_JIT EQUAL 1)
-        include (${IWASM_DIR}/compilation/iwasm_compl.cmake)
-    endif ()
+if (WAMR_BUILD_INTERP EQUAL 1)
+    include (${IWASM_DIR}/interpreter/iwasm_interp.cmake)
 endif ()
 
-if (NOT WAMR_BUILD_JIT EQUAL 1 AND WAMR_BUILD_FAST_JIT EQUAL 1)
+if (WAMR_BUILD_FAST_JIT EQUAL 1)
     include (${IWASM_DIR}/fast-jit/iwasm_fast_jit.cmake)
 endif ()
 
+if (WAMR_BUILD_JIT EQUAL 1)
+    # Enable AOT if LLVM JIT is enabled
+    set (WAMR_BUILD_AOT 1)
+    include (${IWASM_DIR}/compilation/iwasm_compl.cmake)
+endif ()
+
+if (WAMR_BUILD_AOT EQUAL 1)
+    include (${IWASM_DIR}/aot/iwasm_aot.cmake)
+endif ()
+
 if (WAMR_BUILD_APP_FRAMEWORK EQUAL 1)
     include (${APP_FRAMEWORK_DIR}/app_framework.cmake)
     include (${SHARED_DIR}/coap/lib_coap.cmake)

core/iwasm/aot/aot_intrinsic.h

@@ -7,7 +7,7 @@
 #define _AOT_INTRINSIC_H
 
 #include "aot_runtime.h"
-#if WASM_ENABLE_WAMR_COMPILER != 0
+#if WASM_ENABLE_WAMR_COMPILER != 0 || WASM_ENABLE_JIT != 0
 #include "aot_llvm.h"
 #endif