aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarat Dukhan <marat@fb.com>2018-09-06 18:40:13 +0300
committerMarat Dukhan <marat@fb.com>2018-09-06 18:48:45 +0300
commit0abf73c30911c8cb4e8624b2e02c320f2744783f (patch)
tree3b4776e35c6ddadeb7e5c14adb6f9f6fbd1bbdd5
parent3d8bfe7318423462a6d9e0c6537e75efd4822c49 (diff)
downloadpsimd-0abf73c30911c8cb4e8624b2e02c320f2744783f.tar.gz
Recognize both __ARM_NEON__ and __ARM_NEON as NEON macros
-rw-r--r--include/psimd.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/include/psimd.h b/include/psimd.h
index 9396528..b280d97 100644
--- a/include/psimd.h
+++ b/include/psimd.h
@@ -532,7 +532,7 @@
/* Vector blend */
PSIMD_INTRINSIC psimd_s8 psimd_blend_s8(psimd_s8 mask, psimd_s8 a, psimd_s8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s8) vbslq_s8((uint8x16_t) mask, (int8x16_t) a, (int8x16_t) b);
#else
return (mask & a) | (~mask & b);
@@ -540,7 +540,7 @@
}
PSIMD_INTRINSIC psimd_u8 psimd_blend_u8(psimd_u8 mask, psimd_u8 a, psimd_u8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u8) vbslq_u8((uint8x16_t) mask, (uint8x16_t) a, (uint8x16_t) b);
#else
return (mask & a) | (~mask & b);
@@ -548,7 +548,7 @@
}
PSIMD_INTRINSIC psimd_s16 psimd_blend_s16(psimd_s16 mask, psimd_s16 a, psimd_s16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s16) vbslq_s16((uint16x8_t) mask, (int16x8_t) a, (int16x8_t) b);
#else
return (mask & a) | (~mask & b);
@@ -556,7 +556,7 @@
}
PSIMD_INTRINSIC psimd_u16 psimd_blend_u16(psimd_u16 mask, psimd_u16 a, psimd_u16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u16) vbslq_u16((uint16x8_t) mask, (uint16x8_t) a, (uint16x8_t) b);
#else
return (mask & a) | (~mask & b);
@@ -564,7 +564,7 @@
}
PSIMD_INTRINSIC psimd_s32 psimd_blend_s32(psimd_s32 mask, psimd_s32 a, psimd_s32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s32) vbslq_s32((uint32x4_t) mask, (int32x4_t) a, (int32x4_t) b);
#else
return (mask & a) | (~mask & b);
@@ -572,7 +572,7 @@
}
PSIMD_INTRINSIC psimd_u32 psimd_blend_u32(psimd_u32 mask, psimd_u32 a, psimd_u32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u32) vbslq_u32((uint32x4_t) mask, (uint32x4_t) a, (uint32x4_t) b);
#else
return (mask & a) | (~mask & b);
@@ -580,7 +580,7 @@
}
PSIMD_INTRINSIC psimd_f32 psimd_blend_f32(psimd_s32 mask, psimd_f32 a, psimd_f32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_f32) vbslq_f32((uint32x4_t) mask, (float32x4_t) a, (float32x4_t) b);
#else
return (psimd_f32) psimd_blend_s32(mask, (psimd_s32) a, (psimd_s32) b);
@@ -631,7 +631,7 @@
/* Vector maximum */
PSIMD_INTRINSIC psimd_s8 psimd_max_s8(psimd_s8 a, psimd_s8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s8) vmaxq_s8((int8x16_t) a, (int8x16_t) b);
#else
return psimd_blend_s8(a > b, a, b);
@@ -639,7 +639,7 @@
}
PSIMD_INTRINSIC psimd_u8 psimd_max_u8(psimd_u8 a, psimd_u8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u8) vmaxq_u8((uint8x16_t) a, (uint8x16_t) b);
#else
return psimd_blend_u8(a > b, a, b);
@@ -647,7 +647,7 @@
}
PSIMD_INTRINSIC psimd_s16 psimd_max_s16(psimd_s16 a, psimd_s16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s16) vmaxq_s16((int16x8_t) a, (int16x8_t) b);
#else
return psimd_blend_s16(a > b, a, b);
@@ -655,7 +655,7 @@
}
PSIMD_INTRINSIC psimd_u16 psimd_max_u16(psimd_u16 a, psimd_u16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u16) vmaxq_u16((uint16x8_t) a, (uint16x8_t) b);
#else
return psimd_blend_u16(a > b, a, b);
@@ -663,7 +663,7 @@
}
PSIMD_INTRINSIC psimd_s32 psimd_max_s32(psimd_s32 a, psimd_s32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s32) vmaxq_s32((int32x4_t) a, (int32x4_t) b);
#else
return psimd_blend_s32(a > b, a, b);
@@ -671,7 +671,7 @@
}
PSIMD_INTRINSIC psimd_u32 psimd_max_u32(psimd_u32 a, psimd_u32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u32) vmaxq_u32((uint32x4_t) a, (uint32x4_t) b);
#else
return psimd_blend_u32(a > b, a, b);
@@ -679,7 +679,7 @@
}
PSIMD_INTRINSIC psimd_f32 psimd_max_f32(psimd_f32 a, psimd_f32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_f32) vmaxq_f32((float32x4_t) a, (float32x4_t) b);
#else
return psimd_blend_f32(a > b, a, b);
@@ -688,7 +688,7 @@
/* Vector minimum */
PSIMD_INTRINSIC psimd_s8 psimd_min_s8(psimd_s8 a, psimd_s8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s8) vminq_s8((int8x16_t) a, (int8x16_t) b);
#else
return psimd_blend_s8(a < b, a, b);
@@ -696,7 +696,7 @@
}
PSIMD_INTRINSIC psimd_u8 psimd_min_u8(psimd_u8 a, psimd_u8 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u8) vminq_u8((uint8x16_t) a, (uint8x16_t) b);
#else
return psimd_blend_u8(a < b, a, b);
@@ -704,7 +704,7 @@
}
PSIMD_INTRINSIC psimd_s16 psimd_min_s16(psimd_s16 a, psimd_s16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s16) vminq_s16((int16x8_t) a, (int16x8_t) b);
#else
return psimd_blend_s16(a < b, a, b);
@@ -712,7 +712,7 @@
}
PSIMD_INTRINSIC psimd_u16 psimd_min_u16(psimd_u16 a, psimd_u16 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u16) vminq_u16((uint16x8_t) a, (uint16x8_t) b);
#else
return psimd_blend_u16(a < b, a, b);
@@ -720,7 +720,7 @@
}
PSIMD_INTRINSIC psimd_s32 psimd_min_s32(psimd_s32 a, psimd_s32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_s32) vminq_s32((int32x4_t) a, (int32x4_t) b);
#else
return psimd_blend_s32(a < b, a, b);
@@ -728,7 +728,7 @@
}
PSIMD_INTRINSIC psimd_u32 psimd_min_u32(psimd_u32 a, psimd_u32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_u32) vminq_u32((uint32x4_t) a, (uint32x4_t) b);
#else
return psimd_blend_u32(a < b, a, b);
@@ -736,7 +736,7 @@
}
PSIMD_INTRINSIC psimd_f32 psimd_min_f32(psimd_f32 a, psimd_f32 b) {
- #if defined(__ARM_NEON__)
+ #if defined(__ARM_NEON__) || defined(__ARM_NEON)
return (psimd_f32) vminq_f32((float32x4_t) a, (float32x4_t) b);
#else
return psimd_blend_f32(a < b, a, b);