From e938de4a8f1bf1b6b1aec05ec9d753621e37746f Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Mon, 24 Mar 2025 19:48:41 -0500 Subject: [PATCH v10 1/3] Rename TRY_POPCNT_FAST to TRY_POPCNT_X86_64. This macro guards x86_64-specific code, and a follow-up commit will add AArch64-specific versions of that code. To avoid confusion, let's rename TRY_POPCNT_FAST to make it more obvious that it's for x86_64. Discussion: https://postgr.es/m/010101936e4aaa70-b474ab9e-b9ce-474d-a3ba-a3dc223d295c-000000%40us-west-2.amazonses.com --- src/include/port/pg_bitutils.h | 6 +++--- src/port/pg_bitutils.c | 14 +++++++------- src/port/pg_popcount_avx512.c | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/include/port/pg_bitutils.h b/src/include/port/pg_bitutils.h index 62554ce685a..3067ff402ba 100644 --- a/src/include/port/pg_bitutils.h +++ b/src/include/port/pg_bitutils.h @@ -294,11 +294,11 @@ pg_ceil_log2_64(uint64 num) */ #ifdef HAVE_X86_64_POPCNTQ #if defined(HAVE__GET_CPUID) || defined(HAVE__CPUID) -#define TRY_POPCNT_FAST 1 +#define TRY_POPCNT_X86_64 1 #endif #endif -#ifdef TRY_POPCNT_FAST +#ifdef TRY_POPCNT_X86_64 /* Attempt to use the POPCNT instruction, but perform a runtime check first */ extern PGDLLIMPORT int (*pg_popcount32) (uint32 word); extern PGDLLIMPORT int (*pg_popcount64) (uint64 word); @@ -322,7 +322,7 @@ extern int pg_popcount64(uint64 word); extern uint64 pg_popcount_optimized(const char *buf, int bytes); extern uint64 pg_popcount_masked_optimized(const char *buf, int bytes, bits8 mask); -#endif /* TRY_POPCNT_FAST */ +#endif /* TRY_POPCNT_X86_64 */ /* * Returns the number of 1-bits in buf. diff --git a/src/port/pg_bitutils.c b/src/port/pg_bitutils.c index 5677525693d..82be40e2fb4 100644 --- a/src/port/pg_bitutils.c +++ b/src/port/pg_bitutils.c @@ -108,7 +108,7 @@ static inline int pg_popcount64_slow(uint64 word); static uint64 pg_popcount_slow(const char *buf, int bytes); static uint64 pg_popcount_masked_slow(const char *buf, int bytes, bits8 mask); -#ifdef TRY_POPCNT_FAST +#ifdef TRY_POPCNT_X86_64 static bool pg_popcount_available(void); static int pg_popcount32_choose(uint32 word); static int pg_popcount64_choose(uint64 word); @@ -123,9 +123,9 @@ int (*pg_popcount32) (uint32 word) = pg_popcount32_choose; int (*pg_popcount64) (uint64 word) = pg_popcount64_choose; uint64 (*pg_popcount_optimized) (const char *buf, int bytes) = pg_popcount_choose; uint64 (*pg_popcount_masked_optimized) (const char *buf, int bytes, bits8 mask) = pg_popcount_masked_choose; -#endif /* TRY_POPCNT_FAST */ +#endif /* TRY_POPCNT_X86_64 */ -#ifdef TRY_POPCNT_FAST +#ifdef TRY_POPCNT_X86_64 /* * Return true if CPUID indicates that the POPCNT instruction is available. @@ -337,7 +337,7 @@ pg_popcount_masked_fast(const char *buf, int bytes, bits8 mask) return popcnt; } -#endif /* TRY_POPCNT_FAST */ +#endif /* TRY_POPCNT_X86_64 */ /* @@ -486,13 +486,13 @@ pg_popcount_masked_slow(const char *buf, int bytes, bits8 mask) return popcnt; } -#ifndef TRY_POPCNT_FAST +#ifndef TRY_POPCNT_X86_64 /* * When the POPCNT instruction is not available, there's no point in using * function pointers to vary the implementation between the fast and slow * method. We instead just make these actual external functions when - * TRY_POPCNT_FAST is not defined. The compiler should be able to inline + * TRY_POPCNT_X86_64 is not defined. The compiler should be able to inline * the slow versions here. */ int @@ -527,4 +527,4 @@ pg_popcount_masked_optimized(const char *buf, int bytes, bits8 mask) return pg_popcount_masked_slow(buf, bytes, mask); } -#endif /* !TRY_POPCNT_FAST */ +#endif /* !TRY_POPCNT_X86_64 */ diff --git a/src/port/pg_popcount_avx512.c b/src/port/pg_popcount_avx512.c index dac895a0fc2..80c0aee3e73 100644 --- a/src/port/pg_popcount_avx512.c +++ b/src/port/pg_popcount_avx512.c @@ -27,11 +27,11 @@ #include "port/pg_bitutils.h" /* - * It's probably unlikely that TRY_POPCNT_FAST won't be set if we are able to + * It's probably unlikely that TRY_POPCNT_X86_64 won't be set if we are able to * use AVX-512 intrinsics, but we check it anyway to be sure. We piggy-back on - * the function pointers that are only used when TRY_POPCNT_FAST is set. + * the function pointers that are only used when TRY_POPCNT_X86_64 is set. */ -#ifdef TRY_POPCNT_FAST +#ifdef TRY_POPCNT_X86_64 /* * Does CPUID say there's support for XSAVE instructions? @@ -219,5 +219,5 @@ pg_popcount_masked_avx512(const char *buf, int bytes, bits8 mask) return _mm512_reduce_add_epi64(accum); } -#endif /* TRY_POPCNT_FAST */ +#endif /* TRY_POPCNT_X86_64 */ #endif /* USE_AVX512_POPCNT_WITH_RUNTIME_CHECK */ -- 2.39.5 (Apple Git-154)