Apply suggestions from code review

slaren · web-flow · commit 1c8ba922ec6a · 2024-12-31T14:44:19.000+01:00
diff --git a/ggml/src/ggml-cpu/ggml-cpu-aarch64.cpp b/ggml/src/ggml-cpu/ggml-cpu-aarch64.cpp
@@ -194,7 +194,7 @@ static inline __m256i sum_i16_pairs_int32x8(const __m256i x) {
 }
 
 static inline __m256i mul_sum_us8_pairs_int32x8(const __m256i ax, const __m256i sy) {
-#if  defined(__AVX512VNNI__) && defined(__AVX512VL__)
+#if defined(__AVX512VNNI__) && defined(__AVX512VL__)
     const __m256i zero = _mm256_setzero_si256();
     return _mm256_dpbusd_epi32(zero, ax, sy);
 #elif defined(__AVXVNNI__)
diff --git a/ggml/src/ggml-cpu/ggml-cpu-quants.c b/ggml/src/ggml-cpu/ggml-cpu-quants.c
@@ -103,7 +103,7 @@ static inline __m256 sum_i16_pairs_float(const __m256i x) {
 }
 
 static inline __m256 mul_sum_us8_pairs_float(const __m256i ax, const __m256i sy) {
-#if  defined(__AVX512VNNI__) && defined(__AVX512VL__)
+#if defined(__AVX512VNNI__) && defined(__AVX512VL__)
     const __m256i zero = _mm256_setzero_si256();
     const __m256i summed_pairs = _mm256_dpbusd_epi32(zero, ax, sy);
     return _mm256_cvtepi32_ps(summed_pairs);
diff --git a/ggml/src/ggml-cpu/llamafile/sgemm.cpp b/ggml/src/ggml-cpu/llamafile/sgemm.cpp
@@ -1000,7 +1000,7 @@ class tinyBLAS_Q0_AVX {
 
     inline __m256 updot(__m256i u, __m256i s) {
         __m256i res;
-#if  defined(__AVX512VNNI__) && defined(__AVX512VL__)
+#if defined(__AVX512VNNI__) && defined(__AVX512VL__)
         res = _mm256_dpbusd_epi32(_mm256_setzero_si256(), u, s);
 #elif defined(__AVXVNNI__)
         res = _mm256_dpbusd_avx_epi32(_mm256_setzero_si256(), u, s);

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ static inline __m256i sum_i16_pairs_int32x8(const __m256i x) {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`static inline __m256i mul_sum_us8_pairs_int32x8(const __m256i ax, const __m256i sy) {`
`197`		`-#if defined(__AVX512VNNI__) && defined(__AVX512VL__)`
	`197`	`+#if defined(__AVX512VNNI__) && defined(__AVX512VL__)`
`198`	`198`	`const __m256i zero = _mm256_setzero_si256();`
`199`	`199`	`return _mm256_dpbusd_epi32(zero, ax, sy);`
`200`	`200`	`#elif defined(__AVXVNNI__)`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static inline __m256 sum_i16_pairs_float(const __m256i x) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`static inline __m256 mul_sum_us8_pairs_float(const __m256i ax, const __m256i sy) {`
`106`		`-#if defined(__AVX512VNNI__) && defined(__AVX512VL__)`
	`106`	`+#if defined(__AVX512VNNI__) && defined(__AVX512VL__)`
`107`	`107`	`const __m256i zero = _mm256_setzero_si256();`
`108`	`108`	`const __m256i summed_pairs = _mm256_dpbusd_epi32(zero, ax, sy);`
`109`	`109`	`return _mm256_cvtepi32_ps(summed_pairs);`