diff options
| author | Alvaro Herrera | 2019-02-15 16:07:02 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2019-02-15 16:39:56 +0000 |
| commit | fc6c72747ae6db6909fcd7d1adbc3d923ec1fffa (patch) | |
| tree | 56b2b45a42608e52eae0d2602e067f7981c164c3 /config/c-compiler.m4 | |
| parent | b060e6c1f5b4609718468a0b6562dd03db26ea46 (diff) | |
Fix compiler builtin usage in new pg_bitutils.c
Split out these new functions in three parts: one in a new file that
uses the compiler builtin and gets compiled with the -mpopcnt compiler
option if it exists; another one that uses the compiler builtin but not
the compiler option; and finally the fallback with open-coded
algorithms.
Split out the configure logic: in the original commit, it was selecting
to use the -mpopcnt compiler switch together with deciding whether to
use the compiler builtin, but those two things are really separate.
Split them out. Also, expose whether the builtin exists to
Makefile.global, so that src/port's Makefile can decide whether to
compile the hw-optimized file.
Remove CPUID test for CTZ/CLZ. Make pg_{right,left}most_ones use either
the compiler intrinsic or open-coded algo; trying to use the
HW-optimized version is a waste of time. Make them static inline
functions.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'config/c-compiler.m4')
| -rw-r--r-- | config/c-compiler.m4 | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index 05fa82518f8..7c0d52b515f 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -381,22 +381,16 @@ fi])# PGAC_C_BUILTIN_OP_OVERFLOW # PGAC_C_BUILTIN_POPCOUNT # ------------------------- AC_DEFUN([PGAC_C_BUILTIN_POPCOUNT], -[define([Ac_cachevar], [AS_TR_SH([pgac_cv_popcount])])dnl -AC_CACHE_CHECK([for __builtin_popcount], [Ac_cachevar], -[pgac_save_CFLAGS=$CFLAGS -CFLAGS="$pgac_save_CFLAGS -mpopcnt" -AC_COMPILE_IFELSE([AC_LANG_SOURCE( -[static int x = __builtin_popcount(255);])], -[Ac_cachevar=yes], -[Ac_cachevar=no]) -CFLAGS="$pgac_save_CFLAGS"]) -if test x"$Ac_cachevar" = x"yes"; then - CFLAGS_POPCNT="-mpopcnt" +[AC_CACHE_CHECK([for __builtin_popcount], pgac_cv__builtin_popcount, +[AC_COMPILE_IFELSE([AC_LANG_SOURCE( +[static int x = __builtin_popcount(255);] +)], +[pgac_cv__builtin_popcount=yes], +[pgac_cv__builtin_popcount=no])]) +if test x"$pgac_cv__builtin_popcount" = x"yes"; then AC_DEFINE(HAVE__BUILTIN_POPCOUNT, 1, [Define to 1 if your compiler understands __builtin_popcount.]) -fi -undefine([Ac_cachevar])dnl -])# PGAC_C_BUILTIN_POPCOUNT +fi])# PGAC_C_BUILTIN_POPCOUNT |