weaselab/conflict-set
1
Fork 1
Code Issues 5 Pull Requests Actions 1 Packages Releases 13 Activity

Fix release and coverage CI failures
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Failing after 13m56s
Details
CI / pre-commit (pull_request) Successful in 2m16s
Details
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m45s
Details
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m34s
Details
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m41s
Details
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m31s
Details
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 5m7s
Details
CI / coverage (pull_request) Successful in 3m49s
Details

Browse Source 
* 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:
weaselbot
2026-06-22 02:48:03 -04:00
parent e11df362cd
commit a2b3455930
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/ci.yml
+2 -1
View File
@@ -232,7 +232,8 @@ jobs:
rm -rf build rm -rf build
cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ cmake -S . -B build -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage \ -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 ninja -C build
ccache -s ccache -s
ConflictSet.cpp
+6 -4
View File
@@ -3080,7 +3080,7 @@ Node *firstGeqPhysical(Node *n, const TrivialSpan key) {
#define PRESERVE_NONE #define PRESERVE_NONE
#endif #endif
#if __has_attribute(musttail) && __has_attribute(preserve_none) #if __has_attribute(musttail)
constexpr bool kEnableInterleaved = true; constexpr bool kEnableInterleaved = true;
#else #else
constexpr bool kEnableInterleaved = false; constexpr bool kEnableInterleaved = false;
@@ -5040,9 +5040,12 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
assert(allPointWrites || sorted); assert(allPointWrites || sorted);
#endif #endif
if (kEnableInterleaved && count > 1) { if constexpr (kEnableInterleaved) {
if (count > 1) {
interleavedWrites(writes, count, InternalVersionT(writeVersion)); interleavedWrites(writes, count, InternalVersionT(writeVersion));
} else { return;
}
}
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
const auto &w = writes[i]; const auto &w = writes[i];
auto begin = TrivialSpan(w.begin.p, w.begin.len); 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) { void addWrites(const WriteRange *writes, int count, int64_t writeVersion) {
#if !USE_64_BIT #if !USE_64_BIT