mirror of
https://github.com/bytecodealliance/wasm-micro-runtime.git
synced 2025-05-08 20:56:13 +00:00
Use wabt binary instead of building from source in spec test (#1700)
Directly download wabt binary and use it in spec test instead of building it from source to fasten the spec test.
This commit is contained in:
parent
c70e1ebc3d
commit
c718e76dea
|
@ -55,10 +55,10 @@ env:
|
||||||
# LLVM
|
# LLVM
|
||||||
LLVM_CACHE_SUFFIX: "build-llvm_libraries_ex"
|
LLVM_CACHE_SUFFIX: "build-llvm_libraries_ex"
|
||||||
# For Spec Test
|
# For Spec Test
|
||||||
DEFAULT_TEST_OPTIONS: "-s spec -P"
|
DEFAULT_TEST_OPTIONS: "-s spec -b -P"
|
||||||
MULTI_MODULES_TEST_OPTIONS: "-s spec -M -P"
|
MULTI_MODULES_TEST_OPTIONS: "-s spec -b -M -P"
|
||||||
SIMD_TEST_OPTIONS: "-s spec -S -P"
|
SIMD_TEST_OPTIONS: "-s spec -b -S -P"
|
||||||
THREADS_TEST_OPTIONS: "-s spec -p -P"
|
THREADS_TEST_OPTIONS: "-s spec -b -p -P"
|
||||||
X86_32_TARGET_TEST_OPTIONS: "-m x86_32 -P"
|
X86_32_TARGET_TEST_OPTIONS: "-m x86_32 -P"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -404,9 +404,9 @@ jobs:
|
||||||
run: echo "USE_LLVM=true" >> $GITHUB_ENV
|
run: echo "USE_LLVM=true" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: set env variable(if x86_32 test needed)
|
- name: set env variable(if x86_32 test needed)
|
||||||
if: >
|
if: >
|
||||||
(matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS')
|
(matrix.test_option == '$DEFAULT_TEST_OPTIONS' || matrix.test_option == '$THREADS_TEST_OPTIONS')
|
||||||
&& matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
|
&& matrix.running_mode != 'fast-jit' && matrix.running_mode != 'jit'
|
||||||
run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
|
run: echo "TEST_ON_X86_32=true" >> $GITHUB_ENV
|
||||||
|
|
||||||
#only download llvm libraries in jit and aot mode
|
#only download llvm libraries in jit and aot mode
|
||||||
|
@ -427,9 +427,6 @@ jobs:
|
||||||
if: env.USE_LLVM == 'true' && steps.cache_llvm.outputs.cache-hit != 'true'
|
if: env.USE_LLVM == 'true' && steps.cache_llvm.outputs.cache-hit != 'true'
|
||||||
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
|
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
|
||||||
|
|
||||||
- name: install Ninja
|
|
||||||
run: sudo apt install -y ninja-build
|
|
||||||
|
|
||||||
- name: run spec tests default and extra
|
- name: run spec tests default and extra
|
||||||
run: ./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
|
run: ./test_wamr.sh ${{ matrix.test_option }} -t ${{ matrix.running_mode }}
|
||||||
working-directory: ./tests/wamr-test-suites
|
working-directory: ./tests/wamr-test-suites
|
||||||
|
|
29
.github/workflows/compilation_on_sgx.yml
vendored
29
.github/workflows/compilation_on_sgx.yml
vendored
|
@ -187,8 +187,14 @@ jobs:
|
||||||
#$AOT_BUILD_OPTIONS,
|
#$AOT_BUILD_OPTIONS,
|
||||||
]
|
]
|
||||||
os: [ubuntu-20.04]
|
os: [ubuntu-20.04]
|
||||||
wasi_sdk_release: ["https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz"]
|
wasi_sdk_release:
|
||||||
wabt_release: ["https://github.com/WebAssembly/wabt/releases/download/1.0.24/wabt-1.0.24-ubuntu.tar.gz"]
|
[
|
||||||
|
"https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz",
|
||||||
|
]
|
||||||
|
wabt_release:
|
||||||
|
[
|
||||||
|
"https://github.com/WebAssembly/wabt/releases/download/1.0.24/wabt-1.0.24-ubuntu.tar.gz",
|
||||||
|
]
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
@ -236,8 +242,14 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-20.04]
|
os: [ubuntu-20.04]
|
||||||
wasi_sdk_release: ["https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz"]
|
wasi_sdk_release:
|
||||||
wabt_release: ["https://github.com/WebAssembly/wabt/releases/download/1.0.24/wabt-1.0.24-ubuntu.tar.gz"]
|
[
|
||||||
|
"https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz",
|
||||||
|
]
|
||||||
|
wabt_release:
|
||||||
|
[
|
||||||
|
"https://github.com/WebAssembly/wabt/releases/download/1.0.24/wabt-1.0.24-ubuntu.tar.gz",
|
||||||
|
]
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
@ -321,13 +333,13 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
running_mode: ["classic-interp", "fast-interp", "aot"]
|
running_mode: ["classic-interp", "fast-interp", "aot"]
|
||||||
test_option: ["-x -p -s spec -P", "-x -p -s spec -S -P"]
|
test_option: ["-x -p -s spec -b -P", "-x -p -s spec -S -b -P"]
|
||||||
# classic-interp and fast-interp don't support simd
|
# classic-interp and fast-interp don't support simd
|
||||||
exclude:
|
exclude:
|
||||||
- running_mode: "classic-interp"
|
- running_mode: "classic-interp"
|
||||||
test_option: "-x -p -s spec -S -P"
|
test_option: "-x -p -s spec -S -b -P"
|
||||||
- running_mode: "fast-interp"
|
- running_mode: "fast-interp"
|
||||||
test_option: "-x -p -s spec -S -P"
|
test_option: "-x -p -s spec -S -b -P"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
|
@ -350,9 +362,6 @@ jobs:
|
||||||
if: matrix.running_mode == 'aot' && steps.cache_llvm.outputs.cache-hit != 'true'
|
if: matrix.running_mode == 'aot' && steps.cache_llvm.outputs.cache-hit != 'true'
|
||||||
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
|
run: echo "::error::can not get prebuilt llvm libraries" && exit 1
|
||||||
|
|
||||||
- name: install Ninja
|
|
||||||
run: sudo apt install -y ninja-build
|
|
||||||
|
|
||||||
- name: install SGX SDK and necessary libraries
|
- name: install SGX SDK and necessary libraries
|
||||||
run: |
|
run: |
|
||||||
mkdir -p /opt/intel
|
mkdir -p /opt/intel
|
||||||
|
|
|
@ -121,7 +121,7 @@ def test_case(
|
||||||
):
|
):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
CMD = ["python", "runtest.py"]
|
CMD = ["python3", "runtest.py"]
|
||||||
CMD.append("--wast2wasm")
|
CMD.append("--wast2wasm")
|
||||||
CMD.append(WAST2WASM_CMD)
|
CMD.append(WAST2WASM_CMD)
|
||||||
CMD.append("--interpreter")
|
CMD.append("--interpreter")
|
||||||
|
@ -270,9 +270,9 @@ def test_suite(
|
||||||
verbose_flag,
|
verbose_flag,
|
||||||
)
|
)
|
||||||
successful_case += 1
|
successful_case += 1
|
||||||
except Exception:
|
except Exception as e:
|
||||||
failed_case += 1
|
failed_case += 1
|
||||||
break
|
raise e
|
||||||
|
|
||||||
print(
|
print(
|
||||||
f"IN ALL {case_count} cases: {successful_case} PASS, {failed_case} FAIL, {case_count - successful_case - failed_case} SKIP"
|
f"IN ALL {case_count} cases: {successful_case} PASS, {failed_case} FAIL, {case_count - successful_case - failed_case} SKIP"
|
||||||
|
|
|
@ -413,6 +413,7 @@ function spec_test()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ${WORK_DIR}
|
cd ${WORK_DIR}
|
||||||
|
echo "python3 ./all.py ${ARGS_FOR_SPEC_TEST} | tee -a ${REPORT_DIR}/spec_test_report.txt"
|
||||||
python3 ./all.py ${ARGS_FOR_SPEC_TEST} | tee -a ${REPORT_DIR}/spec_test_report.txt
|
python3 ./all.py ${ARGS_FOR_SPEC_TEST} | tee -a ${REPORT_DIR}/spec_test_report.txt
|
||||||
[[ ${PIPESTATUS[0]} -ne 0 ]] && exit 1
|
[[ ${PIPESTATUS[0]} -ne 0 ]] && exit 1
|
||||||
cd -
|
cd -
|
||||||
|
|
Loading…
Reference in New Issue
Block a user