Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Add support for ARM/RISCV by QEMU #1704

Merged
merged 35 commits into from
Nov 28, 2022
Merged

ci: Add support for ARM/RISCV by QEMU #1704

merged 35 commits into from
Nov 28, 2022

Conversation

no1wudi
Copy link
Collaborator

@no1wudi no1wudi commented Nov 15, 2022

No description provided.

@no1wudi no1wudi closed this Nov 15, 2022
@no1wudi no1wudi reopened this Nov 15, 2022
@no1wudi no1wudi closed this Nov 15, 2022
@no1wudi no1wudi reopened this Nov 15, 2022
@no1wudi no1wudi changed the title Simplify test script by remove unused imports and dupped lines ci: Add support for ARM by QEMU Nov 16, 2022
@no1wudi no1wudi marked this pull request as draft November 16, 2022 08:26
@no1wudi no1wudi force-pushed the main branch 2 times, most recently from c73fb63 to b3abb22 Compare November 23, 2022 02:13
@no1wudi no1wudi marked this pull request as ready for review November 23, 2022 03:31
@no1wudi no1wudi changed the title ci: Add support for ARM by QEMU ci: Add support for ARM/RISCV by QEMU Nov 23, 2022
wenyongh
wenyongh reviewed Nov 24, 2022
View reviewed changes
product-mini/platforms/posix/main.c Outdated Show resolved Hide resolved
product-mini/platforms/posix/main.c Outdated Show resolved Hide resolved
tests/wamr-test-suites/spec-test-script/all.py Outdated Show resolved Hide resolved
tests/wamr-test-suites/spec-test-script/runtest.py Outdated Show resolved Hide resolved
tests/wamr-test-suites/spec-test-script/runtest.py Outdated Show resolved Hide resolved
no1wudi added 17 commits November 25, 2022 10:21
@no1wudi
Simplify test script by remove unused imports and dupped lines
acc5da3 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
ci: Support qemu
a25bd69 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Initial support run spectest on qemu arm
77ce5f0 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Fix code style
3ecc45f 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Run isort
8a8988f 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Declare global variables IWASM_CMD before assignment
64b3753 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Refactor runtest.py to remove temp_file_directory
9acf465 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Support multi module
1a21f89 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Fix cpu target
d8f8908 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Correct --module-path flag
4bdaf91 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Fix module loader
51736db 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Use run_wasm_with_repl instead of check_output for malformed
317f42c 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Restore temp file remove logic
6947ffe 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Reuse runner
64e6b4e 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Revert "Reuse runner"
7d83415 
This reverts commit 29fbefa.
@no1wudi
Skip some unsupported case on qemu
cfcc967 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Remove unused debug code
32e5c02 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Test scripts support riscv
7afb71b 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Correct riscv32 aot target
4d963fc 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Support interpreter mode for qemu
80f5fd5 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Fix missing space
53a3e39 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Pass qemu firmware by command line
665e8c3 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Allow long time for qemu
7231905 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Restore iwasm
fa00fb1 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Minor update for all.py
b46c7b8 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Use tempfile.gettempdir() to get workspace
1a2bec8 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Minor fix
190babc 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Fix module path
1448371 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@wenyongh
Copy link
Contributor

Run failed in MacOS:
./test_wamr.sh -s spec

Starting interpreter for module '/var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpk0m_eu7m.wasm'
Running: ../../../product-mini/platforms/darwin/build/iwasm --heap-size=0 -v=0 --repl /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpk0m_eu7m.wasm
Testing(return) call-overwritten-element  = 0x42:i32
;; Element sections across multiple modules change the same table
Writing WAST module to '/var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmp7sscdv2a.wast'
Compiling WASM to '/var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpqekvp4rl.wasm'
Running: ./wabt/out/gcc/Release/wat2wasm --enable-thread --no-check /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmp7sscdv2a.wast -o /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpqekvp4rl.waTraceback (most recent call last):
  File "/Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/./all.py", line 464, in <module>
sm
Starting interpreter for module '/var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpqekvp4rl.wasm'
Running: ../../../product-mini/platforms/darwin/build/iwasm --heap-size=0 -v=0 --repl /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/tmpqekvp4rl.wasm
Testing Trap Mode: /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/module1
Starting interpreter for module '/var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/module1.wasm'
Running: ../../../product-mini/platforms/darwin/build/iwasm --heap-size=0 -v=0 --repl /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/module1.wasm
Did not one of following prompt(s): ['webassembly> ']
    Got      : ''
THE FINAL EXCEPTION IS Failed:
  expected: 'SystemExit(1)'
  got: 'Read file to buffer failed: open file /var/folders/sd/mcflkwfs05l2myvkw51j1q480000gp/T/module1.wasm failed.
'
Removing tempfiles
### End testing /Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/spec/test/core/elem.wast
failed with a non-zero return code 101
    sys.exit(0 if main() else 1)
  File "/Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/./all.py", line 420, in main
    ret = test_suite(
  File "/Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/./all.py", line 301, in test_suite
    raise e
  File "/Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/./all.py", line 284, in test_suite
    test_case(
  File "/Users/wamr/WASM/wamr-internal-test/wamr-github/tests/wamr-test-suites/workspace/./all.py", line 202, in test_case
    raise Exception(case_name)
Exception: elem

@no1wudi
Fix new module path
ddb4326 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Copy link
Collaborator Author

no1wudi commented Nov 26, 2022

@wenyongh Could you try it again or we should add macos to CI

@wenyongh
Copy link
Contributor

@wenyongh Could you try it again or we should add macos to CI

Yes, it works now. Had better not add MacOS spec test to CI, it takes long time to runtime spec case since -P option isn't supported.

@no1wudi
Remove unused gloabl variable
7af77b6 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Merge code splited by if test_aot
a4597f2 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Use str.strip to extract output
b9e3e76 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
strip before split output string
d2a724e 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Restore test code
84b7112 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
@no1wudi
Split on specific condition
ec885d7 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
wenyongh
wenyongh approved these changes Nov 28, 2022
View reviewed changes
Copy link
Contributor

@wenyongh wenyongh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wenyongh wenyongh merged commit 9c5e1cb into bytecodealliance:main Nov 28, 2022
NingW101 pushed a commit to NingW101/wasm-micro-runtime that referenced this pull request Dec 1, 2022
@no1wudi @NingW101
wamr-test-suites: Add support for ARM/RISCV by QEMU (bytecodealliance…
7f28711 
…#1704)

Enhance wamr-test-suites to add QEMU and Firmware options:
`./test_wamr.sh -Q <qemu> -F <firmware>`
wenyongh pushed a commit that referenced this pull request Dec 6, 2022
@no1wudi @wenyongh
wamr-test-suites: Add support for ARM/RISCV by QEMU (#1704)
298dd27 
Enhance wamr-test-suites to add QEMU and Firmware options:
`./test_wamr.sh -Q <qemu> -F <firmware>`
wenyongh pushed a commit that referenced this pull request Dec 19, 2022
@no1wudi @wenyongh
wamr-test-suites: Add support for ARM/RISCV by QEMU (#1704)
b334707 
Enhance wamr-test-suites to add QEMU and Firmware options:
`./test_wamr.sh -Q <qemu> -F <firmware>`
victoryang00 pushed a commit to victoryang00/wamr-aot-gc-checkpoint-restore that referenced this pull request May 27, 2024
@no1wudi
wamr-test-suites: Add support for ARM/RISCV by QEMU (bytecodealliance…
a570f16 
…#1704)

Enhance wamr-test-suites to add QEMU and Firmware options:
`./test_wamr.sh -Q <qemu> -F <firmware>`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lum1n0us lum1n0us lum1n0us left review comments

@wenyongh wenyongh wenyongh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@no1wudi @wenyongh @lum1n0us