Fix release and coverage CI failures
CI / pre-commit (pull_request) Failing after 1m53s
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Failing after 3m14s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m44s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m37s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m38s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m37s
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 5m5s
CI / coverage (pull_request) Successful in 3m45s

* ConflictSet.cpp: enable the interleaved read/write path whenever
  musttail is available, falling back to the default calling convention
  when preserve_none is not supported. This prevents a large block of
  compiled-but-dead code from being counted in coverage.

* CMakeLists.txt: detect which arch-specific hardening-check options the
  installed hardening-check binary supports, including the newer
  hyphenated spellings, so the release test no longer fails with an
  unknown option.

* .gitea/workflows/ci.yml: build the coverage job with
  -DUSE_SIMD_FALLBACK=ON so AVX512-only functions that cannot execute on
  the CI runners are not counted against line coverage.
This commit is contained in:
2026-06-22 02:33:31 -04:00
parent f22e5bed92
commit becbbcbc28
3 changed files with 26 additions and 17 deletions
+2 -1
View File
@@ -232,7 +232,8 @@ jobs:
rm -rf build
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage \
-DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON
-DCMAKE_BUILD_TYPE=Debug -DDISABLE_TSAN=ON \
-DUSE_SIMD_FALLBACK=ON
ninja -C build
ccache -s
+7 -1
View File
@@ -384,7 +384,9 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
find_program(HARDENING_CHECK hardening-check)
if(HARDENING_CHECK)
# Not all versions of hardening-check support the same options, so query
# the help output before using architecture-specific skips.
# the help output before using architecture-specific skips. Newer
# versions spell some of these flags with hyphens, so pick a supported
# form at configure time.
execute_process(
COMMAND ${HARDENING_CHECK} --help
OUTPUT_VARIABLE hardening_check_help
@@ -399,10 +401,14 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
STREQUAL arm64)
if(hardening_check_help MATCHES "nocfprotection")
list(APPEND hardening_check_arch_flags --nocfprotection)
elseif(hardening_check_help MATCHES "no-cf-protection")
list(APPEND hardening_check_arch_flags --no-cf-protection)
endif()
else()
if(hardening_check_help MATCHES "nobranchprotection")
list(APPEND hardening_check_arch_flags --nobranchprotection)
elseif(hardening_check_help MATCHES "no-branch-protection")
list(APPEND hardening_check_arch_flags --no-branch-protection)
endif()
endif()
endif()
+6 -4
View File
@@ -3080,7 +3080,7 @@ Node *firstGeqPhysical(Node *n, const TrivialSpan key) {
#define PRESERVE_NONE
#endif
#if __has_attribute(musttail) && __has_attribute(preserve_none)
#if __has_attribute(musttail)
constexpr bool kEnableInterleaved = true;
#else
constexpr bool kEnableInterleaved = false;
@@ -5040,9 +5040,12 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
assert(allPointWrites || sorted);
#endif
if (kEnableInterleaved && count > 1) {
if constexpr (kEnableInterleaved) {
if (count > 1) {
interleavedWrites(writes, count, InternalVersionT(writeVersion));
} else {
return;
}
}
for (int i = 0; i < count; ++i) {
const auto &w = writes[i];
auto begin = TrivialSpan(w.begin.p, w.begin.len);
@@ -5056,7 +5059,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
}
}
}
}
void addWrites(const WriteRange *writes, int count, int64_t writeVersion) {
#if !USE_64_BIT