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

Revert "32 bit cache (slower)"

Browse source 
This reverts commit 5597614a30.
This commit is contained in:
Eve 2024-12-31 22:55:51 -05:00
parent 7d7a9e2401
commit 3c31ceac88
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ggml/src/ggml-vulkan/vulkan-shaders/mul_mat_vec_q6_k.comp
View file

@ -9,16 +9,9 @@ layout(local_size_x_id = 0, local_size_y = 1, local_size_z = 1) in;
layout (constant_id = 0) const uint BLOCK_SIZE = 32; layout (constant_id = 0) const uint BLOCK_SIZE = 32;
layout (constant_id = 1) const uint NUM_ROWS = 1; layout (constant_id = 1) const uint NUM_ROWS = 1;
// a 32 bit cache potentially might write faster due to banking
struct block_q6_K_32stor
{
uint32_t blk[104];
float16_t d;
};
shared FLOAT_TYPE tmpsh[NUM_ROWS][BLOCK_SIZE]; shared FLOAT_TYPE tmpsh[NUM_ROWS][BLOCK_SIZE];
shared FLOAT_TYPE sccache[BLOCK_SIZE/16][16]; shared FLOAT_TYPE sccache[BLOCK_SIZE/16][16];
shared block_q6_K_32stor blkcache[BLOCK_SIZE/16]; shared block_q6_K_packed16 blkcache[BLOCK_SIZE/16];
uint fill_blkcache_its(uint wg_size) { uint fill_blkcache_its(uint wg_size) {
// subgroup sizes are always a power of 2 // subgroup sizes are always a power of 2
@ -38,7 +31,7 @@ void fill_blkcache(const int num_blocks, const uint ib0, const uint i0, const ui
[[unroll]] for (int l = 0; l < num_blocks; ++l) { [[unroll]] for (int l = 0; l < num_blocks; ++l) {
[[unroll]] for (int m = 0; m < fbi; ++m) [[unroll]] for (int m = 0; m < fbi; ++m)
// cache full superblock into shared memory with coalesced reads // cache full superblock into shared memory with coalesced reads
blkcache[l].blk[tid + m*bc_t] = uint32_t(data_a_packed16[ib0 + i0 + l].blk[tid + m*bc_t]); blkcache[l].blk[tid + m*bc_t] = data_a_packed16[ib0 + i0 + l].blk[tid + m*bc_t];
} }
} }
} }