From 3260aa22138c1f6dbb8909c5e3c911e292647ecb Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Wed, 29 Jan 2025 08:18:46 -0600 Subject: [PATCH] Utilize libpopcnt We need to be sure to reference the include when pulling in dynamic_bitset --- thirdparty/dynamic_bitset/CMakeLists.txt | 2 ++ thirdparty/libpopcnt/libpopcnt.h | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/thirdparty/dynamic_bitset/CMakeLists.txt b/thirdparty/dynamic_bitset/CMakeLists.txt index 7112b8c253..d9fcf66c8f 100644 --- a/thirdparty/dynamic_bitset/CMakeLists.txt +++ b/thirdparty/dynamic_bitset/CMakeLists.txt @@ -5,3 +5,5 @@ target_include_directories( dynamic_bitset INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} target_sources( dynamic_bitset INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/dynamic_bitset.h ) + +target_link_libraries( dynamic_bitset INTERFACE popcnt ) # Link with libpopcnt diff --git a/thirdparty/libpopcnt/libpopcnt.h b/thirdparty/libpopcnt/libpopcnt.h index 888514e7b5..2373a770af 100644 --- a/thirdparty/libpopcnt/libpopcnt.h +++ b/thirdparty/libpopcnt/libpopcnt.h @@ -542,7 +542,7 @@ static inline uint64_t popcnt_avx512(const uint8_t* ptr8, uint64_t size) * @data: An array * @size: Size of data in bytes */ -static uint64_t popcnt(const void* data, uint64_t size) +[[maybe_unused]] static uint64_t popcnt(const void* data, uint64_t size) { /* * CPUID runtime checks are only enabled if this is needed. @@ -700,7 +700,7 @@ static uint64_t popcnt(const void* data, uint64_t size) * @data: An array * @size: Size of data in bytes */ -static inline uint64_t popcnt(const void* data, uint64_t size) +[[maybe_unused]] static inline uint64_t popcnt(const void* data, uint64_t size) { uint64_t i = 0; const uint64_t* ptr64 = (const uint64_t*) data; @@ -769,7 +769,7 @@ static inline uint64x2_t vpadalq(uint64x2_t sum, uint8x16_t t) * @data: An array * @size: Size of data in bytes */ -static inline uint64_t popcnt(const void* data, uint64_t size) +[[maybe_unused]] static inline uint64_t popcnt(const void* data, uint64_t size) { uint64_t i = 0; uint64_t cnt = 0; @@ -866,7 +866,7 @@ static inline uint64_t popcnt(const void* data, uint64_t size) * @data: An array * @size: Size of data in bytes */ -static inline uint64_t popcnt(const void* data, uint64_t size) +[[maybe_unused]] static inline uint64_t popcnt(const void* data, uint64_t size) { uint64_t i = 0; uint64_t cnt = 0;