Skip to content

[ATfE] Enable minimal libc++ testing with LLVM libc #953

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

Open
voltur01 wants to merge 1 commit into
base: arm-software
Choose a base branch
from
Open

[ATfE] Enable minimal libc++ testing with LLVM libc #953

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
10 changes: 5 additions & 5 deletions arm-software/embedded/arm-multilib/json/variants/aarch64a_exn_rtti.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"FVP_MODEL": "aem-a",
"FVP_CONFIG": "v8a-aarch64",
"BOOT_FLASH_ADDRESS": "0x80000000",
"BOOT_FLASH_SIZE": "0x1000",
"FLASH_ADDRESS": "0x80001000",
"FLASH_SIZE": "0xfff000",
"BOOT_FLASH_SIZE": "0x4000",
"FLASH_ADDRESS": "0x80004000",
"FLASH_SIZE": "0xffc000",
"RAM_ADDRESS": "0x81000000",
"RAM_SIZE": "0x1000000",
"STACK_SIZE": "8K",
"STACK_SIZE": "128K",
"LIBRARY_BUILD_TYPE": "release"
},
"picolibc": {
Expand All @@ -34,7 +34,7 @@
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "ON"
}
}
}
4 changes: 2 additions & 2 deletions arm-software/embedded/arm-multilib/json/variants/armv7m_hard_fpv4_sp_d16_exn_rtti_size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"FLASH_SIZE": "0x600000",
"RAM_ADDRESS": "0x21600000",
"RAM_SIZE": "0xa00000",
"STACK_SIZE": "4K",
"STACK_SIZE": "128K",
"LIBRARY_BUILD_TYPE": "minsizerelease"
},
"picolibc": {
Expand All @@ -34,7 +34,7 @@
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "ON"
}
}
}
4 changes: 2 additions & 2 deletions arm-software/embedded/arm-multilib/json/variants/armv7m_soft_nofp_exn_rtti_size.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"FLASH_SIZE": "0x600000",
"RAM_ADDRESS": "0x21600000",
"RAM_SIZE": "0xa00000",
"STACK_SIZE": "4K",
"STACK_SIZE": "128K",
"LIBRARY_BUILD_TYPE": "minsizerelease"
},
"picolibc": {
Expand All @@ -34,7 +34,7 @@
"ENABLE_CXX_LIBS": "ON",
"ENABLE_LIBC_TESTS": "ON",
"ENABLE_COMPILER_RT_TESTS": "OFF",
"ENABLE_LIBCXX_TESTS": "OFF"
"ENABLE_LIBCXX_TESTS": "ON"
}
}
}
2 changes: 2 additions & 0 deletions arm-software/embedded/arm-runtimes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,7 @@ if(ENABLE_CXX_LIBS)
-DLIBCXX_ENABLE_FILESYSTEM=OFF
-DLIBCXX_ENABLE_LOCALIZATION=ON
-DLIBCXX_ENABLE_UNICODE=OFF
-DLIBCXX_HAS_RT_LIB=OFF

@vhscampos vhscampos Aug 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you explain in the PR description why the rt lib needs to be disabled?

@voltur01 voltur01 Aug 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, expanded: it effectively controls use of clock_gettime() that is a POSIX function provided by bare-metal LLVM libc now (it seems to be provided for some other targets though).

-DLIBUNWIND_ENABLE_THREADS=OFF
-DLIBCXXABI_ENABLE_EXCEPTIONS=${ENABLE_EXCEPTIONS}
-DLIBCXXABI_ENABLE_STATIC_UNWINDER=${ENABLE_EXCEPTIONS}
Expand Down Expand Up @@ -1106,6 +1107,7 @@ if(ENABLE_CXX_LIBS)
-DLIBUNWIND_TEST_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/test-support/llvm-libunwind-embedded.cfg.in
-DLIBUNWIND_TEST_PARAMS=executor=${lit_test_executor}
-DRUNTIME_TEST_ARCH_FLAGS=${compile_arch_flags}
-DRUNTIME_LIBC=${C_LIBRARY}
-DRUNTIME_TEST_LINK_FLAGS=${runtime_test_link_flags}
-DRUNTIME_TEST_EXTRA_COMPILE_FLAGS=${runtime_test_extra_compile_flags}
-DLLVM_LIT_ARGS=${libcxx_lit_args}
Expand Down
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/lit-exec-fvp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def main():
args.fvp_model,
args.fvp_config,
args.image,
[args.image] + args.arguments,
[pathlib.Path(args.image).name] + args.arguments,
args.timeout,
args.execdir,
args.verbose,
Expand Down
2 changes: 1 addition & 1 deletion arm-software/embedded/arm-runtimes/test-support/lit-exec-qemu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def main():
args.qemu_cpu,
args.qemu_params.split(":") if args.qemu_params else [],
args.image,
[args.image] + args.arguments,
[pathlib.Path(args.image).name] + args.arguments,
args.timeout,
args.execdir,
args.verbose,
Expand Down
2 changes: 2 additions & 0 deletions arm-software/embedded/arm-runtimes/test-support/llvm-libc++-embedded.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

config.name = 'libc++-@RUNTIME_VARIANT_NAME@'

config.available_features.add('libc=@RUNTIME_LIBC@')

config.substitutions.append(('%{libc-include}', '@CMAKE_INSTALL_PREFIX@/include'))
config.substitutions.append(('%{libc-lib}', '@CMAKE_INSTALL_PREFIX@/lib'))
config.substitutions.append(('%{libc-extra-link-flags}', '@RUNTIME_TEST_LINK_FLAGS@'))
Expand Down
7 changes: 7 additions & 0 deletions arm-software/embedded/arm-runtimes/test-support/run_fvp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class FVP:
tarmac_plugin: str
crypto_plugin: str
cmdline_param: str
stderr_param: str | None = None


MODELS = {
Expand All @@ -41,12 +42,14 @@ class FVP:
"FVP_Base_RevC_AEMvA_11.31_28/plugins/TarmacTrace.so",
"FastModels_11.31_28/plugins/Linux64_GCC-12.3/Crypto.so",
"cluster0.cpu0.semihosting-cmd_line",
"cluster0.cpu0.semihosting-use_stderr",
),
"aarch64": FVP(
"FVP_Base_RevC_AEMvA_11.31_28/bin/FVP_Base_RevC-2xAEMvA",
"FVP_Base_RevC_AEMvA_11.31_28/plugins/TarmacTrace.so",
"FastModels_11.31_28/plugins/Linux64_armv8l_GCC-12.3/Crypto.so",
"cluster0.cpu0.semihosting-cmd_line",
"cluster0.cpu0.semihosting-use_stderr",
),
},
"aem-r": {
Expand All @@ -55,12 +58,14 @@ class FVP:
"FVP_Base_AEMv8R_11.31_28/plugins/TarmacTrace.so",
"FastModels_11.31_28/plugins/Linux64_GCC-12.3/Crypto.so",
"cluster0.cpu0.semihosting-cmd_line",
"cluster0.cpu0.semihosting-use_stderr",
),
"aarch64": FVP(
"FVP_Base_AEMv8R_11.31_28/bin/FVP_BaseR_AEMv8R",
"FVP_Base_AEMv8R_11.31_28/plugins/TarmacTrace.so",
"FastModels_11.31_28/plugins/Linux64_armv8l_GCC-12.3/Crypto.so",
"cluster0.cpu0.semihosting-cmd_line",
"cluster0.cpu0.semihosting-use_stderr",
),
},
}
Expand Down Expand Up @@ -129,6 +134,8 @@ def run_fvp(
)

command.extend(["--parameter", f"{model.cmdline_param}={shlex.join(arguments)}"])
if model.stderr_param is not None:
command.extend(["--parameter", f"{model.stderr_param}=1"])
command.extend(["--plugin", path.join(fvp_install_dir, model.crypto_plugin)])
if tarmac_file is not None:
command.extend(
Expand Down
Loading