Skip to content

Commit

Permalink
Merge branch main into dev/aot_stack_frame
Browse files Browse the repository at this point in the history
  • Loading branch information
wenyongh committed Feb 2, 2024
2 parents 8decbbb + 2eb6006 commit 382d93f
Show file tree
Hide file tree
Showing 128 changed files with 4,310 additions and 1,409 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build and save Docker image(wasm-debug-server:${{ inputs.ver_num }}) to tar file
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_iwasm_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
build:
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: get cached LLVM libraries
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_llvm_libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: install dependencies
run: /usr/bin/env python3 -m pip install -r requirements.txt
Expand All @@ -52,7 +52,7 @@ jobs:

- name: Cache LLVM libraries
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand All @@ -62,15 +62,15 @@ jobs:
./core/deps/llvm/build/share
key: ${{ steps.create_lib_cache_key.outputs.key}}

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.ccache
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
restore-keys: |
0-ccache-${{ inputs.os }}
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && inputs.os == 'ubuntu-20.04'

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/ccache
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
Expand All @@ -82,7 +82,7 @@ jobs:
- run: sudo apt install -y ccache ninja-build
if: steps.retrieve_llvm_libs.outputs.cache-hit != 'true' && startsWith(inputs.os, 'ubuntu') && inputs.container_image == ''

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/Library/Caches/ccache
key: 0-ccache-${{ inputs.os }}-${{ steps.get_last_commit.outputs.last_commit }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_wamr_lldb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
PYTHON_UBUNTU_STANDALONE_BUILD: https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.10.11+20230507-x86_64-unknown-linux-gnu-install_only.tar.gz
PYTHON_MACOS_STANDALONE_BUILD: https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.10.11+20230507-x86_64-apple-darwin-install_only.tar.gz
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: download and install wasi-sdk
run: |
Expand All @@ -60,7 +60,7 @@ jobs:
- name: Cache build
id: lldb_build_cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm-project/build/bin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wamr_sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
build:
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: download and install wasi-sdk
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wamr_vscode_ext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 16.x
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_wamrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
build:
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: get cached LLVM libraries
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coding_guidelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
45 changes: 26 additions & 19 deletions .github/workflows/compilation_on_android_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ jobs:
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# since jobs.id can't contain the dot character
# it is hard to use `format` to assemble the cache key
- name: Get LLVM libraries
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down Expand Up @@ -145,6 +145,7 @@ jobs:
"-DWAMR_BUILD_SIMD=1",
"-DWAMR_BUILD_TAIL_CALL=1",
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
"-DWAMR_ENABLE_SHARED_MEMORY_MMAP=1",
]
os: [ubuntu-22.04]
platform: [android, linux]
Expand Down Expand Up @@ -213,13 +214,13 @@ jobs:
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

# only download llvm cache when needed
- name: Get LLVM libraries
id: retrieve_llvm_libs
if: endsWith(matrix.make_options_run_mode, '_JIT_BUILD_OPTIONS')
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down Expand Up @@ -284,12 +285,12 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get LLVM libraries
id: retrieve_llvm_libs
if: (!endsWith(matrix.make_options, '_INTERP_BUILD_OPTIONS'))
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down Expand Up @@ -322,7 +323,7 @@ jobs:
run: |
VERBOSE=1
cmake -S . -B build ${{ matrix.make_options }}
cmake --build build --config Release --parallel 4
cmake --build build --config Debug --parallel 4
ctest --test-dir build --output-on-failure
working-directory: samples/wasm-c-api

Expand Down Expand Up @@ -350,7 +351,7 @@ jobs:
llvm_cache_key: ${{ needs.build_llvm_libraries_on_ubuntu_2204.outputs.cache_key }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: download and install wasi-sdk
run: |
Expand All @@ -367,7 +368,7 @@ jobs:
sudo mv wabt-1.0.31 wabt
- name: Get LLVM libraries
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand All @@ -393,23 +394,23 @@ jobs:
cd samples/file
mkdir build && cd build
cmake ..
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./src/iwasm -f wasm-app/file.wasm -d .
- name: Build Sample [multi-thread]
run: |
cd samples/multi-thread
mkdir build && cd build
cmake ..
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./iwasm wasm-apps/test.wasm
- name: Build Sample [multi-module]
run: |
cd samples/multi-module
mkdir build && cd build
cmake .. -DWAMR_BUILD_AOT=1
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./multi_module mC.wasm
./multi_module mC.aot
Expand All @@ -418,15 +419,15 @@ jobs:
cd samples/spawn-thread
mkdir build && cd build
cmake ..
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./spawn_thread
- name: Build Sample [ref-types]
run: |
cd samples/ref-types
mkdir build && cd build
cmake ..
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./hello
- name: Build Sample [simple]
Expand All @@ -441,7 +442,7 @@ jobs:
cd samples/wasi-threads
mkdir build && cd build
cmake ..
cmake --build . --config Release --parallel 4
cmake --build . --config Debug --parallel 4
./iwasm wasm-apps/no_pthread.wasm
- name: Build Sample [shared-module]
Expand All @@ -450,6 +451,12 @@ jobs:
./build.sh
./run.sh
- name: Build Sample [terminate]
run: |
cd samples/terminate
./build.sh
./run.sh
test:
needs:
[
Expand Down Expand Up @@ -513,7 +520,7 @@ jobs:
test_option: $SIMD_TEST_OPTIONS
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: download and install wasi-sdk
if: matrix.test_option == '$WASI_TEST_OPTIONS'
Expand Down Expand Up @@ -548,7 +555,7 @@ jobs:
- name: Get LLVM libraries
if: env.USE_LLVM == 'true'
id: retrieve_llvm_libs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./core/deps/llvm/build/bin
Expand Down Expand Up @@ -610,7 +617,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: install dependencies
run: |
Expand All @@ -629,7 +636,7 @@ jobs:

- name: Cache LLDB
id: cache-lldb
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-lldb-vscode
with:
Expand Down
Loading

0 comments on commit 382d93f

Please sign in to comment.