diff --git a/ggml/src/iqk/iqk_gemm_ktquants.cpp b/ggml/src/iqk/iqk_gemm_ktquants.cpp index 584b8786..0a0d3d0b 100644 --- a/ggml/src/iqk/iqk_gemm_ktquants.cpp +++ b/ggml/src/iqk/iqk_gemm_ktquants.cpp @@ -170,6 +170,40 @@ struct Trellis3 { return _mm256_permutevar8x32_epi32(aux[0], shuffle); } } + IQK_ALWAYS_INLINE inline void next_128(const uint32_t * val, __m256i * result) const { + __m256i aux[16]; + auto perm = _mm256_setr_epi32(0, 2, 4, 6, 1, 3, 5, 7); + for (int k = 0; k < 4; ++k) { + auto v = _mm256_loadu_si256((const __m256i *)val + k); + v = _mm256_permutevar8x32_epi32(v, perm); + aux[4*k+0] = _mm256_shuffle_epi32(v, 0x00); + aux[4*k+1] = _mm256_shuffle_epi32(v, 0x55); + aux[4*k+2] = _mm256_shuffle_epi32(v, 0xaa); + aux[4*k+3] = _mm256_shuffle_epi32(v, 0xff); + } + for (int i = 0; i < 16; ++i) { + aux[i] = _mm256_mullo_epi32(aux[i], mka); + } + auto mask = _mm256_set1_epi32(0x3f3f3f3f); + for (int i = 0; i < 16; ++i) { + aux[i] = _mm256_and_si256(aux[i], mask); + } + auto offset = _mm256_set1_epi32(-126); + auto m1 = _mm256_set1_epi32(0x01010101); + for (int i = 0; i < 16; ++i) { + aux[i] = _mm256_dpbusd_epi32(offset, aux[i], m1); + } + for (int k = 0; k < 4; ++k) { + auto v1 = _mm256_packs_epi32(aux[4*k+0], aux[4*k+1]); + auto v2 = _mm256_packs_epi32(aux[4*k+2], aux[4*k+3]); + result[k] = _mm256_permutevar8x32_epi32(_mm256_packs_epi16(v1, v2), shuffle); + } + if constexpr (is_abs) { + for (int k = 0; k < 4; ++k) { + result[k] = _mm256_sign_epi8(result[k], result[k]); + } + } + } IQK_ALWAYS_INLINE inline void next_128(const uint16_t * val, uint32_t v0, __m256i * result) const { __m256i aux[16]; for (int k = 0; k < 4; ++k) { @@ -951,17 +985,14 @@ void mul_mat_iq4_kt_q8_2_x4_T(int n, const void * vx, size_t bx, const DataInfo& } } for (int i128 = 0; i128 < 2; ++i128) { - //for (int k = 0; k < 4; ++k) xv[k] = trellis.next32(values + 32*i128 + 8*k); - for (int k = 0; k < 4; ++k) xv[k] = trellis.next32(values + 32*i128 + 8*k); + //for (int k = 0; k < 4; ++k) xv[k] = trellis.next32(values + 32*i128 + 8*k); + trellis.next_128(values + 32*i128, xv); for (int iy = 0; iy < nrc_y; ++iy) { const block_q8_2_x4& yb = y[iy][2*i+i128]; - auto dy = _mm256_castsi256_ps(_mm256_slli_epi32(_mm256_cvtepu16_epi32(_mm_loadu_si128((const __m128i *)yb.d)), 16)); - dy = _mm256_mul_ps(scales[i128], dy); - auto d8 = _mm256_set_m128(_mm256_castps256_ps128(dy), _mm256_castps256_ps128(dy)); - //auto m8 = _mm256_set_m128(_mm256_extractf128_ps(dy, 1), _mm256_extractf128_ps(dy, 1)); + auto dy4 = _mm_castsi128_ps(_mm_slli_epi32(_mm_cvtepu16_epi32(_mm_loadl_epi64((const __m128i *)yb.d)), 16)); + auto dy8 = _mm256_mul_ps(scales[i128], _mm256_set_m128(dy4, dy4)); compute_dot(yb.qs); - accd[iy] = _mm256_fmadd_ps(d8, sum_4(), accd[iy]); - //accd[iy] = _mm256_fmadd_ps(m8, m126, accd[iy]); + accd[iy] = _mm256_fmadd_ps(dy8, sum_4(), accd[iy]); } } }