vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert xxhash fix and add brackets

Browse source
This commit is contained in:
domke 2024-08-02 12:36:46 +09:00
parent 4a03d0de27
commit e868aa928e
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/gguf-hash/deps/xxhash/xxhash.h
View file

@ -3739,8 +3739,6 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(XXH_NOESCAPE const XXH64_can
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
# if defined(__ARM_FEATURE_SVE) # if defined(__ARM_FEATURE_SVE)
# include <arm_sve.h> # include <arm_sve.h>
# include <sys/prctl.h>
int ggml_sve_cnt_b = 0;
# endif # endif
# if defined(__ARM_NEON__) || defined(__ARM_NEON) \ # if defined(__ARM_NEON__) || defined(__ARM_NEON) \
|| (defined(_M_ARM) && _M_ARM >= 7) \ || (defined(_M_ARM) && _M_ARM >= 7) \
@ -5497,9 +5495,7 @@ XXH3_accumulate_512_sve( void* XXH_RESTRICT acc,
const uint64_t *xinput = (const uint64_t *)(const void *)input; const uint64_t *xinput = (const uint64_t *)(const void *)input;
const uint64_t *xsecret = (const uint64_t *)(const void *)secret; const uint64_t *xsecret = (const uint64_t *)(const void *)secret;
svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1); svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1);
if (!ggml_sve_cnt_b) uint64_t element_count = svcntd();
ggml_sve_cnt_b = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL);
uint64_t element_count = ggml_sve_cnt_b / 8;
if (element_count >= 8) { if (element_count >= 8) {
svbool_t mask = svptrue_pat_b64(SV_VL8); svbool_t mask = svptrue_pat_b64(SV_VL8);
svuint64_t vacc = svld1_u64(mask, xacc); svuint64_t vacc = svld1_u64(mask, xacc);
@ -5541,9 +5537,7 @@ XXH3_accumulate_sve(xxh_u64* XXH_RESTRICT acc,
const uint64_t *xinput = (const uint64_t *)(const void *)input; const uint64_t *xinput = (const uint64_t *)(const void *)input;
const uint64_t *xsecret = (const uint64_t *)(const void *)secret; const uint64_t *xsecret = (const uint64_t *)(const void *)secret;
svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1); svuint64_t kSwap = sveor_n_u64_z(svptrue_b64(), svindex_u64(0, 1), 1);
if (!ggml_sve_cnt_b) uint64_t element_count = svcntd();
ggml_sve_cnt_b = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL);
uint64_t element_count = ggml_sve_cnt_b / 8;
if (element_count >= 8) { if (element_count >= 8) {
svbool_t mask = svptrue_pat_b64(SV_VL8); svbool_t mask = svptrue_pat_b64(SV_VL8);
svuint64_t vacc = svld1_u64(mask, xacc + 0); svuint64_t vacc = svld1_u64(mask, xacc + 0);

3
ggml/src/ggml.c
View file

@ -3479,8 +3479,9 @@ struct ggml_context * ggml_init(struct ggml_init_params params) {
ggml_assert_aligned(ctx->mem_buffer); ggml_assert_aligned(ctx->mem_buffer);
#if defined(__ARM_FEATURE_SVE) #if defined(__ARM_FEATURE_SVE)
if (!ggml_sve_cnt_b) if (!ggml_sve_cnt_b) {
ggml_sve_cnt_b = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL); ggml_sve_cnt_b = PR_SVE_VL_LEN_MASK & prctl(PR_SVE_GET_VL);
}
#endif #endif
GGML_PRINT_DEBUG("%s: context initialized\n", __func__); GGML_PRINT_DEBUG("%s: context initialized\n", __func__);