Skip to content

[cpullvm] Add additional variants for testing Zephyr #309

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

Merged
Jonathon Penix (jonathonpenix) merged 1 commit into from
Apr 15, 2026
Merged

[cpullvm] Add additional variants for testing Zephyr #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion qualcomm-software/embedded-multilib/json/multilib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
"json": "armv7m_soft_nofp.json",
"flags": "--target=thumbv7m-unknown-none-eabi -mfpu=none"
},
{
"variant": "armv7m_soft_nofp_nopic",
"json": "armv7m_soft_nofp_nopic.json",
"flags": "--target=thumbv7m-unknown-none-eabi -mfpu=none -fno-pic",
"libraries_supported": "picolibc"
},
{
"variant": "riscv32imc_ilp32_nothreads_nopic",
"json": "riscv32imc_ilp32_nothreads_nopic.json",
Expand Down Expand Up @@ -121,7 +127,7 @@
"flags": "--target=riscv32-unknown-unknown-elf -march=rv32imac_zcb_zcmp_zba_zbb -mabi=ilp32 -fno-pic",
"libraries_supported": "picolibc"
},
{
{
"variant": "riscv32imafc_ilp32f",
"json": "riscv32imafc_ilp32f.json",
"flags": "--target=riscv32-unknown-unknown-elf -march=rv32imafc -mabi=ilp32f",
Expand All @@ -139,6 +145,12 @@
"flags": "--target=riscv32-unknown-unknown-elf -march=rv32imafc_zcb_zcmp_zba_zbb -mabi=ilp32f",
"libraries_supported": "picolibc"
},
{
"variant": "riscv32gc_ilp32d",
"json": "riscv32gc_ilp32d.json",
"flags": "--target=riscv32-unknown-unknown-elf -march=rv32gc -mabi=ilp32d",
"libraries_supported": "picolibc"
},
{
"variant": "riscv32im_xqci_ilp32_nothreads_nopic",
"json": "riscv32im_xqci_ilp32_nothreads_nopic.json",
Expand Down
25 changes: 25 additions & 0 deletions qualcomm-software/embedded-multilib/json/variants/armv7m_soft_nofp_nopic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"args": {
"common": {
"TARGET_ARCH": "armv7m",
"VARIANT": "armv7m_soft_nofp_nopic",
"COMPILE_FLAGS": "-mfloat-abi=soft -march=armv7m -mfpu=none -mno-unaligned-access",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "qemu",
"QEMU_MACHINE": "mps2-an385",
"QEMU_CPU": "cortex-m3",
"FLASH_ADDRESS": "0x00000000",
"FLASH_SIZE": "0x00400000",
"RAM_ADDRESS": "0x20000000",
"RAM_SIZE": "0x00200000",
"LIBRARY_BUILD_TYPE": "minsizerelease"
},
"picolibc": {
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
}
}
}
26 changes: 26 additions & 0 deletions qualcomm-software/embedded-multilib/json/variants/riscv32gc_ilp32d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"args": {
"common": {
"TARGET_ARCH": "riscv32",
"VARIANT": "riscv32gc_ilp32d",
"COMPILE_FLAGS": "-march=rv32gc -mabi=ilp32d -fPIC",
"ENABLE_EXCEPTIONS": "OFF",
"ENABLE_RTTI": "OFF",
"TEST_EXECUTOR": "qemu",
"QEMU_MACHINE": "virt",
"QEMU_CPU": "rv32",
"QEMU_PARAMS": "-bios none",
"FLASH_ADDRESS": "0x80000000",
"FLASH_SIZE": "0x00400000",
"RAM_ADDRESS": "0x80400000",
"RAM_SIZE": "0x00200000",
"LIBRARY_BUILD_TYPE": "minsizerelease"
},
"picolibc": {
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
}
}
}
3 changes: 2 additions & 1 deletion qualcomm-software/embedded-runtimes/test-support/xfails.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,15 @@ def check_r52_warning():
description="If the installed default multilib does not have a library available for -mcpu=cortex-r52, this test will fail.",
),
XFail(
name="picolibc_rv64gc",
name="picolibc rv32/64gc",
testnames=[
"math_errhandling.test",
"test-fma.test",
],
result=NewResult.XFAILED,
project="picolibc",
variants=[
"riscv32gc_ilp32d",
"riscv64gc_lp64d_nopic",
"riscv64gc_zba_zbb_lp64d_nopic",
"riscv64gc_lp64_nopic",
Expand Down
Loading