@@ -367,6 +367,7 @@ struct ggml_backend_opencl_context {
367367 cl_program program_mul_mv_f16_f32;
368368 cl_program program_mul_mv_f32_f32;
369369 cl_program program_mul;
370+ cl_program program_mul_mat_f16_f32_tiled;
370371 cl_program program_div;
371372 cl_program program_sub;
372373 cl_program program_norm;
@@ -419,6 +420,7 @@ struct ggml_backend_opencl_context {
419420 cl_kernel kernel_mul_mat_f16_f32_1row;
420421 cl_kernel kernel_mul_mat_f16_f32;
421422 cl_kernel kernel_mul_mat_f16_f32_l4;
423+ cl_kernel kernel_mul_mat_f16_f32_tiled;
422424 cl_kernel kernel_mul_mat_q4_0_f32, kernel_mul_mat_q4_0_f32_v;
423425 cl_kernel kernel_convert_block_q4_0, kernel_restore_block_q4_0;
424426 cl_kernel kernel_mul_mat_q4_0_f32_8x_flat;
@@ -1000,6 +1002,22 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx, ggml_cl_ve
10001002 GGML_LOG_CONT (" ." );
10011003 }
10021004
1005+ // mul_mat_f16_f32_tiled
1006+ {
1007+ #ifdef GGML_OPENCL_EMBED_KERNELS
1008+ const std::string kernel_src {
1009+ #include " mul_mat_f16_f32.cl.h"
1010+ };
1011+ #else
1012+ const std::string kernel_src = read_file (" mul_mat_f16_f32.cl" );
1013+ #endif
1014+ backend_ctx->program_mul_mat_f16_f32_tiled =
1015+ build_program_from_source (backend_ctx->context , backend_ctx->device , kernel_src.c_str (), compile_opts);
1016+
1017+ CL_CHECK ((backend_ctx->kernel_mul_mat_f16_f32_tiled = clCreateKernel (backend_ctx->program_mul_mat_f16_f32_tiled , " mul_mat_f16_f32" , &err), err));
1018+ GGML_LOG_CONT (" ." );
1019+ }
1020+
10031021 // mul
10041022 {
10051023#ifdef GGML_OPENCL_EMBED_KERNELS
@@ -4742,6 +4760,47 @@ static void ggml_cl_timestep_embedding(ggml_backend_t backend, const ggml_tensor
47424760 backend_ctx->enqueue_ndrange_kernel (kernel, 3 , global_work_size, NULL , dst);
47434761}
47444762
4763+ static void ggml_cl_mul_mat_f16_f32_tiled (ggml_backend_t backend, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
4764+ ggml_backend_opencl_context *backend_ctx = (ggml_backend_opencl_context *)backend->context ;
4765+
4766+ ggml_tensor_extra_cl * extra0 = (ggml_tensor_extra_cl *)src0->extra ;
4767+ ggml_tensor_extra_cl * extra1 = (ggml_tensor_extra_cl *)src1->extra ;
4768+ ggml_tensor_extra_cl * extrad = (ggml_tensor_extra_cl *)dst->extra ;
4769+
4770+ cl_ulong offset0 = extra0->offset + src0->view_offs ;
4771+ cl_ulong offset1 = extra1->offset + src1->view_offs ;
4772+ cl_ulong offsetd = extrad->offset + dst->view_offs ;
4773+
4774+ const int M = src0->ne [1 ];
4775+ const int N = src1->ne [1 ];
4776+ const int K = src0->ne [0 ];
4777+
4778+ cl_kernel kernel = backend_ctx->kernel_mul_mat_f16_f32_tiled ;
4779+
4780+ CL_CHECK (clSetKernelArg (kernel, 0 , sizeof (int ), &M));
4781+ CL_CHECK (clSetKernelArg (kernel, 1 , sizeof (int ), &N));
4782+ CL_CHECK (clSetKernelArg (kernel, 2 , sizeof (int ), &K));
4783+ CL_CHECK (clSetKernelArg (kernel, 3 , sizeof (cl_mem), &extra0->data_device ));
4784+ CL_CHECK (clSetKernelArg (kernel, 4 , sizeof (cl_ulong), &offset0));
4785+ CL_CHECK (clSetKernelArg (kernel, 5 , sizeof (cl_mem), &extra1->data_device ));
4786+ CL_CHECK (clSetKernelArg (kernel, 6 , sizeof (cl_ulong), &offset1));
4787+ CL_CHECK (clSetKernelArg (kernel, 7 , sizeof (cl_mem), &extrad->data_device ));
4788+ CL_CHECK (clSetKernelArg (kernel, 8 , sizeof (cl_ulong), &offsetd));
4789+
4790+ const int OPWM = 64 ;
4791+ const int OPWN = 64 ;
4792+ const int TPWM = 16 ;
4793+ const int TPWN = 8 ;
4794+
4795+ size_t local_work_size[2 ] = { TPWM, TPWN };
4796+ size_t global_work_size[2 ] = {
4797+ (size_t ) ((M + OPWM - 1 ) / OPWM) * TPWM,
4798+ (size_t ) ((N + OPWN - 1 ) / OPWN) * TPWN,
4799+ };
4800+
4801+ backend_ctx->enqueue_ndrange_kernel (kernel, 2 , global_work_size, local_work_size, dst);
4802+ }
4803+
47454804static void ggml_cl_mul_mat (ggml_backend_t backend, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
47464805 GGML_ASSERT (src0);
47474806 GGML_ASSERT (src0->extra );
@@ -4755,6 +4814,18 @@ static void ggml_cl_mul_mat(ggml_backend_t backend, const ggml_tensor * src0, co
47554814
47564815 ggml_backend_opencl_context *backend_ctx = (ggml_backend_opencl_context *)backend->context ;
47574816
4817+ if (src0t == GGML_TYPE_F16 && src1t == GGML_TYPE_F32 &&
4818+ src0->ne [1 ] > 32 && // M > 32
4819+ src1->ne [1 ] > 32 && // N > 32
4820+ src0->ne [0 ] > 32 && // K > 32
4821+ src0->ne [2 ] == 1 && src0->ne [3 ] == 1 &&
4822+ src1->ne [2 ] == 1 && src1->ne [3 ] == 1 &&
4823+ ggml_is_contiguous (src0) && ggml_is_contiguous (src1) &&
4824+ backend_ctx->kernel_mul_mat_f16_f32_tiled != NULL ) {
4825+ ggml_cl_mul_mat_f16_f32_tiled (backend, src0, src1, dst);
4826+ return ;
4827+ }
4828+
47584829 ggml_tensor_extra_cl * extra0 = (ggml_tensor_extra_cl *)src0->extra ;
47594830 ggml_tensor_extra_cl * extra1 = (ggml_tensor_extra_cl *)src1->extra ;
47604831 ggml_tensor_extra_cl * extrad = (ggml_tensor_extra_cl *)dst->extra ;
0 commit comments