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.

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

Disable FPU in NuttX spec test #2781

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Conversation

no1wudi
Copy link
Collaborator

@no1wudi no1wudi commented Nov 16, 2023

@yamt
Copy link
Collaborator

yamt commented Nov 17, 2023

This will fix spec test on NuttX with #2780 , see: https://github.com/no1wudi/wasm-micro-runtime/actions/runs/6888958439

what problem does this fix?

@@ -104,6 +110,11 @@ jobs:
find nuttx/boards -name defconfig | xargs sed -i '$a\CONFIG_INTERPRETERS_WAMR=y\nCONFIG_INTERPRETERS_WAMR_STACKSIZE=32768\nCONFIG_INTERPRETERS_WAMR_AOT=y\nCONFIG_INTERPRETERS_WAMR_FAST=y\nCONFIG_INTERPRETERS_WAMR_LOG=y\nCONFIG_INTERPRETERS_WAMR_LIBC_BUILTIN=y\nCONFIG_INTERPRETERS_WAMR_REF_TYPES=y\nCONFIG_INTERPRETERS_WAMR_ENABLE_SPEC_TEST=y\nCONFIG_INTERPRETERS_WAMR_SHARED_MEMORY=y\nCONFIG_INTERPRETERS_WAMR_BULK_MEMORY=y\n'
find nuttx/boards -name defconfig | xargs sed -i '$a\CONFIG_EOL_IS_LF=y\nCONFIG_ARM_SEMIHOSTING_HOSTFS=y\nCONFIG_ARM_SEMIHOSTING_HOSTFS_CACHE_COHERENCE=y\nCONFIG_RISCV_SEMIHOSTING_HOSTFS=y\nCONFIG_FS_HOSTFS=y\nCONFIG_LIBC_FLOATINGPOINT=y\n'

- name: Enable additional features for NuttX on RI5C-V
if: endsWith(matrix.nuttx_board_config, 'rv-virt/configs/nsh')
Copy link
Collaborator

Choose a reason for hiding this comment

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

if you mean all risc-v configs, isn't it more straightforward to use startsWith('boards/risc-v') ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sure

@no1wudi
Copy link
Collaborator Author

no1wudi commented Nov 17, 2023

This will fix spec test on NuttX with #2780 , see: https://github.com/no1wudi/wasm-micro-runtime/actions/runs/6888958439

what problem does this fix?

NuttX now enabled FPU for rv-vrit by default, but current test script about risc-v is works with FPU disabled so the test can't pass because of the incompatible ABI.

I plan to let CI cover more platform, such as aarch64, and existing platform with or without FPU support, but let's do a quick fix first.

@yamt
Copy link
Collaborator

yamt commented Nov 17, 2023

This will fix spec test on NuttX with #2780 , see: https://github.com/no1wudi/wasm-micro-runtime/actions/runs/6888958439

what problem does this fix?

NuttX now enabled FPU for rv-vrit by default, but current test script about risc-v is works with FPU disabled so the test can't pass because of the incompatible ABI.

does this basically undo this? apache/nuttx@61460ef

Copy link
Collaborator

@yamt yamt left a comment

Choose a reason for hiding this comment

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

lgtm

@no1wudi
Copy link
Collaborator Author

no1wudi commented Nov 17, 2023

does this basically undo this? apache/nuttx@61460ef

Yes.

@wenyongh wenyongh merged commit 748e745 into bytecodealliance:main Nov 18, 2023
1 check passed
victoryang00 pushed a commit to victoryang00/wamr-aot-gc-checkpoint-restore that referenced this pull request May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants