Use ExternalProject to bring wasm-apps for few samples

- file/
- wasi-threads/

Author: lum1n0us

.github/workflows/compilation_on_macos.yml

@@ -329,12 +329,13 @@ jobs:
           cmake --build . --config Release --parallel 4
         working-directory: wamr-compiler
 
+      # cmake --build . --config Debug --parallel 4
       - name: Build Sample [wasi-threads]
         run: |
           cd samples/wasi-threads
           mkdir build && cd build
           cmake ..
-          cmake --build . --config Debug --parallel 4
+          cmake --build . --config Debug --verbose
           ./iwasm wasm-apps/no_pthread.wasm
 
           ../../../wamr-compiler/build/wamrc --size-level=0 --enable-multi-thread -o wasm-apps/no_pthread.aot wasm-apps/no_pthread.wasm

.github/workflows/compilation_on_sgx.yml

@@ -229,27 +229,28 @@ jobs:
           cp wamrc `pwd`/../../product-mini/platforms/${{ matrix.platform }}/enclave-sample
         working-directory: wamr-compiler
 
+      # cmake --build . --config Debug --parallel 4
       - name: Build Sample [file]
         run: |
           cd samples/file
           mkdir build && cd build
           cmake ..
-          cmake --build . --config Debug --parallel 4
+          cmake --build . --config Debug --verbose
           cp wasm-app/file.wasm `pwd`/../../../product-mini/platforms/${{ matrix.platform }}/enclave-sample
 
       - name: Test Sample [file] in non-aot mode
         if: matrix.iwasm_make_options_run_mode != '$AOT_BUILD_OPTIONS'
         run: |
           source /opt/intel/sgxsdk/environment
-          ./iwasm --dir=. file.wasm
+          ./iwasm -f file.wasm -d .
         working-directory: product-mini/platforms/${{ matrix.platform }}/enclave-sample
 
       - name: Test Sample [file] in aot mode
         if: matrix.iwasm_make_options_run_mode == '$AOT_BUILD_OPTIONS'
         run: |
           source /opt/intel/sgxsdk/environment
           ./wamrc -sgx -o file.aot file.wasm
-          ./iwasm --dir=. file.aot
+          ./iwasm -f file.aot -d .
         working-directory: product-mini/platforms/${{ matrix.platform }}/enclave-sample
 
   spec_test_default:

samples/cmake/FindWASISDK.cmake

@@ -0,0 +1,25 @@
+# Copyright (C) 2019 Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+include(FindPackageHandleStandardArgs)
+
+file(GLOB WASISDK_SEARCH_PATH "/opt/wasi-sdk-*")
+find_path(WASISDK_HOME
+  NAMES share/wasi-sysroot
+  PATHS ${WASISDK_SEARCH_PATH}
+  NO_DEFAULT_PATH
+  REQUIRED
+)
+
+string(REGEX MATCH [0-9]+\.[0-9]+\.*[0-9]* WASISDK_VERSION ${WASISDK_HOME})
+
+find_package_handle_standard_args(WASISDK REQUIRED_VARS WASISDK_HOME VERSION_VAR WASISDK_VERSION)
+
+if(WASISDK_FOUND)
+  set(WASISDK_CC_COMMAND        ${WASISDK_HOME}/bin/clang)
+  set(WASISDK_CXX_COMMAND       ${WASISDK_HOME}/bin/clang++)
+  set(WASISDK_TOOLCHAIN         ${WASISDK_HOME}/share/cmake/wasi-sdk.cmake)
+  set(WASISDK_PTHREAD_TOOLCHAIN ${WASISDK_HOME}/share/cmake/wasi-sdk-pthread.cmake)
+  set(WASISDK_SYSROOT           ${WASISDK_HOME}/share/wasi-sysroot)
+endif()
+mark_as_advanced(WASISDK_CC_COMMAND WASISDK_CXX_COMMAND WASISDK_TOOLCHAIN WASISDK_PTHREAD_TOOLCHAIN WASISDK_SYSROOT WASISDK_HOME)

samples/file/CMakeLists.txt

@@ -6,4 +6,20 @@ project(file)
 
 ################ wasm application ###############
 add_subdirectory(src)
-add_subdirectory(wasm-app)
+
+# Use ExternalProject to avoid incorporating WAMR library compilation flags into the
+# compilation of the wasm application, which could lead to compatibility
+# issues due to different targets.
+# Like: clang: error: unsupported option '-arch' for target 'wasm32-wasi'
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake)
+find_package(WASISDK REQUIRED)
+
+include(ExternalProject)
+ExternalProject_Add(wasm-app
+  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wasm-app"
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/wasm-app -B build
+                      -DWASI_SDK_PREFIX=${WASISDK_HOME}
+                      -DCMAKE_TOOLCHAIN_FILE=${WASISDK_TOOLCHAIN}
+  BUILD_COMMAND     ${CMAKE_COMMAND} --build build
+  INSTALL_COMMAND   ${CMAKE_COMMAND} --install build --prefix ${CMAKE_CURRENT_BINARY_DIR}
+)

samples/file/wasm-app/CMakeLists.txt

@@ -2,25 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 cmake_minimum_required(VERSION 3.14)
-project(wasm-app)
+project(file_wasm)
 
-set (WAMR_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set (CMAKE_BUILD_TYPE Debug)  # Otherwise no debug symbols (addr2line)
 
-if (APPLE)
-    set (HAVE_FLAG_SEARCH_PATHS_FIRST 0)
-    set (CMAKE_C_LINK_FLAGS "")
-    set (CMAKE_CXX_LINK_FLAGS "")
-endif ()
-
-set (CMAKE_SYSTEM_PROCESSOR wasm32)
-
-if (NOT DEFINED WASI_SDK_DIR)
-    set (WASI_SDK_DIR               "/opt/wasi-sdk")
-endif ()
-
-set (CMAKE_C_COMPILER_TARGET        "wasm32-wasi")
-set (CMAKE_C_COMPILER               "${WASI_SDK_DIR}/bin/clang")
-set (CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -O3 -Wno-unused-command-line-argument")
-
-add_executable(file.wasm main.c)
-target_link_libraries(file.wasm)
+add_executable(file main.c)
+set_target_properties (file PROPERTIES SUFFIX .wasm)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/file.wasm DESTINATION wasm-app)

samples/wasi-threads/CMakeLists.txt

@@ -66,7 +66,24 @@ add_library(vmlib ${WAMR_RUNTIME_LIB_SOURCE})
 
 
 ################ wasm application ################
-add_subdirectory(wasm-apps)
+# Use ExternalProject to avoid incorporating WAMR library compilation flags into the
+# compilation of the wasm application, which could lead to compatibility
+# issues due to different targets.
+# Like: clang: error: unsupported option '-arch' for target 'wasm32-wasi'
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake)
+find_package(WASISDK REQUIRED)
+
+include(ExternalProject)
+ExternalProject_Add(wasm-apps
+  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps"
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/wasm-apps -B build
+                      -DWASI_SDK_PREFIX=${WASISDK_HOME}
+                      -DCMAKE_TOOLCHAIN_FILE=${WASISDK_PTHREAD_TOOLCHAIN}
+  BUILD_COMMAND     ${CMAKE_COMMAND} --build build
+  INSTALL_COMMAND   ${CMAKE_COMMAND} --install build --prefix ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 
 ################ wamr runtime ################
 include (${SHARED_DIR}/utils/uncommon/shared_uncommon.cmake)

samples/wasi-threads/wasm-apps/CMakeLists.txt

@@ -1,28 +1,10 @@
 # Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-if (APPLE)
-    set (HAVE_FLAG_SEARCH_PATHS_FIRST 0)
-    set (CMAKE_C_LINK_FLAGS "")
-    set (CMAKE_CXX_LINK_FLAGS "")
-endif ()
+cmake_minimum_required (VERSION 3.14)
+project (wasi_threads_wasm)
 
-if (NOT DEFINED WASI_SDK_DIR)
-  set (WASI_SDK_DIR               "/opt/wasi-sdk")
-endif ()
-
-if (DEFINED WASI_SYSROOT)
-  set (CMAKE_SYSROOT                "${WASI_SYSROOT}")
-endif ()
-
-set (CMAKE_C_COMPILER               "${WASI_SDK_DIR}/bin/clang")
-set (CMAKE_ASM_COMPILER               "${WASI_SDK_DIR}/bin/clang")
-set (CMAKE_EXE_LINKER_FLAGS         "-target wasm32-wasi-threads")
-
-if ("$ENV{COLLECT_CODE_COVERAGE}" STREQUAL "1" OR COLLECT_CODE_COVERAGE EQUAL 1)
-  set (CMAKE_C_FLAGS "")
-  set (CMAKE_CXX_FLAGS "")
-endif ()
+set (CMAKE_BUILD_TYPE Debug)  # Otherwise no debug symbols (addr2line)
 
 function (compile_sample SOURCE_FILE)
   get_filename_component (FILE_NAME ${SOURCE_FILE} NAME_WLE)
@@ -41,6 +23,8 @@ function (compile_sample SOURCE_FILE)
     LINKER:--export=malloc
     LINKER:--export=free
   )
+
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${WASM_MODULE} DESTINATION wasm-apps)
 endfunction ()
 
-compile_sample(no_pthread.c wasi_thread_start.S)
+compile_sample(no_pthread.c wasi_thread_start.S)