Macro 64-bit for Arm Neon

Yuqi Gu · Yuqi Gu · commit 5ff34d2f0db2 · 2021-03-31T02:02:58.000Z
Change-Id: If44e59356a644997c18bf513c8acd3bf83b69630
Signed-off-by: Yuqi Gu &lt;guyuqi@apache.com&gt;
diff --git a/include/xsimd/types/xsimd_neon_double.hpp b/include/xsimd/types/xsimd_neon_double.hpp
@@ -580,6 +580,7 @@ namespace xsimd
                 return vbslq_f64(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_f64(lhs, rhs);
@@ -589,6 +590,7 @@ namespace xsimd
             {
                 return vzip2q_f64(lhs, rhs);
             }
+#endif
 
             static batch_bool_type isnan(const batch_type& x)
             {
diff --git a/include/xsimd/types/xsimd_neon_float.hpp b/include/xsimd/types/xsimd_neon_float.hpp
@@ -639,6 +639,7 @@ namespace xsimd
                 return vbslq_f32(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_f32(lhs, rhs);
@@ -648,6 +649,7 @@ namespace xsimd
             {
                 return vzip2q_f32(lhs, rhs);
             }
+#endif
 
             static batch_bool_type isnan(const batch_type& x)
             {
diff --git a/include/xsimd/types/xsimd_neon_int16.hpp b/include/xsimd/types/xsimd_neon_int16.hpp
@@ -345,6 +345,7 @@ namespace xsimd
                 return vbslq_s16(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_s16(lhs, rhs);
@@ -354,6 +355,7 @@ namespace xsimd
             {
                 return vzip2q_s16(lhs, rhs);
             }
+#endif
         };
     }
 
diff --git a/include/xsimd/types/xsimd_neon_int32.hpp b/include/xsimd/types/xsimd_neon_int32.hpp
@@ -425,6 +425,7 @@ namespace xsimd
                 return vbslq_s32(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_s32(lhs, rhs);
@@ -434,6 +435,7 @@ namespace xsimd
             {
                 return vzip2q_s32(lhs, rhs);
             }
+#endif
         };
     }
 
diff --git a/include/xsimd/types/xsimd_neon_int64.hpp b/include/xsimd/types/xsimd_neon_int64.hpp
@@ -440,6 +440,7 @@ namespace xsimd
                 return vbslq_s64(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_s64(lhs, rhs);
@@ -449,6 +450,7 @@ namespace xsimd
             {
                 return vzip2q_s64(lhs, rhs);
             }
+#endif
         };
     }
 
diff --git a/include/xsimd/types/xsimd_neon_int8.hpp b/include/xsimd/types/xsimd_neon_int8.hpp
@@ -346,6 +346,7 @@ namespace xsimd
                 return vbslq_s8(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_s8(lhs, rhs);
@@ -355,6 +356,7 @@ namespace xsimd
             {
                 return vzip2q_s8(lhs, rhs);
             }
+#endif
         };
     }
 
diff --git a/include/xsimd/types/xsimd_neon_uint16.hpp b/include/xsimd/types/xsimd_neon_uint16.hpp
@@ -319,6 +319,7 @@ namespace xsimd
                 return vbslq_u16(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_u16(lhs, rhs);
@@ -328,6 +329,7 @@ namespace xsimd
             {
                 return vzip2q_u16(lhs, rhs);
             }
+#endif
         };
     }
 
diff --git a/include/xsimd/types/xsimd_neon_uint32.hpp b/include/xsimd/types/xsimd_neon_uint32.hpp
@@ -416,6 +416,7 @@ namespace xsimd
                 return vbslq_u32(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_u32(lhs, rhs);
@@ -425,6 +426,7 @@ namespace xsimd
             {
                 return vzip2q_u32(lhs, rhs);
             }
+#endif
         };
 
         inline batch<uint32_t, 4> shift_left(const batch<uint32_t, 4>& lhs, int32_t n)
diff --git a/include/xsimd/types/xsimd_neon_uint64.hpp b/include/xsimd/types/xsimd_neon_uint64.hpp
@@ -468,6 +468,7 @@ namespace xsimd
                 return vbslq_u64(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_u64(lhs, rhs);
@@ -477,6 +478,7 @@ namespace xsimd
             {
                 return vzip2q_u64(lhs, rhs);
             }
+#endif
         };
 
         inline batch<uint64_t, 2> shift_left(const batch<uint64_t, 2>& lhs, int32_t n)
diff --git a/include/xsimd/types/xsimd_neon_uint8.hpp b/include/xsimd/types/xsimd_neon_uint8.hpp
@@ -320,6 +320,7 @@ namespace xsimd
                 return vbslq_u8(cond, a, b);
             }
 
+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION
             static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)
             {
                 return vzip1q_u8(lhs, rhs);
@@ -329,6 +330,7 @@ namespace xsimd
             {
                 return vzip2q_u8(lhs, rhs);
             }
+#endif
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ namespace xsimd`
`580`	`580`	`return vbslq_f64(cond, a, b);`
`581`	`581`	`}`
`582`	`582`
	`583`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`583`	`584`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`584`	`585`	`{`
`585`	`586`	`return vzip1q_f64(lhs, rhs);`
`@@ -589,6 +590,7 @@ namespace xsimd`
`589`	`590`	`{`
`590`	`591`	`return vzip2q_f64(lhs, rhs);`
`591`	`592`	`}`
	`593`	`+#endif`
`592`	`594`
`593`	`595`	`static batch_bool_type isnan(const batch_type& x)`
`594`	`596`	`{`
Original file line number	Diff line number	Diff line change
`@@ -639,6 +639,7 @@ namespace xsimd`
`639`	`639`	`return vbslq_f32(cond, a, b);`
`640`	`640`	`}`
`641`	`641`
	`642`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`642`	`643`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`643`	`644`	`{`
`644`	`645`	`return vzip1q_f32(lhs, rhs);`
`@@ -648,6 +649,7 @@ namespace xsimd`
`648`	`649`	`{`
`649`	`650`	`return vzip2q_f32(lhs, rhs);`
`650`	`651`	`}`
	`652`	`+#endif`
`651`	`653`
`652`	`654`	`static batch_bool_type isnan(const batch_type& x)`
`653`	`655`	`{`
Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,7 @@ namespace xsimd`
`345`	`345`	`return vbslq_s16(cond, a, b);`
`346`	`346`	`}`
`347`	`347`
	`348`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`348`	`349`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`349`	`350`	`{`
`350`	`351`	`return vzip1q_s16(lhs, rhs);`
`@@ -354,6 +355,7 @@ namespace xsimd`
`354`	`355`	`{`
`355`	`356`	`return vzip2q_s16(lhs, rhs);`
`356`	`357`	`}`
	`358`	`+#endif`
`357`	`359`	`};`
`358`	`360`	`}`
`359`	`361`
Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,7 @@ namespace xsimd`
`425`	`425`	`return vbslq_s32(cond, a, b);`
`426`	`426`	`}`
`427`	`427`
	`428`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`428`	`429`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`429`	`430`	`{`
`430`	`431`	`return vzip1q_s32(lhs, rhs);`
`@@ -434,6 +435,7 @@ namespace xsimd`
`434`	`435`	`{`
`435`	`436`	`return vzip2q_s32(lhs, rhs);`
`436`	`437`	`}`
	`438`	`+#endif`
`437`	`439`	`};`
`438`	`440`	`}`
`439`	`441`
Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,7 @@ namespace xsimd`
`440`	`440`	`return vbslq_s64(cond, a, b);`
`441`	`441`	`}`
`442`	`442`
	`443`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`443`	`444`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`444`	`445`	`{`
`445`	`446`	`return vzip1q_s64(lhs, rhs);`
`@@ -449,6 +450,7 @@ namespace xsimd`
`449`	`450`	`{`
`450`	`451`	`return vzip2q_s64(lhs, rhs);`
`451`	`452`	`}`
	`453`	`+#endif`
`452`	`454`	`};`
`453`	`455`	`}`
`454`	`456`
Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,7 @@ namespace xsimd`
`346`	`346`	`return vbslq_s8(cond, a, b);`
`347`	`347`	`}`
`348`	`348`
	`349`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`349`	`350`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`350`	`351`	`{`
`351`	`352`	`return vzip1q_s8(lhs, rhs);`
`@@ -355,6 +356,7 @@ namespace xsimd`
`355`	`356`	`{`
`356`	`357`	`return vzip2q_s8(lhs, rhs);`
`357`	`358`	`}`
	`359`	`+#endif`
`358`	`360`	`};`
`359`	`361`	`}`
`360`	`362`
Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,7 @@ namespace xsimd`
`319`	`319`	`return vbslq_u16(cond, a, b);`
`320`	`320`	`}`
`321`	`321`
	`322`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`322`	`323`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`323`	`324`	`{`
`324`	`325`	`return vzip1q_u16(lhs, rhs);`
`@@ -328,6 +329,7 @@ namespace xsimd`
`328`	`329`	`{`
`329`	`330`	`return vzip2q_u16(lhs, rhs);`
`330`	`331`	`}`
	`332`	`+#endif`
`331`	`333`	`};`
`332`	`334`	`}`
`333`	`335`
Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,7 @@ namespace xsimd`
`416`	`416`	`return vbslq_u32(cond, a, b);`
`417`	`417`	`}`
`418`	`418`
	`419`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`419`	`420`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`420`	`421`	`{`
`421`	`422`	`return vzip1q_u32(lhs, rhs);`
`@@ -425,6 +426,7 @@ namespace xsimd`
`425`	`426`	`{`
`426`	`427`	`return vzip2q_u32(lhs, rhs);`
`427`	`428`	`}`
	`429`	`+#endif`
`428`	`430`	`};`
`429`	`431`
`430`	`432`	`inline batch<uint32_t, 4> shift_left(const batch<uint32_t, 4>& lhs, int32_t n)`
Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,7 @@ namespace xsimd`
`468`	`468`	`return vbslq_u64(cond, a, b);`
`469`	`469`	`}`
`470`	`470`
	`471`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`471`	`472`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`472`	`473`	`{`
`473`	`474`	`return vzip1q_u64(lhs, rhs);`
`@@ -477,6 +478,7 @@ namespace xsimd`
`477`	`478`	`{`
`478`	`479`	`return vzip2q_u64(lhs, rhs);`
`479`	`480`	`}`
	`481`	`+#endif`
`480`	`482`	`};`
`481`	`483`
`482`	`484`	`inline batch<uint64_t, 2> shift_left(const batch<uint64_t, 2>& lhs, int32_t n)`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,7 @@ namespace xsimd`
`320`	`320`	`return vbslq_u8(cond, a, b);`
`321`	`321`	`}`
`322`	`322`
	`323`	`+#if XSIMD_ARM_INSTR_SET >= XSIMD_ARM8_64_NEON_VERSION`
`323`	`324`	`static batch_type zip_lo(const batch_type& lhs, const batch_type& rhs)`
`324`	`325`	`{`
`325`	`326`	`return vzip1q_u8(lhs, rhs);`
`@@ -329,6 +330,7 @@ namespace xsimd`
`329`	`330`	`{`
`330`	`331`	`return vzip2q_u8(lhs, rhs);`
`331`	`332`	`}`
	`333`	`+#endif`
`332`	`334`	`};`
`333`	`335`	`}`
`334`	`336`