Fix __attribute__((target(...))) usage.

nathan-bossart · nathan-bossart · commit 41b98ddb77bf · 2024-11-07T15:27:32.000-06:00
The commonly supported way to specify multiple target options is to surround the entire list with quotes and to use a comma (with no extra spaces) as the delimiter. Oversight in commit f78667b. Discussion: https://postgr.es/m/Zy0jya8nF8CPpv3B%40nathan
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
@@ -733,7 +733,7 @@ AC_DEFUN([PGAC_AVX512_POPCNT_INTRINSICS],
 AC_CACHE_CHECK([for _mm512_popcnt_epi64], [Ac_cachevar],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <immintrin.h>
     #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("avx512vpopcntdq","avx512bw")))
+    __attribute__((target("avx512vpopcntdq,avx512bw")))
     #endif
     static int popcount_test(void)
     {
diff --git a/configure b/configure
@@ -17324,7 +17324,7 @@ else
 /* end confdefs.h.  */
 #include <immintrin.h>
     #if defined(__has_attribute) && __has_attribute (target)
-    __attribute__((target("avx512vpopcntdq","avx512bw")))
+    __attribute__((target("avx512vpopcntdq,avx512bw")))
     #endif
     static int popcount_test(void)
     {
diff --git a/meson.build b/meson.build
@@ -2184,7 +2184,7 @@ if host_cpu == 'x86_64'
 #include <immintrin.h>
 
 #if defined(__has_attribute) && __has_attribute (target)
-__attribute__((target("avx512vpopcntdq","avx512bw")))
+__attribute__((target("avx512vpopcntdq,avx512bw")))
 #endif
 int main(void)
 {
diff --git a/src/port/pg_popcount_avx512.c b/src/port/pg_popcount_avx512.c
@@ -106,7 +106,7 @@ pg_popcount_avx512_available(void)
  * pg_popcount_avx512
  *		Returns the number of 1-bits in buf
  */
-pg_attribute_target("avx512vpopcntdq", "avx512bw")
+pg_attribute_target("avx512vpopcntdq,avx512bw")
 uint64
 pg_popcount_avx512(const char *buf, int bytes)
 {
@@ -162,7 +162,7 @@ pg_popcount_avx512(const char *buf, int bytes)
  * pg_popcount_masked_avx512
  *		Returns the number of 1-bits in buf after applying the mask to each byte
  */
-pg_attribute_target("avx512vpopcntdq", "avx512bw")
+pg_attribute_target("avx512vpopcntdq,avx512bw")
 uint64
 pg_popcount_masked_avx512(const char *buf, int bytes, bits8 mask)
 {

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ AC_DEFUN([PGAC_AVX512_POPCNT_INTRINSICS],`
`733`	`733`	`AC_CACHE_CHECK([for _mm512_popcnt_epi64], [Ac_cachevar],`
`734`	`734`	`[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <immintrin.h>`
`735`	`735`	`#if defined(__has_attribute) && __has_attribute (target)`
`736`		`- __attribute__((target("avx512vpopcntdq","avx512bw")))`
	`736`	`+ __attribute__((target("avx512vpopcntdq,avx512bw")))`
`737`	`737`	`#endif`
`738`	`738`	`static int popcount_test(void)`
`739`	`739`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17324,7 +17324,7 @@ else`
`17324`	`17324`	`/* end confdefs.h. */`
`17325`	`17325`	`#include <immintrin.h>`
`17326`	`17326`	`#if defined(__has_attribute) && __has_attribute (target)`
`17327`		`- __attribute__((target("avx512vpopcntdq","avx512bw")))`
	`17327`	`+ __attribute__((target("avx512vpopcntdq,avx512bw")))`
`17328`	`17328`	`#endif`
`17329`	`17329`	`static int popcount_test(void)`
`17330`	`17330`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2184,7 +2184,7 @@ if host_cpu == 'x86_64'`
`2184`	`2184`	`#include <immintrin.h>`
`2185`	`2185`
`2186`	`2186`	`#if defined(__has_attribute) && __has_attribute (target)`
`2187`		`-__attribute__((target("avx512vpopcntdq","avx512bw")))`
	`2187`	`+__attribute__((target("avx512vpopcntdq,avx512bw")))`
`2188`	`2188`	`#endif`
`2189`	`2189`	`int main(void)`
`2190`	`2190`	`{`