From 67d220210fed9b6b399820a7b01977e404e1a02e Mon Sep 17 00:00:00 2001
From: 0cc4m <picard12@live.de>
Date: Wed, 12 Apr 2023 23:09:12 +0200
Subject: [PATCH] Revert buffer changes, no improvements in benchmarks

---
 ggml_blas_adapter.c | 67 ++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/ggml_blas_adapter.c b/ggml_blas_adapter.c
index 50faf3807..d41b001c9 100644
--- a/ggml_blas_adapter.c
+++ b/ggml_blas_adapter.c
@@ -19,15 +19,14 @@ cl_device_id device;
 cl_context context;
 cl_command_queue queue;
 bool cl_initialized = false;
-size_t cl_size_a = 0, cl_size_b = 0, cl_size_c = 0;
-cl_mem cl_buffer_a, cl_buffer_b, cl_buffer_c;
 
 static void ggml_cl_sgemm_wrapper(const enum CBLAS_ORDER order, const enum CBLAS_TRANSPOSE trans_a, const enum CBLAS_TRANSPOSE trans_b, const int m, const int n, const int k, const float alpha, const float *host_a, const int lda, const float *host_b, const int ldb, const float beta, float *host_c, const int ldc) {
     cl_int err = 0;
 
-    cl_event events[2];
+    cl_event events[3];
     events[0] = NULL;
     events[1] = NULL;
+    events[2] = NULL;
 
     if (!cl_initialized) {
         char * KCPP_CLBLAST_PLATFORM = getenv("KCPP_CLBLAST_PLATFORM");
@@ -66,55 +65,33 @@ static void ggml_cl_sgemm_wrapper(const enum CBLAS_ORDER order, const enum CBLAS
         free(platforms);
         free(devices);
 
-        cl_size_a = m * k * sizeof(float);
-        cl_size_b = n * k * sizeof(float);
-        cl_size_c = m * n * sizeof(float);
-
-        // Prepare buffers
-        cl_buffer_a = clCreateBuffer(context, CL_MEM_READ_ONLY, cl_size_a, NULL, &err);
-        if (err != CL_SUCCESS) {
-            printf("Error creating OpenCL Buffer A: %d\n", err);
-            fflush(stdout);
-        }
-        cl_buffer_b = clCreateBuffer(context, CL_MEM_READ_ONLY, cl_size_b, NULL, &err);
-        if (err != CL_SUCCESS) {
-            printf("Error creating OpenCL Buffer B: %d\n", err);
-            fflush(stdout);
-        }
-        cl_buffer_c = clCreateBuffer(context, CL_MEM_READ_WRITE, cl_size_c, NULL, &err);
-        if (err != CL_SUCCESS) {
-            printf("Error creating OpenCL Buffer C: %d\n", err);
-            fflush(stdout);
-        }
-
         cl_initialized = true;
     }
 
-    // Resize buffers if too small
-    if (m * k * sizeof(float) > cl_size_a) {
-        clReleaseMemObject(cl_buffer_a);
-        cl_size_a = m * k * sizeof(float);
-        cl_buffer_a = clCreateBuffer(context, CL_MEM_READ_ONLY, cl_size_a, NULL, NULL);
+    // Prepare buffers
+    cl_mem cl_buffer_a = clCreateBuffer(context, CL_MEM_READ_ONLY, m*k*sizeof(float), NULL, &err);
+    if (err != CL_SUCCESS) {
+        printf("Error creating OpenCL Buffer A: %d\n", err);
+        fflush(stdout);
     }
-    if (n * k * sizeof(float) > cl_size_b) {
-        clReleaseMemObject(cl_buffer_b);
-        cl_size_b = n * k * sizeof(float);
-        cl_buffer_b = clCreateBuffer(context, CL_MEM_READ_ONLY, cl_size_b, NULL, NULL);
+    cl_mem cl_buffer_b = clCreateBuffer(context, CL_MEM_READ_ONLY, n*k*sizeof(float), NULL, &err);
+    if (err != CL_SUCCESS) {
+        printf("Error creating OpenCL Buffer B: %d\n", err);
+        fflush(stdout);
     }
-    if (m * n * sizeof(float) > cl_size_c) {
-        clReleaseMemObject(cl_buffer_c);
-        cl_size_c = m * n * sizeof(float);
-        cl_buffer_c = clCreateBuffer(context, CL_MEM_READ_WRITE, cl_size_c, NULL, NULL);
+    cl_mem cl_buffer_c = clCreateBuffer(context, CL_MEM_READ_WRITE, m*n*sizeof(float), NULL, &err);
+    if (err != CL_SUCCESS) {
+        printf("Error creating OpenCL Buffer C: %d\n", err);
+        fflush(stdout);
     }
 
-    clEnqueueWriteBuffer(queue, cl_buffer_a, CL_TRUE, 0, cl_size_a, host_a, 0, NULL, events);
-    clEnqueueWriteBuffer(queue, cl_buffer_b, CL_TRUE, 0, cl_size_b, host_b, 0, NULL, events + 1);
-    // buffer c is not required for this use case
-    // clEnqueueWriteBuffer(queue, cl_buffer_c, CL_TRUE, 0, cl_size_c, host_c, 0, NULL, NULL);
-
-    clWaitForEvents(2, events);
+    clEnqueueWriteBuffer(queue, cl_buffer_a, CL_FALSE, 0, m*k*sizeof(float), host_a, 0, NULL, events);
+    clEnqueueWriteBuffer(queue, cl_buffer_b, CL_FALSE, 0, n*k*sizeof(float), host_b, 0, NULL, events + 1);
+    clEnqueueWriteBuffer(queue, cl_buffer_c, CL_FALSE, 0, m*n*sizeof(float), host_c, 0, NULL, events + 2);
+    clWaitForEvents(3, events);
     clReleaseEvent(events[0]);
     clReleaseEvent(events[1]);
+    clReleaseEvent(events[2]);
 
     // Call the SGEMM routine.
     CLBlastStatusCode status = CLBlastSgemm(order,
@@ -135,6 +112,10 @@ static void ggml_cl_sgemm_wrapper(const enum CBLAS_ORDER order, const enum CBLAS
         clReleaseEvent(events[0]);
         clReleaseEvent(events[1]);
     }
+
+    clReleaseMemObject(cl_buffer_a);
+    clReleaseMemObject(cl_buffer_b);
+    clReleaseMemObject(cl_buffer_c);
 }
 
 #endif