Skip to content

Commit cc05a60

Browse files
apage43cebtenzzre
authored andcommitted
use mat*vec shaders for mat*mat
I wrote the mat*mat shaders from scratch so I understand them better but they are currently not faster than just multiply-invoking the mat*vec shaders, by a significant degree - so, except for f32 which needed a new shader, revert to the m*v ones here.
1 parent c1fd645 commit cc05a60

File tree

7 files changed

+27
-677
lines changed

7 files changed

+27
-677
lines changed

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -479,12 +479,7 @@ if (LLAMA_KOMPUTE)
479479
kompute/op_norm.comp
480480
kompute/op_rmsnorm.comp
481481
kompute/op_diagmask.comp
482-
kompute/op_mul_mat_mat_f16.comp
483482
kompute/op_mul_mat_mat_f32.comp
484-
kompute/op_mul_mat_mat_q4_0.comp
485-
kompute/op_mul_mat_mat_q4_1.comp
486-
kompute/op_mul_mat_mat_q8_0.comp
487-
kompute/op_mul_mat_mat_q6_k.comp
488483
kompute/op_mul_mat_f16.comp
489484
kompute/op_mul_mat_q8_0.comp
490485
kompute/op_mul_mat_q4_0.comp
@@ -515,12 +510,7 @@ if (LLAMA_KOMPUTE)
515510
shaderop_norm.h
516511
shaderop_rmsnorm.h
517512
shaderop_diagmask.h
518-
shaderop_mul_mat_mat_f16.h
519513
shaderop_mul_mat_mat_f32.h
520-
shaderop_mul_mat_mat_q4_0.h
521-
shaderop_mul_mat_mat_q4_1.h
522-
shaderop_mul_mat_mat_q8_0.h
523-
shaderop_mul_mat_mat_q6_k.h
524514
shaderop_mul_mat_f16.h
525515
shaderop_mul_mat_q8_0.h
526516
shaderop_mul_mat_q4_0.h

ggml-vulkan.cpp

Lines changed: 27 additions & 303 deletions
Large diffs are not rendered by default.

kompute/op_mul_mat_mat_f16.comp

Lines changed: 0 additions & 60 deletions
This file was deleted.

kompute/op_mul_mat_mat_q4_0.comp

Lines changed: 0 additions & 77 deletions
This file was deleted.

kompute/op_mul_mat_mat_q4_1.comp

Lines changed: 0 additions & 73 deletions
This file was deleted.

kompute/op_mul_mat_mat_q6_k.comp

Lines changed: 0 additions & 88 deletions
This file was deleted.

kompute/op_mul_mat_mat_q8_0.comp

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)