Enable AoT and wamr-sdk, and change arguments of call wasm API (#157)

* Implement memory profiler, optimize memory usage, modify code indent * Implement memory.grow and limit heap space base offset to 1G; modify iwasm build type to Release and 64 bit by default * Add a new extension library: connection * Fix bug of reading magic number and version in big endian platform * Re-org platform APIs: move most platform APIs from iwasm to shared-lib * Enhance wasm loader to fix some security issues * Fix issue about illegal load of EXC_RETURN into PC on stm32 board * Updates that let a restricted version of the interpreter run in SGX * Enable native/app address validation and conversion for wasm app * Remove wasm_application_exectue_* APIs from wasm_export.h which makes confused * Refine binary size and fix several minor issues Optimize interpreter LOAD/STORE opcodes to decrease the binary size Fix issues when using iwasm library: _bh_log undefined, bh_memory.h not found Remove unused _stdin/_stdout/_stderr global variables resolve in libc wrapper Add macros of global heap size, stack size, heap size for Zephyr main.c Clear compile warning of wasm_application.c * Add more strict security checks for libc wrapper API's * Use one libc wrapper copy for sgx and other platforms; remove bh_printf macro for other platform header files * Enhance security of libc strcpy/sprintf wrapper function * Fix issue of call native for x86_64/arm/mips, add module inst parameter for native wrapper functions * Remove get_module_inst() and fix issue of call native * Refine wgl lib: remove module_inst parameter from widget functions; move function index check to runtime instantiate * Refine interpreter call native process, refine memory boudary check * Fix issues of invokeNative function of arm/mips/general version * Add a switch to build simple sample without gui support * Add BUILD_TARGET setting in makefile to replace cpu compiler flags in source code * Re-org shared lib header files, remove unused info; fix compile issues of vxworks * Add build target general * Remove unused files * Update license header * test push * Restore file * Sync up with internal/feature * Sync up with internal/feature * Rename build_wamr_app to build_wasm_app * Fix small issues of README * Enhance malformed wasm file checking Fix issue of print hex int and implement utf8 string check Fix wasi file read/write right issue Fix minor issue of build wasm app doc * Sync up with internal/feature * Sync up with internal/feature: fix interpreter arm issue, fix read leb issue * Sync up with internal/feature * Fix bug of config.h and rename wasi config.h to ssp_config.h * Sync up with internal/feature * Import wamr aot * update document * update document * Update document, disable WASI in 32bit * update document * remove files * update document * Update document * update document * update document * update samples * Sync up with internal repo
2020-01-21 13:26:14 +08:00
parent 2a4528c749
commit 46b93b9d22
464 changed files with 25137 additions and 7911 deletions
--- a/samples/gui/README.md
+++ b/samples/gui/README.md
@ -1,27 +1,22 @@
-Introduction
+"gui" sample introduction
 ==============
-This sample demonstrates that a graphic user interface application in WebAssembly programming with WAMR graphic library(WGL) extension. WGL defined a WASM application API set for programming the UI applications. 
+This sample demonstrates that a graphic user interface application in WebAssembly programming with WAMR graphic library(WGL)  which is part of WAMR app-framework. 

-WGL implemention is based on [LittlevGL](https://github.com/littlevgl/), an open-source embedded 2d graphic library. Comparing the building the LittlevGL into WASM bytecode in the [littlevgl](../littlevgl) sample, WGL compiled LittlevGL source code into the WAMR runtime and defined a wrapper API for exporting to Webassembly application. These extension API's are listed in: `<wamr_root>/core/iwasm/lib/app-libs/extension/gui/wgl.h`. Currently only a small set of API's  are provided and that would be extended in future.
+Compared with the [littlevgl](../littlevgl) sample, WGL compiles LittlevGL source code into the WAMR runtime and defines a set of wrapper API's for exporting to Webassembly application.


-The runtime component supports building target for Linux and Zephyr/STM Nucleo board. The beauty of this sample is the WebAssembly application can have identical display and behavior when running from both runtime environments. That implies we can do majority of application validation from desktop environment as long as two runtime distributions support the same set of application interface.
-
-
-Below pictures show the WASM application is running on an STM board with an LCD touch panel. When users click the blue button, the WASM application increases the counter, and the latest counter value is displayed on the top banner of the touch panel. The number on top will plus one each second, and the number on the bottom will plus one when clicked.
+Below picture shows the WASM application is running on an STM board with an LCD touch panel.


 ![WAMR UI SAMPLE](../../doc/pics/vgl_demo2.png "WAMR UI DEMO")

-Configure 32 bit or 64 bit build
-==============
-On 64 bit operating system, there is an option to build 32 bit or 64 bit binaries. In file `./lvgl-native-ui-app/CMakeLists.txt` and/or `./wasm-runtime-wgl/linux-build/CMakeLists.txt` , modify the line:
-`set (BUILD_AS_64BIT_SUPPORT "YES")`
- where `YES` means 64 bit build while `NO` means 32 bit build.
+ When users click the blue button, the WASM application increases the counter, and the latest counter value is displayed on the top banner of the touch panel. The number on top will plus one each second, and the number on the bottom will plus one when clicked.
+
+# Test on Linux

 Install required SDK and libraries
-==============
- 32 bit SDL(simple directmedia layer) (Note: only necessary when `BUILD_AS_64BIT_SUPPORT` is set to `NO`)
+--------------
+- 32 bit SDL(simple directmedia layer) (Note: only necessary when `WAMR_BUILD_TARGET` is set to `X86_32` when building WAMR runtime)
 Use apt-get:
    `sudo apt-get install libsdl2-dev:i386`
 Or download source from www.libsdl.org:
@ -30,7 +25,7 @@ Or download source from www.libsdl.org:
 make
 sudo make install
 ```
- 64 bit SDL(simple directmedia layer) (Note: only necessary when `BUILD_AS_64BIT_SUPPORT` is set to `YES`)
+- 64 bit SDL(simple directmedia layer) (Note: only necessary when `WAMR_BUILD_TARGET` is set to `X86_64` when building WAMR runtime)
 Use apt-get:
    `sudo apt-get install libsdl2-dev`
 Or download source from www.libsdl.org:
@ -40,16 +35,9 @@ make
 sudo make install
 ```

- Install EMSDK
-```
-    https://emscripten.org/docs/tools_reference/emsdk.html
-```
-
 Build and Run
-==============
+--------------

-Linux
--------------------------------
 - Build</br>
 `./build.sh`</br>
    All binaries are in "out", which contains "host_tool", "lvgl_native_ui_app", "ui_app.wasm", "ui_app_lvgl_compatible.wasm" and "wasm_runtime_wgl".
@ -63,9 +51,12 @@ Linux
 `./host_tool -i ui_app -f ui_app.wasm`</br>
 `./host_tool -i ui_app -f ui_app_lvgl_compatible.wasm`</br>

-Zephyr
--------------------------------
-WASM VM and native extension method can be built into Zephyr, Then we can install wasm app into STM32.</br>
+
+
+Test on Zephyr
+================================
+
+We can use a STM32 NUCLEO_F767ZI  board with ILI9341 display and XPT2046 touch screen to run the test. Then use host_tool to remotely install wasm app into STM32.
 - Build WASM VM into Zephyr system</br>
 a. clone zephyr source code</br>
 Refer to Zephyr getting started.</br>
@ -77,16 +68,15 @@ https://docs.zephyrproject.org/latest/getting_started/index.html</br>
    `cd zephyr/samples/`</br>
    `cp -a <wamr_root>samples/gui/wasm-runtime-wgl wasm-runtime-wgl`</br>
    `cd wasm-runtime-wgl/zephyr_build`</br>
- c. create a link to wamr core</br>
-   ` ln -s <wamr_root>/core core`</br>
+ c. create a link to wamr root dir</br>
+   ` ln -s <wamr_root> wamr`</br>
 d. build source code</br>
    `mkdir build && cd build`</br>
    `source ../../../../zephyr-env.sh`</br>
    `cmake -GNinja -DBOARD=nucleo_f746zg ..`</br>
   ` ninja flash`</br>

- Test on STM32 NUCLEO_F767ZI with ILI9341 Display with XPT2046 touch</br>
-Hardware Connections
+- Hardware Connections

 ```
 +-------------------+-+------------------+
--- a/samples/gui/build.sh
+++ b/samples/gui/build.sh
@ -4,6 +4,8 @@ PROJECT_DIR=$PWD
 WAMR_DIR=${PWD}/../..
 OUT_DIR=${PWD}/out
 BUILD_DIR=${PWD}/build
+WAMR_RUNTIME_CFG=${PROJECT_DIR}/wamr_config_gui.cmake
+LV_CFG_PATH=${PROJECT_DIR}/lv_config

 if [ -z $KW_BUILD ] || [ -z $KW_OUT_FILE ];then
    echo "Local Build Env"
@ -23,12 +25,12 @@ rm -rf ${OUT_DIR}
 mkdir ${OUT_DIR}


-cd ${WAMR_DIR}/core/shared-lib/mem-alloc
+cd ${WAMR_DIR}/core/shared/mem-alloc
 if [ ! -d "tlsf" ]; then
    git clone https://github.com/mattconte/tlsf
 fi

-cd ${WAMR_DIR}/core/iwasm/lib/3rdparty
+cd ${WAMR_DIR}/core/deps
 if [ ! -d "lvgl" ]; then
        git clone https://github.com/littlevgl/lvgl.git --branch v6.0.1
 fi
@ -36,11 +38,22 @@ if [ ! -d "lv_drivers" ]; then
        git clone https://github.com/littlevgl/lv_drivers.git
 fi

+echo -e "\n\n"
+echo "##################### 0. build wamr-sdk gui start#####################"
+cd ${WAMR_DIR}/wamr-sdk
+./build_sdk.sh -n gui -x ${WAMR_RUNTIME_CFG} -e ${LV_CFG_PATH}
+[ $? -eq 0 ] || exit $?
+
+echo "#####################build wamr-sdk success"
+
+
+echo -e  "\n\n"
 echo "##################### 1. build native-ui-app start#####################"
 cd $BUILD_DIR
 mkdir -p lvgl-native-ui-app
 cd lvgl-native-ui-app
 $cmakewrap ${PROJECT_DIR}/lvgl-native-ui-app
+[ $? -eq 0 ] || exit $?
 $makewrap
 if [ $? != 0 ];then
    echo "BUILD_FAIL native-ui-app $?\n"
@ -49,17 +62,22 @@ fi
 echo $PWD
 cp  lvgl_native_ui_app ${OUT_DIR}
 echo "#####################build native-ui-app success"
+echo -e "\n\n"


-echo "##################### 2. build littlevgl wasm runtime start#####################"
+echo "##################### 2. build wasm runtime start#####################"
 cd $BUILD_DIR
 mkdir -p wasm-runtime-wgl
 cd wasm-runtime-wgl
-$cmakewrap ${PROJECT_DIR}/wasm-runtime-wgl/linux-build
+$cmakewrap ${PROJECT_DIR}/wasm-runtime-wgl/linux-build -DWAMR_BUILD_SDK_PROFILE=gui
+[ $? -eq 0 ] || exit $?
 $makewrap
+[ $? -eq 0 ] || exit $?
 cp wasm_runtime_wgl ${OUT_DIR}/

 echo "##################### build littlevgl wasm runtime end#####################"
+echo -e "\n\n"
+

 echo "#####################build host-tool"
 cd $BUILD_DIR
@ -73,13 +91,23 @@ if [ $? != 0 ];then
 fi
 cp host_tool ${OUT_DIR}
 echo "#####################build host-tool success"
-
+echo -e "\n\n"

 echo "##################### 3. build wasm ui app start#####################"
 cd ${PROJECT_DIR}/wasm-apps/wgl
+
+rm -rf build
+mkdir build && cd build
+$cmakewrap .. -DCMAKE_TOOLCHAIN_FILE=${WAMR_DIR}/wamr-sdk/out/gui/app-sdk/wamr_toolchain.cmake
 $makewrap
-cp ui_app.wasm ${OUT_DIR}/
+[ $? -eq 0 ] || exit $?
+mv ui_app.wasm ${OUT_DIR}/
+
+# $makewrap
+# mv ui_app.wasm ${OUT_DIR}/
+
 cd ${PROJECT_DIR}/wasm-apps/lvgl-compatible
 $makewrap
-cp ui_app_lvgl_compatible.wasm ${OUT_DIR}/
+[ $? -eq 0 ] || exit $?
+mv ui_app_lvgl_compatible.wasm ${OUT_DIR}/
 echo "#####################  build wasm ui app end#####################"
--- a/samples/gui/lvgl-native-ui-app/lv_conf.h
+++ b/samples/gui/lvgl-native-ui-app/lv_conf.h
@ -66,7 +66,10 @@ typedef int16_t lv_coord_t;
 * The graphical objects and other related data are stored here. */

 /* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */
+#ifndef LV_MEM_CUSTOM
 #define LV_MEM_CUSTOM      0
+#endif
+
 #if LV_MEM_CUSTOM == 0
 /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
 #  define LV_MEM_SIZE    (128U * 1024U)
@ -81,9 +84,9 @@ typedef int16_t lv_coord_t;
 /* Automatically defrag. on free. Defrag. means joining the adjacent free cells. */
 #  define LV_MEM_AUTO_DEFRAG  1
 #else       /*LV_MEM_CUSTOM*/
-#  define LV_MEM_CUSTOM_INCLUDE <stdlib.h>   /*Header for the dynamic memory function*/
-#  define LV_MEM_CUSTOM_ALLOC   malloc       /*Wrapper to malloc*/
-#  define LV_MEM_CUSTOM_FREE    free         /*Wrapper to free*/
+#  define LV_MEM_CUSTOM_INCLUDE "bh_memory.h"   /*Header for the dynamic memory function*/
+#  define LV_MEM_CUSTOM_ALLOC   bh_malloc       /*Wrapper to malloc*/
+#  define LV_MEM_CUSTOM_FREE    bh_free         /*Wrapper to free*/
 #endif     /*LV_MEM_CUSTOM*/

 /* Garbage Collector settings
--- a/samples/gui/lvgl-native-ui-app/lv_drv_conf.h
+++ b/samples/gui/lvgl-native-ui-app/lv_drv_conf.h
--- a/samples/gui/lvgl-native-ui-app/system_header.h
+++ b/samples/gui/lvgl-native-ui-app/system_header.h
--- a/samples/gui/lvgl-native-ui-app/CMakeLists.txt
+++ b/samples/gui/lvgl-native-ui-app/CMakeLists.txt
@ -22,16 +22,18 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
   endif ()
 endif ()

-set(THIRDPARTY_DIR ../../../core/iwasm/lib/3rdparty)
-set(LVGL_SOURCE_DIR ${THIRDPARTY_DIR}/lvgl)
-set(LVGL_DRIVER_DIR ${THIRDPARTY_DIR}/lv_drivers)
+set(WAMR_DEPS_DIR ../../../core/deps)
+set(LVGL_SOURCE_DIR ${WAMR_DEPS_DIR}/lvgl)
+set(LVGL_DRIVER_DIR ${WAMR_DEPS_DIR}/lv_drivers)

 #################################

+add_definitions(-DLV_CONF_INCLUDE_SIMPLE)
+ 
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${THIRDPARTY_DIR})
+INCLUDE_DIRECTORIES(${WAMR_DEPS_DIR})
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/../lv_config)

-add_definitions (-DLV_CONF_INCLUDE_SIMPLE)

 file(GLOB_RECURSE INCLUDES "${LVGL_DRIVER_DIR}/*.h" "${LVGL_SOURCE_DIR}/*.h"  "./*.h" )
 file(GLOB_RECURSE SOURCES  "${LVGL_DRIVER_DIR}/*.c" "${LVGL_SOURCE_DIR}/*.c" )
--- a/samples/gui/wamr_config_gui.cmake
+++ b/samples/gui/wamr_config_gui.cmake
@ -0,0 +1,9 @@
+set (WAMR_BUILD_PLATFORM "linux")
+set (WAMR_BUILD_TARGET "X86_64")
+set (WAMR_BUILD_INTERP 1)
+set (WAMR_BUILD_AOT 1)
+set (WAMR_BUILD_JIT 0)
+set (WAMR_BUILD_LIBC_BUILTIN 1)
+set (WAMR_BUILD_LIBC_WASI 0)
+set (WAMR_BUILD_APP_FRAMEWORK 1)
+set (WAMR_BUILD_APP_LIST WAMR_APP_BUILD_ALL)
--- a/samples/gui/wasm-apps/lvgl-compatible/Makefile
+++ b/samples/gui/wasm-apps/lvgl-compatible/Makefile
@ -1,30 +1,27 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

-CC = clang-8
+CC = /opt/wasi-sdk/bin/clang
 APP_DIR = ${shell pwd}
-IWASM_DIR=../../../../core/iwasm
+IWASM_DIR = $(APP_DIR)/../../../../core/iwasm
+SDK_DIR = $(APP_DIR)/../../../../wamr-sdk/out/gui/app-sdk
+APP_FRAMEWORK_DIR = $(APP_DIR)/../../../../wamr-sdk/out/gui/app-sdk/wamr-app-framework
+DEPS_DIR = $(APP_DIR)/../../../../core/deps
+
 CFLAGS += -O3 \
-	  -Wno-int-conversion \
-	  -DLV_CONF_INCLUDE_SIMPLE \
-	  -DENABLE_WGL=1 \
-	  -I$(APP_DIR)/src/ \
-	  -I$(IWASM_DIR)/lib/app-libs/base/ \
-	  -I$(IWASM_DIR)/lib/native-interface/ \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/sensor \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/gui \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/connection
+    -Wno-int-conversion \
+    -I$(APP_DIR)/src \
+    -I$(APP_FRAMEWORK_DIR)/include \
+    -I${DEPS_DIR}

 SRCS += $(APP_DIR)/src/main.c

-# For app size consideration, not all but necessary app libs are included
-SRCS += $(IWASM_DIR)/lib/app-libs/base/timer.c
-SRCS += $(IWASM_DIR)/lib/app-libs/extension/gui/src/*.c
-
-all: 
+all:
 	@$(CC) $(CFLAGS) $(SRCS) \
    --target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
-    -Wl,--allow-undefined \
+    --sysroot=$(SDK_DIR)/libc-builtin-sysroot       \
+    -L$(APP_FRAMEWORK_DIR)/lib -lapp_framework      \
+    -Wl,--allow-undefined-file=$(SDK_DIR)/libc-builtin-sysroot/share/defined-symbols.txt	\
    -Wl,--no-threads,--strip-all,--no-entry -nostdlib \
    -Wl,--export=on_init -Wl,--export=on_timer_callback \
    -Wl,--export=on_widget_event \
--- a/samples/gui/wasm-apps/lvgl-compatible/src/main.c
+++ b/samples/gui/wasm-apps/lvgl-compatible/src/main.c
@ -4,9 +4,9 @@
 */

 #include <stdlib.h>
-#include <unistd.h>
 #include "wasm_app.h"
-#include "lvgl.h"
+#include "wa-inc/lvgl.h"
+#include "wa-inc/timer_wasm_app.h"

 extern char g_widget_text[];

--- a/samples/gui/wasm-apps/wgl/CMakeLists.txt
+++ b/samples/gui/wasm-apps/wgl/CMakeLists.txt
@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(wgl)
+
+set (WAMR_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../../)
+
+include_directories(
+    ${WAMR_ROOT_DIR}/wamr-sdk/out/gui/app-sdk/wamr-app-framework/include
+    ${WAMR_ROOT_DIR}/core/deps
+)
+
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},-L${WAMR_ROOT_DIR}/wamr-sdk/out/gui/app-sdk/wamr-app-framework/lib")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},--export=on_init,--export=on_timer_callback,--export=on_widget_event")
+set (CMAKE_C_FLAGS          "${CMAKE_C_FLAGS} -O3 -Wno-unused-command-line-argument")
+
+add_executable(ui_app.wasm
+    ${CMAKE_CURRENT_LIST_DIR}/src/main.c
+)
+
+target_link_libraries(ui_app.wasm  app_framework)
--- a/samples/gui/wasm-apps/wgl/Makefile
+++ b/samples/gui/wasm-apps/wgl/Makefile
@ -1,27 +1,29 @@
 # Copyright (C) 2019 Intel Corporation.  All rights reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

-CC = clang-8
+CC = /opt/wasi-sdk/bin/clang
 APP_DIR = ${shell pwd}
-IWASM_DIR=../../../../core/iwasm
+IWASM_DIR = ../../../../core/iwasm
+APP_FRAMEWORK_DIR = ../../../../core/app-framework
+DEPS_DIR = ../../../../core/deps
+
 CFLAGS += -O3 \
 	  -Wno-int-conversion \
-	  -DLV_CONF_INCLUDE_SIMPLE \
-	  -DENABLE_WGL=1 \
-	  -I$(APP_DIR)/src/ \
-	  -I$(IWASM_DIR)/lib/app-libs/base/ \
-	  -I$(IWASM_DIR)/lib/native-interface/ \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/sensor \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/gui \
-	  -I$(IWASM_DIR)/lib/app-libs/extension/connection
+	  -I$(APP_DIR)/src \
+	  -I$(APP_FRAMEWORK_DIR)/base/app \
+	  -I$(APP_FRAMEWORK_DIR)/app-native-shared \
+	  -I$(APP_FRAMEWORK_DIR)/sensor/app \
+	  -I$(APP_FRAMEWORK_DIR)/wgl/app \
+	  -I$(APP_FRAMEWORK_DIR)/connection/app \
+	  -I${DEPS_DIR}

 SRCS += $(APP_DIR)/src/main.c

 # For app size consideration, not all but necessary app libs are included
-SRCS += $(IWASM_DIR)/lib/app-libs/base/timer.c
-SRCS += $(IWASM_DIR)/lib/app-libs/extension/gui/src/*.c
+SRCS += $(APP_FRAMEWORK_DIR)/base/app/timer.c
+SRCS += $(APP_FRAMEWORK_DIR)/wgl/app/src/*.c

-all: 
+all:
 	@$(CC) $(CFLAGS) $(SRCS) \
    --target=wasm32 -O3 -z stack-size=2048 -Wl,--initial-memory=65536 \
    -Wl,--allow-undefined \
--- a/samples/gui/wasm-apps/wgl/src/main.c
+++ b/samples/gui/wasm-apps/wgl/src/main.c
@ -4,8 +4,9 @@
 */

 #include <stdlib.h>
-#include <unistd.h>
 #include "wasm_app.h"
+#include "wa-inc/wgl.h"
+#include "wa-inc/timer_wasm_app.h"

 static void btn_event_cb(wgl_obj_t btn, wgl_event_t event);

--- a/samples/gui/wasm-runtime-wgl/linux-build/CMakeLists.txt
+++ b/samples/gui/wasm-runtime-wgl/linux-build/CMakeLists.txt
@ -1,137 +1,43 @@
+# Copyright (C) 2019 Intel Corporation.  All rights reserved.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
 cmake_minimum_required (VERSION 2.8)

 project (wasm_runtime_wgl)

-set(REPO_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../..)
-set(WASM_DIR  ${REPO_ROOT_DIR}/core/iwasm)
-set(APP_MGR_DIR ${REPO_ROOT_DIR}/core/app-mgr)
-set(SHARED_DIR ${REPO_ROOT_DIR}/core/shared-lib)
-
-set (LV_DRIVERS_DIR ${WASM_DIR}/lib/3rdparty/lv_drivers)
-set (LVGL_DIR ${WASM_DIR}/lib/3rdparty/lvgl)
-
-file(GLOB_RECURSE LV_DRIVERS_SOURCES "${LV_DRIVERS_DIR}/*.c" )
-
-set (TARGET_PLATFORM "linux")
+set (WAMR_BUILD_PLATFORM "linux")

 # Reset default linker flags
 set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 set (CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")

-if (NOT ("$ENV{VALGRIND}" STREQUAL "YES"))
-  add_definitions(-DNVALGRIND)
-endif ()
+################  wamr runtime settings  ################

-# Set BUILD_TARGET, currently values supported:
-# "X86_64", "AMD_64", "X86_32", "ARM[sub]", "THUMB[sub]", "MIPS", "XTENSA"
-if (NOT DEFINED BUILD_TARGET)
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # Build as X86_64 by default in 64-bit platform
-    set (BUILD_TARGET "X86_64")
-  else ()
-    # Build as X86_32 by default in 32-bit platform
-    set (BUILD_TARGET "X86_32")
-  endif ()
-endif ()
-
-string(TOUPPER ${BUILD_TARGET} BUILD_TARGET)
-
-# Add definitions for the build target
-if (BUILD_TARGET STREQUAL "X86_64")
-  add_definitions(-DBUILD_TARGET_X86_64)
-elseif (BUILD_TARGET STREQUAL "AMD_64")
-  add_definitions(-DBUILD_TARGET_AMD_64)
-elseif (BUILD_TARGET STREQUAL "X86_32")
-  add_definitions(-DBUILD_TARGET_X86_32)
-elseif (BUILD_TARGET MATCHES "ARM.*")
-  add_definitions(-DBUILD_TARGET_ARM)
-  add_definitions(-DBUILD_TARGET="${BUILD_TARGET}")
-elseif (BUILD_TARGET MATCHES "THUMB.*")
-  add_definitions(-DBUILD_TARGET_THUMB)
-  add_definitions(-DBUILD_TARGET="${BUILD_TARGET}")
-elseif (BUILD_TARGET STREQUAL "MIPS")
-  add_definitions(-DBUILD_TARGET_MIPS)
-elseif (BUILD_TARGET STREQUAL "XTENSA")
-  add_definitions(-DBUILD_TARGET_XTENSA)
-else ()
-  message (FATAL_ERROR "-- Build target isn't set")
-endif ()
-
-message ("-- Build as target ${BUILD_TARGET}")
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-  if (BUILD_TARGET STREQUAL "X86_64" OR BUILD_TARGET STREQUAL "AMD_64")
-    # Add -fPIC flag if build as 64-bit
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-    set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -fPIC")
-  else ()
-    add_definitions (-m32)
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
-    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
-  endif ()
-endif ()
-
-if (NOT CMAKE_BUILD_TYPE)
-SET(CMAKE_BUILD_TYPE Debug)
-endif (NOT CMAKE_BUILD_TYPE)
-message ("-- CMAKE_BUILD_TYPE = " ${CMAKE_BUILD_TYPE})
-
-if (NOT PLATFORM)
-SET(PLATFORM linux)
-endif (NOT PLATFORM)
-message ("-- PLATFORM = " ${PLATFORM})
-
-set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections -Wall -Wno-unused-parameter -Wno-pedantic")
+set (WAMR_ROOT_DIR  ${CMAKE_CURRENT_LIST_DIR}/../../../..)
+set (DEPS_DIR       ${WAMR_ROOT_DIR}/core/deps)


-enable_language (ASM)
+add_definitions(-DLV_CONF_INCLUDE_SIMPLE)

-include (${WASM_DIR}/runtime/utils/utils.cmake)
-include (${WASM_DIR}/runtime/vmcore-wasm/vmcore.cmake)
-include (${WASM_DIR}/lib/native/base/wasm_lib_base.cmake)
-include (${WASM_DIR}/lib/native/libc/wasm_libc.cmake)
-include (${WASM_DIR}/lib/native/extension/sensor/wasm_lib_sensor.cmake)
-include (${WASM_DIR}/lib/native/extension/gui/wasm_lib_gui.cmake)
-include (${WASM_DIR}/lib/native/extension/connection/wasm_lib_conn.cmake)
-include (${WASM_DIR}/lib/native/extension/connection/${TARGET_PLATFORM}/connection_mgr.cmake)
-include (${WASM_DIR}/lib/native-interface/native_interface.cmake)
-include (${APP_MGR_DIR}/app-manager/app_mgr.cmake)
-include (${APP_MGR_DIR}/app-mgr-shared/app_mgr_shared.cmake)
-include (${SHARED_DIR}/platform/${TARGET_PLATFORM}/shared_platform.cmake)
-include (${SHARED_DIR}/utils/shared_utils.cmake)
-include (${SHARED_DIR}/mem-alloc/mem_alloc.cmake)
-include (${SHARED_DIR}/coap/lib_coap.cmake)
+## use library and headers in the SDK
+link_directories(${WAMR_ROOT_DIR}/wamr-sdk/out/gui/runtime-sdk/lib)
+include_directories(
+    ${WAMR_ROOT_DIR}/wamr-sdk/out/gui/runtime-sdk/include
+    ${WAMR_ROOT_DIR}/wamr-sdk/out/gui/runtime-sdk/include/bi-inc/deps
+)

-set (PROJECT_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/../src/platform/${TARGET_PLATFORM})
+################  application related  ################

-include_directories(${SHARED_DIR}/include)
-include_directories(${WASM_DIR}/runtime/platform/include)
-include_directories(${PROJECT_SRC_DIR})
+set (LV_DRIVERS_DIR ${WAMR_ROOT_DIR}/core/deps/lv_drivers)
+file (GLOB_RECURSE LV_DRIVERS_SOURCES "${LV_DRIVERS_DIR}/*.c")

-add_definitions (-DWASM_ENABLE_BASE_LIB)
-add_definitions (-Dattr_container_malloc=bh_malloc)
-add_definitions (-Dattr_container_free=bh_free)
-add_definitions (-DLV_CONF_INCLUDE_SIMPLE)
-add_definitions (-DWASM_ENABLE_GUI=1)
-
-add_library (vmlib
-             ${WASM_PLATFORM_LIB_SOURCE}
-             ${WASM_UTILS_LIB_SOURCE}
-             ${VMCORE_LIB_SOURCE}
-             ${WASM_LIBC_SOURCE}
-             ${APP_MGR_SOURCE}
-             ${WASM_LIB_BASE_SOURCE}
-             ${WASM_LIB_EXT_SOURCE}
-             ${WASM_LIB_SENSOR_SOURCE}
-             ${WASM_LIB_GUI_SOURCE}
-             ${WASM_LIB_CONN_SOURCE}
-             ${WASM_LIB_CONN_MGR_SOURCE}
-             ${PLATFORM_SHARED_SOURCE}
-             ${UTILS_SHARED_SOURCE}
-             ${MEM_ALLOC_SHARED_SOURCE}
-             ${NATIVE_INTERFACE_SOURCE}
-             )
+set (PROJECT_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/../src/platform/${WAMR_BUILD_PLATFORM})
+include_directories(
+    ${PROJECT_SRC_DIR}
+    ${DEPS_DIR}
+    ${DEPS_DIR}/lvgl
+    ${DEPS_DIR}/lvgl/src
+)

 set (SOURCES
     ${PROJECT_SRC_DIR}/main.c
--- a/samples/gui/wasm-runtime-wgl/src/platform/linux/iwasm_main.c
+++ b/samples/gui/wasm-runtime-wgl/src/platform/linux/iwasm_main.c
@ -29,7 +29,7 @@
 #include "bh_thread.h"
 #include "bh_memory.h"
 #include "runtime_sensor.h"
-#include "attr_container.h"
+#include "bi-inc/attr_container.h"
 #include "module_wasm_app.h"
 #include "wasm_export.h"
 #include "wgl.h"
--- a/samples/gui/wasm-runtime-wgl/src/platform/linux/main.c
+++ b/samples/gui/wasm-runtime-wgl/src/platform/linux/main.c
@ -2,8 +2,21 @@
 * Copyright (C) 2019 Intel Corporation.  All rights reserved.
 * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 */
+#include <stdlib.h>
+#include <sys/time.h>
+
+
 extern int iwasm_main(int argc, char *argv[]);
 int main(int argc, char *argv[])
 {
    return iwasm_main(argc,argv);
 }
+
+int time_get_ms()
+{
+    static struct timeval tv;
+    gettimeofday(&tv, NULL);
+    long long time_in_mill = (tv.tv_sec) * 1000 + (tv.tv_usec) / 1000;
+
+    return (int) time_in_mill;
+}
--- a/samples/gui/wasm-runtime-wgl/src/platform/zephyr/XPT2046.h
+++ b/samples/gui/wasm-runtime-wgl/src/platform/zephyr/XPT2046.h
@ -7,9 +7,6 @@
 #define XPT2046_H

 #define USE_XPT2046 1
-#ifndef LV_CONF_INCLUDE_SIMPLE
-#define LV_CONF_INCLUDE_SIMPLE
-#endif

 #  define XPT2046_HOR_RES     320
 #  define XPT2046_VER_RES     240
@ -30,11 +27,7 @@ extern "C" {
 /*********************
 *      INCLUDES
 *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-//#include "lv_drv_conf.h"
-#else
-//#include "../../lv_drv_conf.h"
-#endif
+

 #if USE_XPT2046
 #include <autoconf.h>
--- a/samples/gui/wasm-runtime-wgl/src/platform/zephyr/iwasm_main.c
+++ b/samples/gui/wasm-runtime-wgl/src/platform/zephyr/iwasm_main.c
@ -12,7 +12,7 @@
 #include "bh_thread.h"
 #include "bh_memory.h"
 #include "runtime_sensor.h"
-#include "attr_container.h"
+#include "bi-inc/attr_container.h"
 #include "module_wasm_app.h"
 #include "wasm_export.h"
 #include "display.h"
--- a/samples/gui/wasm-runtime-wgl/src/platform/zephyr/main.c
+++ b/samples/gui/wasm-runtime-wgl/src/platform/zephyr/main.c
@ -6,12 +6,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "bh_platform.h"
-#include "wasm_assert.h"
-#include "wasm_log.h"
-#include "wasm_platform_log.h"
-#include "wasm_thread.h"
+#include "bh_assert.h"
+#include "bh_log.h"
+#include "bh_platform_log.h"
 #include "wasm_export.h"
-#include "wasm_memory.h"
 #include "bh_memory.h"

 extern int iwasm_main();
@ -24,3 +22,7 @@ void main(void)
    }
 }

+int time_get_ms()
+{
+    return k_uptime_get_32();
+}
--- a/samples/gui/wasm-runtime-wgl/zephyr-build/CMakeLists.txt
+++ b/samples/gui/wasm-runtime-wgl/zephyr-build/CMakeLists.txt
@ -6,68 +6,62 @@ cmake_minimum_required(VERSION 3.8.2)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(NONE)

-enable_language (ASM)
+set (WAMR_BUILD_PLATFORM "zephyr")

-zephyr_compile_definitions (-DNVALGRIND
-    -D__JLF__
-    -D__ZEPHYR__
-    -DWASM_ENABLE_BASE_LIB
-    -Dattr_container_malloc=bh_malloc
-    -Dattr_container_free=bh_free
-    -DWASM_ENABLE_GUI=1)
+enable_language (ASM)

 # Build as THUMB by default
 # change to "ARM[sub]", "THUMB[sub]", "X86_32", "MIPS" or "XTENSA"
 # if we want to support arm_32, x86, mips or xtensa
-if (NOT DEFINED BUILD_TARGET)
-  set (BUILD_TARGET "THUMB")
+if (NOT DEFINED WAMR_BUILD_TARGET)
+  set (WAMR_BUILD_TARGET "THUMB")
 endif ()

-string(TOUPPER ${BUILD_TARGET} BUILD_TARGET)

-if (BUILD_TARGET STREQUAL "X86_32")
-  add_definitions(-DBUILD_TARGET_X86_32)
-elseif (BUILD_TARGET MATCHES "ARM.*")
-  add_definitions(-DBUILD_TARGET_ARM)
-  add_definitions(-DBUILD_TARGET="${BUILD_TARGET}")
-elseif (BUILD_TARGET MATCHES "THUMB.*")
-  add_definitions(-DBUILD_TARGET_THUMB)
-  add_definitions(-DBUILD_TARGET="${BUILD_TARGET}")
-elseif (BUILD_TARGET STREQUAL "MIPS")
-  add_definitions(-DBUILD_TARGET_MIPS)
-elseif (BUILD_TARGET STREQUAL "XTENSA")
-  add_definitions(-DBUILD_TARGET_XTENSA)
-else ()
-  message (FATAL_ERROR "-- Build target isn't set")
+if (NOT DEFINED WAMR_BUILD_INTERP)
+  # Enable Interpreter by default
+  set (WAMR_BUILD_INTERP 1)
 endif ()

-message ("-- Build as target ${BUILD_TARGET}")
+if (NOT DEFINED WAMR_BUILD_AOT)
+  # Disable AOT by default.
+  set (WAMR_BUILD_AOT 0)
+endif ()

-set (WASM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core/iwasm)
-set (APP_MGR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core/app-mgr)
-set (SHARED_DIR ${WASM_DIR}/../shared-lib)
+if (NOT DEFINED WAMR_BUILD_JIT)
+  # Disable JIT by default.
+  set (WAMR_BUILD_JIT 0)
+endif ()

-set (TARGET_PLATFORM "zephyr")
+if (NOT DEFINED WAMR_BUILD_LIBC_BUILTIN)
+  # Enable libc builtin support by default
+  set (WAMR_BUILD_LIBC_BUILTIN 1)
+endif ()

-include (${WASM_DIR}/runtime/utils/utils.cmake)
-include (${WASM_DIR}/runtime/vmcore-wasm/vmcore.cmake)
-include (${WASM_DIR}/lib/native/base/wasm_lib_base.cmake)
-include (${WASM_DIR}/lib/native/libc/wasm_libc.cmake)
-include (${WASM_DIR}/lib/native/extension/sensor/wasm_lib_sensor.cmake)
-include (${WASM_DIR}/lib/native/extension/gui/wasm_lib_gui.cmake)
-include (${WASM_DIR}/lib/native/extension/connection/wasm_lib_conn.cmake)
-include (${WASM_DIR}/lib/native/extension/connection/${TARGET_PLATFORM}/connection_mgr.cmake)
-include (${WASM_DIR}/lib/native-interface/native_interface.cmake)
-include (${APP_MGR_DIR}/app-manager/app_mgr.cmake)
-include (${APP_MGR_DIR}/app-mgr-shared/app_mgr_shared.cmake)
-include (${SHARED_DIR}/platform/${TARGET_PLATFORM}/shared_platform.cmake)
-include (${SHARED_DIR}/utils/shared_utils.cmake)
-include (${SHARED_DIR}/mem-alloc/mem_alloc.cmake)
-include (${SHARED_DIR}/coap/lib_coap.cmake)
+if (NOT DEFINED WAMR_BUILD_LIBC_WASI)
+  # Disable libc wasi support by default
+  set (WAMR_BUILD_LIBC_WASI 0)
+endif ()
+
+if (NOT DEFINED WAMR_BUILD_APP_FRAMEWORK)
+  set (WAMR_BUILD_APP_FRAMEWORK 1)
+endif ()
+
+if (NOT DEFINED WAMR_BUILD_APP_LIST)
+  set (WAMR_BUILD_APP_LIST WAMR_APP_BUILD_ALL)
+endif ()
+
+################  wamr runtime settings  ################
+set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wamr)
+include (${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
+
+################  sample project related  ################
+add_definitions(-DLV_CONF_INCLUDE_SIMPLE)
+add_definitions(-DLV_MEM_CUSTOM=1)

-include_directories(${WASM_DIR}/runtime/platform/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/zephyr)
+include_directories(${WAMR_ROOT_DIR}/samples/gui/lv_config)

 set (LVGL_DRV_SRCS
    ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/zephyr/display_ili9340_adafruit_1480.c
@ -75,26 +69,8 @@ set (LVGL_DRV_SRCS
    ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/zephyr/XPT2046.c
    )

-set (IWASM_SRCS
-     ${WASM_PLATFORM_LIB_SOURCE}
-     ${WASM_UTILS_LIB_SOURCE}
-     ${VMCORE_LIB_SOURCE}
-     ${WASM_LIBC_SOURCE}
-     ${APP_MGR_SOURCE}
-     ${WASM_LIB_BASE_SOURCE}
-     ${WASM_LIB_EXT_SOURCE}
-     ${WASM_LIB_SENSOR_SOURCE}
-     ${WASM_LIB_GUI_SOURCE}
-     ${WASM_LIB_CONN_SOURCE}
-     ${WASM_LIB_CONN_MGR_SOURCE}
-     ${PLATFORM_SHARED_SOURCE}
-     ${UTILS_SHARED_SOURCE}
-     ${MEM_ALLOC_SHARED_SOURCE}
-     ${NATIVE_INTERFACE_SOURCE}
-    )
-
 target_sources(app PRIVATE
-               ${IWASM_SRCS}
+               ${WAMR_RUNTIME_LIB_SOURCE}
               ${LVGL_DRV_SRCS}
               ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/zephyr/main.c
               ${CMAKE_CURRENT_SOURCE_DIR}/../src/platform/zephyr/iwasm_main.c