Skip to content

Commit 859cc43

Browse files
committed
SVE support for exponential functions
Add const notation to variable pg
1 parent 36d3f00 commit 859cc43

File tree

2 files changed

+54
-1
lines changed

2 files changed

+54
-1
lines changed

ggml/src/ggml-cpu/vec.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,12 @@ void ggml_vec_silu_f32(const int n, float * y, const float * x) {
247247
for (; i + 3 < n; i += 4) {
248248
_mm_storeu_ps(y + i, ggml_v_silu(_mm_loadu_ps(x + i)));
249249
}
250+
#elif defined(__ARM_FEATURE_SVE) && defined(__aarch64__)
251+
int vlen = svcntw();
252+
for (; i < n; i += vlen) {
253+
svbool_t pg = svwhilelt_b32_s32(i, n);
254+
svst1_f32(pg, y + i, ggml_v_silu(pg, svld1_f32(pg, x + i)));
255+
}
250256
#elif defined(__ARM_NEON) && defined(__aarch64__)
251257
for (; i + 3 < n; i += 4) {
252258
vst1q_f32(y + i, ggml_v_silu(vld1q_f32(x + i)));
@@ -271,6 +277,12 @@ void ggml_vec_swiglu_f32(const int n, float * y, const float * x, const float *
271277
for (; i + 3 < n; i += 4) {
272278
_mm_storeu_ps(y + i, _mm_mul_ps(ggml_v_silu(_mm_loadu_ps(x + i)), _mm_loadu_ps(g + i)));
273279
}
280+
#elif defined(__ARM_FEATURE_SVE) && defined(__aarch64__)
281+
int vlen = svcntw();
282+
for (; i < n; i += vlen) {
283+
const svbool_t pg = svwhilelt_b32_s32(i, n);
284+
svst1_f32(pg, y + i, svmul_f32_x(pg, ggml_v_silu(pg, svld1_f32(pg, x + i)), svld1_f32(pg, g + i)));
285+
}
274286
#elif defined(__ARM_NEON) && defined(__aarch64__)
275287
for (; i + 3 < n; i += 4) {
276288
vst1q_f32(y + i, vmulq_f32(ggml_v_silu(vld1q_f32(x + i)), vld1q_f32(g + i)));
@@ -318,6 +330,15 @@ ggml_float ggml_vec_soft_max_f32(const int n, float * y, const float * x, float
318330
#endif
319331
sum += (ggml_float)_mm_cvtss_f32(val);
320332
}
333+
#elif defined(__ARM_FEATURE_SVE) && defined(__aarch64__)
334+
int vlen = svcntw();
335+
for (; i < n; i += vlen) {
336+
const svbool_t pg = svwhilelt_b32_s32(i, n);
337+
svfloat32_t val = ggml_v_expf(pg, svsub_f32_x(pg, svld1_f32(pg, x + i),
338+
svdup_n_f32_x(pg, max)));
339+
svst1_f32(pg, y + i, val);
340+
sum += (ggml_float)svaddv_f32(pg, val);
341+
}
321342
#elif defined(__ARM_NEON) && defined(__aarch64__)
322343
for (; i + 3 < n; i += 4) {
323344
float32x4_t val = ggml_v_expf(vsubq_f32(vld1q_f32(x + i),

ggml/src/ggml-cpu/vec.h

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,39 @@ inline static ggml_fp16_t ggml_silu_f16(ggml_fp16_t x) {
737737
}
738738
#endif
739739

740-
#if defined(__ARM_NEON) && defined(__aarch64__)
740+
#if defined(__ARM_FEATURE_SVE) && defined(__aarch64__)
741+
742+
inline static svfloat32_t ggml_v_expf(svbool_t pg, svfloat32_t x) {
743+
const svfloat32_t r = svdup_n_f32_x(pg, 0x1.8p23f);
744+
const svfloat32_t z = svmla_n_f32_x(pg, r, x, 0x1.715476p+0f);
745+
const svfloat32_t n = svsub_f32_x(pg, z, r);
746+
const svfloat32_t b = svmls_n_f32_x(pg, svmls_n_f32_x(pg, x, n, 0x1.62e4p-1f), n, 0x1.7f7d1cp-20f);
747+
const svuint32_t e = svlsl_n_u32_x(pg, svreinterpret_u32_f32(z), 23);
748+
const svfloat32_t k = svreinterpret_f32_u32(svadd_u32_x(pg, e, svreinterpret_u32_f32(svdup_n_f32_x(pg, 1))));
749+
const svbool_t c = svacgt_n_f32(pg, n, 126);
750+
const svfloat32_t u = svmul_f32_x(pg, b, b);
751+
const svfloat32_t j = svmla_f32_x(pg,
752+
svmul_n_f32_x(pg, b, 0x1.ffffecp-1f),
753+
svmla_f32_x(pg, svmla_f32_x(pg, svdup_n_f32_x(pg, 0x1.fffdb6p-2f), svdup_n_f32_x(pg, 0x1.555e66p-3f), b),
754+
svmla_f32_x(pg, svdup_n_f32_x(pg, 0x1.573e2ep-5f), svdup_n_f32_x(pg, 0x1.0e4020p-7f), b), u), u);
755+
const svuint32_t d = svdup_n_u32_z(svcmple_n_f32(pg, n, 0.0), 0x82000000);
756+
const svfloat32_t s1 = svreinterpret_f32_u32(svadd_n_u32_x(pg, d, 0x7f000000));
757+
const svfloat32_t s2 = svreinterpret_f32_u32(svsub_u32_x(pg, e, d));
758+
return svsel_f32(svacgt_f32(pg, n, svdup_n_f32_x(pg, 192)), svmul_f32_x(pg, s1, s1),
759+
svsel_f32(c, svmul_f32_x(pg, svmla_f32_x(pg, s2, s2, j), s1), svmla_f32_x(pg, k, k, j)));
760+
}
761+
762+
// computes silu x/(1+exp(-x)) in single precision vector
763+
inline static svfloat32_t ggml_v_silu(svbool_t pg, svfloat32_t x) {
764+
const svfloat32_t one = svdup_n_f32_x(pg, 1.0f);
765+
const svfloat32_t zero = svdup_n_f32_x(pg, 0.0f);
766+
const svfloat32_t neg_x = svsub_f32_x(pg, zero, x);
767+
const svfloat32_t exp_neg_x = ggml_v_expf(pg, neg_x);
768+
const svfloat32_t one_plus_exp_neg_x = svadd_f32_x(pg, one, exp_neg_x);
769+
return svdiv_f32_x(pg, x, one_plus_exp_neg_x);
770+
}
771+
772+
#elif defined(__ARM_NEON) && defined(__aarch64__)
741773

742774
// adapted from arm limited optimized routine
743775
// the maximum error is 1.45358 plus 0.5 ulps

0 commit comments

Comments
 (0)