Skip to content

Commit bf4d1f4

Browse files
committed
Fix PPC64LE build failure with -mcpu=power9 flag
Fixes numpy#29622: VSX2 targets were missing -mvsx flag and incorrectly using VSX3 intrinsics. - Add -mvsx to VSX2 configuration - Guard VSX3 intrinsics with NPY__CPU_TARGET_VSX3 - Resolves build error when CFLAGS='-mcpu=power9' on PPC64LE
1 parent 388b918 commit bf4d1f4

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎meson_cpu/ppc64/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if compiler_id == 'clang'
1313
VSX.update(args: ['-mvsx', '-maltivec'])
1414
endif
1515
VSX2 = mod_features.new(
16-
'VSX2', 2, implies: VSX, args: {'val': '-mcpu=power8', 'match': '.*vsx'},
16+
'VSX2', 2, implies: VSX, args: ['-mcpu=power8', '-mvsx'],
1717
detect: {'val': 'VSX2', 'match': 'VSX'},
1818
test_code: files(source_root + '/numpy/distutils/checks/cpu_vsx2.c')[0],
1919
)

‎numpy/_core/src/common/half.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Half final {
3030
#if defined(NPY_HAVE_FP16)
3131
__m128 mf = _mm_load_ss(&f);
3232
bits_ = _mm_extract_epi16(_mm_cvtps_ph(mf, _MM_FROUND_TO_NEAREST_INT), 0);
33-
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX_ASM)
33+
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX_ASM) && defined(NPY__CPU_TARGET_VSX3)
3434
__vector float vf32 = vec_splats(f);
3535
__vector unsigned short vf16;
3636
__asm__ __volatile__ ("xvcvsphp %x0,%x1" : "=wa" (vf16) : "wa" (vf32));
@@ -55,7 +55,7 @@ class Half final {
5555
#if defined(NPY_HAVE_AVX512FP16)
5656
__m128d md = _mm_load_sd(&f);
5757
bits_ = _mm_extract_epi16(_mm_castph_si128(_mm_cvtpd_ph(md)), 0);
58-
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX3_HALF_DOUBLE)
58+
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX3_HALF_DOUBLE) && defined(NPY__CPU_TARGET_VSX3)
5959
__asm__ __volatile__ ("xscvdphp %x0,%x1" : "=wa" (bits_) : "wa" (f));
6060
#elif defined(__ARM_FP16_FORMAT_IEEE)
6161
__fp16 f16 = __fp16(f);
@@ -72,9 +72,9 @@ class Half final {
7272
float ret;
7373
_mm_store_ss(&ret, _mm_cvtph_ps(_mm_cvtsi32_si128(bits_)));
7474
return ret;
75-
#elif defined(NPY_HAVE_VSX3) && defined(vec_extract_fp_from_shorth)
75+
#elif defined(NPY_HAVE_VSX3) && defined(vec_extract_fp_from_shorth) && defined(NPY__CPU_TARGET_VSX3)
7676
return vec_extract(vec_extract_fp_from_shorth(vec_splats(bits_)), 0);
77-
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX_ASM)
77+
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX_ASM) && defined(NPY__CPU_TARGET_VSX3)
7878
__vector float vf32;
7979
__asm__ __volatile__("xvcvhpsp %x0,%x1"
8080
: "=wa"(vf32)
@@ -94,7 +94,7 @@ class Half final {
9494
double ret;
9595
_mm_store_sd(&ret, _mm_cvtph_pd(_mm_castsi128_ph(_mm_cvtsi32_si128(bits_))));
9696
return ret;
97-
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX3_HALF_DOUBLE)
97+
#elif defined(NPY_HAVE_VSX3) && defined(NPY_HAVE_VSX3_HALF_DOUBLE) && defined(NPY__CPU_TARGET_VSX3)
9898
double f64;
9999
__asm__ __volatile__("xscvhpdp %x0,%x1"
100100
: "=wa"(f64)

‎numpy/distutils/ccompiler_opt.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class attribute `conf_features`, also its override
485485
flags="-mvsx"
486486
),
487487
VSX2 = dict(
488-
flags="-mcpu=power8", implies_detect=False
488+
flags="-mcpu=power8 -mvsx", implies_detect=False
489489
),
490490
VSX3 = dict(
491491
flags="-mcpu=power9 -mtune=power9", implies_detect=False
@@ -496,7 +496,7 @@ class attribute `conf_features`, also its override
496496
)
497497
if self.cc_is_clang:
498498
partial["VSX"]["flags"] = "-maltivec -mvsx"
499-
partial["VSX2"]["flags"] = "-mcpu=power8"
499+
partial["VSX2"]["flags"] = "-mcpu=power8 -mvsx"
500500
partial["VSX3"]["flags"] = "-mcpu=power9"
501501
partial["VSX4"]["flags"] = "-mcpu=power10"
502502

0 commit comments

Comments
 (0)