Fix release and coverage CI failures
CI / pre-commit (pull_request) Successful in 2m17s
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m41s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m40s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m43s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m46s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m34s
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 5m2s
CI / coverage (pull_request) Successful in 3m41s
CI / pre-commit (pull_request) Successful in 2m17s
CI / release (arm64, ubuntu-latest-arm64) (pull_request) Successful in 3m41s
CI / test (-DCMAKE_BUILD_TYPE=Debug, debug) (pull_request) Successful in 3m40s
CI / test (-DCMAKE_CXX_FLAGS=-DUSE_64_BIT=1, 64-bit-versions) (pull_request) Successful in 3m43s
CI / test (-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++, gcc) (pull_request) Successful in 3m46s
CI / test (-DUSE_SIMD_FALLBACK=ON, simd-fallback) (pull_request) Successful in 3m34s
CI / release (amd64, ubuntu-latest-amd64) (pull_request) Successful in 5m2s
CI / coverage (pull_request) Successful in 3m41s
* 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:
@@ -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
|
||||||
|
|
||||||
|
|||||||
+15
-1
@@ -386,12 +386,26 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND BUILD_TESTING)
|
|||||||
find_program(HARDENING_CHECK hardening-check)
|
find_program(HARDENING_CHECK hardening-check)
|
||||||
if(HARDENING_CHECK)
|
if(HARDENING_CHECK)
|
||||||
# Control flow integrity (CET) is x86-only and branch protection (PAC/BTI)
|
# Control flow integrity (CET) is x86-only and branch protection (PAC/BTI)
|
||||||
# is arm64-only, so ignore whichever doesn't apply.
|
# is arm64-only, so ignore whichever doesn't apply. Newer hardening-check
|
||||||
|
# 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_help
|
||||||
|
ERROR_QUIET)
|
||||||
if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR
|
if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR
|
||||||
STREQUAL arm64)
|
STREQUAL arm64)
|
||||||
|
if(_hardening_help MATCHES "--nocfprotection")
|
||||||
set(hardening_check_arch_flags --nocfprotection)
|
set(hardening_check_arch_flags --nocfprotection)
|
||||||
|
elseif(_hardening_help MATCHES "--no-cf-protection")
|
||||||
|
set(hardening_check_arch_flags --no-cf-protection)
|
||||||
|
endif()
|
||||||
else()
|
else()
|
||||||
|
if(_hardening_help MATCHES "--nobranchprotection")
|
||||||
set(hardening_check_arch_flags --nobranchprotection)
|
set(hardening_check_arch_flags --nobranchprotection)
|
||||||
|
elseif(_hardening_help MATCHES "--no-branch-protection")
|
||||||
|
set(hardening_check_arch_flags --no-branch-protection)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
add_test(
|
add_test(
|
||||||
NAME hardening_check
|
NAME hardening_check
|
||||||
|
|||||||
+6
-4
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user