Skip to content

Commit b504f2e

Browse files
cielavenircielavenir
committed
Use +sme for Apple
Signed-off-by: Taiju Yamada <[email protected]>
1 parent 496255c commit b504f2e

17 files changed

+81
-21
lines changed

‎erasure_code/aarch64/ec_aarch64_dispatcher.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ DEFINE_INTERFACE_DISPATCHER(gf_vect_dot_prod)
3838
if (auxval & HWCAP_ASIMD)
3939
return PROVIDER_INFO(gf_vect_dot_prod_neon);
4040
#elif defined(__APPLE__)
41-
if (sysctlEnabled(SYSCTL_SVE_KEY))
41+
if (sysctlEnabled(SYSCTL_SME_KEY))
4242
return PROVIDER_INFO(gf_vect_dot_prod_sve);
4343
return PROVIDER_INFO(gf_vect_dot_prod_neon);
4444
#endif
@@ -55,7 +55,7 @@ DEFINE_INTERFACE_DISPATCHER(gf_vect_mad)
5555
if (auxval & HWCAP_ASIMD)
5656
return PROVIDER_INFO(gf_vect_mad_neon);
5757
#elif defined(__APPLE__)
58-
if (sysctlEnabled(SYSCTL_SVE_KEY))
58+
if (sysctlEnabled(SYSCTL_SME_KEY))
5959
return PROVIDER_INFO(gf_vect_mad_sve);
6060
return PROVIDER_INFO(gf_vect_mad_neon);
6161
#endif
@@ -72,7 +72,7 @@ DEFINE_INTERFACE_DISPATCHER(ec_encode_data)
7272
if (auxval & HWCAP_ASIMD)
7373
return PROVIDER_INFO(ec_encode_data_neon);
7474
#elif defined(__APPLE__)
75-
if (sysctlEnabled(SYSCTL_SVE_KEY))
75+
if (sysctlEnabled(SYSCTL_SME_KEY))
7676
return PROVIDER_INFO(ec_encode_data_sve);
7777
return PROVIDER_INFO(ec_encode_data_neon);
7878
#endif
@@ -89,7 +89,7 @@ DEFINE_INTERFACE_DISPATCHER(ec_encode_data_update)
8989
if (auxval & HWCAP_ASIMD)
9090
return PROVIDER_INFO(ec_encode_data_update_neon);
9191
#elif defined(__APPLE__)
92-
if (sysctlEnabled(SYSCTL_SVE_KEY))
92+
if (sysctlEnabled(SYSCTL_SME_KEY))
9393
return PROVIDER_INFO(ec_encode_data_update_sve);
9494
return PROVIDER_INFO(ec_encode_data_update_neon);
9595
#endif
@@ -106,7 +106,7 @@ DEFINE_INTERFACE_DISPATCHER(gf_vect_mul)
106106
if (auxval & HWCAP_ASIMD)
107107
return PROVIDER_INFO(gf_vect_mul_neon);
108108
#elif defined(__APPLE__)
109-
if (sysctlEnabled(SYSCTL_SVE_KEY))
109+
if (sysctlEnabled(SYSCTL_SME_KEY))
110110
return PROVIDER_INFO(gf_vect_mul_sve);
111111
return PROVIDER_INFO(gf_vect_mul_neon);
112112
#endif

‎erasure_code/aarch64/gf_2vect_dot_prod_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -98,7 +102,7 @@ cdecl(gf_2vect_dot_prod_sve):
98102
/* Loop 1: x_len, vector length */
99103
.Lloopsve_vl:
100104
whilelo p0.b, x_pos, x_len
101-
b.none .return_pass
105+
b.eq .return_pass
102106

103107
mov x_vec_i, #0 /* clear x_vec_i */
104108
ldr x_ptr, [x_src, x_vec_i] /* x_ptr: src base addr. */

‎erasure_code/aarch64/gf_2vect_mad_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -104,7 +108,7 @@ cdecl(gf_2vect_mad_sve):
104108
/* vector length agnostic */
105109
.Lloopsve_vl:
106110
whilelo p0.b, x_pos, x_len
107-
b.none .return_pass
111+
b.eq .return_pass
108112

109113
/* prefetch dest data */
110114
prfb pldl2strm, p0, [x_dest1, x_pos]

‎erasure_code/aarch64/gf_3vect_dot_prod_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -107,7 +111,7 @@ cdecl(gf_3vect_dot_prod_sve):
107111
/* Loop 1: x_len, vector length */
108112
.Lloopsve_vl:
109113
whilelo p0.b, x_pos, x_len
110-
b.none .return_pass
114+
b.eq .return_pass
111115

112116
mov x_vec_i, #0 /* clear x_vec_i */
113117
ldr x_ptr, [x_src, x_vec_i] /* x_ptr: src base addr. */

‎erasure_code/aarch64/gf_3vect_mad_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -115,7 +119,7 @@ cdecl(gf_3vect_mad_sve):
115119
/* vector length agnostic */
116120
.Lloopsve_vl:
117121
whilelo p0.b, x_pos, x_len
118-
b.none .return_pass
122+
b.eq .return_pass
119123

120124
/* dest data prefetch */
121125
prfb pldl2strm, p0, [x_dest1, x_pos]

‎erasure_code/aarch64/gf_4vect_dot_prod_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -115,7 +119,7 @@ cdecl(gf_4vect_dot_prod_sve):
115119
/* Loop 1: x_len, vector length */
116120
.Lloopsve_vl:
117121
whilelo p0.b, x_pos, x_len
118-
b.none .return_pass
122+
b.eq .return_pass
119123

120124
mov x_vec_i, #0 /* clear x_vec_i */
121125
ldr x_ptr, [x_src, x_vec_i] /* x_ptr: src base addr. */

‎erasure_code/aarch64/gf_4vect_mad_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -126,7 +130,7 @@ cdecl(gf_4vect_mad_sve):
126130
/* vector length agnostic */
127131
.Lloopsve_vl:
128132
whilelo p0.b, x_pos, x_len
129-
b.none .return_pass
133+
b.eq .return_pass
130134

131135
prfb pldl2strm, p0, [x_dest1, x_pos]
132136
prfb pldl2strm, p0, [x_dest2, x_pos]

‎erasure_code/aarch64/gf_5vect_dot_prod_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -128,7 +132,7 @@ cdecl(gf_5vect_dot_prod_sve):
128132
/* Loop 1: x_len, vector length */
129133
.Lloopsve_vl:
130134
whilelo p0.b, x_pos, x_len
131-
b.none .return_pass
135+
b.eq .return_pass
132136

133137
mov x_vec_i, #0 /* clear x_vec_i */
134138
ldr x_ptr, [x_src, x_vec_i] /* x_ptr: src base addr. */

‎erasure_code/aarch64/gf_5vect_mad_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -137,7 +141,7 @@ cdecl(gf_5vect_mad_sve):
137141
/* vector length agnostic */
138142
.Lloopsve_vl:
139143
whilelo p0.b, x_pos, x_len
140-
b.none .return_pass
144+
b.eq .return_pass
141145

142146
prfb pldl2strm, p0, [x_dest1, x_pos]
143147
prfb pldl2strm, p0, [x_dest2, x_pos]

‎erasure_code/aarch64/gf_6vect_dot_prod_sve.S‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
**********************************************************************/
2929
.text
3030
.align 6
31+
#ifdef __APPLE__
32+
.arch armv8-a+sme
33+
#else
3134
.arch armv8-a+sve
35+
#endif
3236

3337
#include "../include/aarch64_label.h"
3438

@@ -137,7 +141,7 @@ cdecl(gf_6vect_dot_prod_sve):
137141
/* Loop 1: x_len, vector length */
138142
.Lloopsve_vl:
139143
whilelo p0.b, x_pos, x_len
140-
b.none .return_pass
144+
b.eq .return_pass
141145

142146
mov x_vec_i, #0 /* clear x_vec_i */
143147
ldr x_ptr, [x_src, x_vec_i] /* x_ptr: src base addr. */

0 commit comments

Comments
 (0)