Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

k-quants : fix build on armv7 (android only) #2920

Merged
merged 5 commits into from
Sep 2, 2023
Merged

k-quants : fix build on armv7 (android only) #2920

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac67192
k-quants : fix build on armv7
jhen0409 Aug 31, 2023
d5d5c52
ggml : cleanup unused arm32 specific impl
jhen0409 Aug 31, 2023
9c6ea3b
Merge branch 'master' into armv7-qk
jhen0409 Sep 2, 2023
6f5dc9b
k-quants : avoid some unused vzero / mzero define
jhen0409 Sep 2, 2023
e5fe497
ggml-alloc : use 4g for MEASURE_MAX_SIZE in 32-bit arm
jhen0409 Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
k-quants : fix build on armv7
  • Loading branch information
@jhen0409
jhen0409 committed Aug 31, 2023
commit ac671922f72cb5b625ebced88a79a0251a5ff9b3
20 changes: 20 additions & 0 deletions k_quants.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,26 @@
//
#include <arm_neon.h>

#if !defined(__aarch64__)
inline static int32_t vaddvq_s16(int16x8_t v) {
return
(int32_t)vgetq_lane_s16(v, 0) + (int32_t)vgetq_lane_s16(v, 1) +
(int32_t)vgetq_lane_s16(v, 2) + (int32_t)vgetq_lane_s16(v, 3) +
(int32_t)vgetq_lane_s16(v, 4) + (int32_t)vgetq_lane_s16(v, 5) +
(int32_t)vgetq_lane_s16(v, 6) + (int32_t)vgetq_lane_s16(v, 7);
}

inline static int16x8_t vpaddq_s16(int16x8_t a, int16x8_t b) {
int16x4_t a0 = vpadd_s16(vget_low_s16(a), vget_high_s16(a));
int16x4_t b0 = vpadd_s16(vget_low_s16(b), vget_high_s16(b));
return vcombine_s16(a0, b0);
}

inline static int32_t vaddvq_s32(int32x4_t v) {
return vgetq_lane_s32(v, 0) + vgetq_lane_s32(v, 1) + vgetq_lane_s32(v, 2) + vgetq_lane_s32(v, 3);
}
#endif

#else

#ifdef __wasm_simd128__
Expand Down