SOCL: Turning some of the *_func into *_funcs.

Coccinelle + DIY

socl/src/cl_enqueuecopybuffer.c

@@ -61,7 +61,7 @@ static void soclEnqueueCopyBuffer_cpu_task(void *descr[], void *args) {
 static struct starpu_codelet codelet_copybuffer = {
    .where = STARPU_CPU | STARPU_OPENCL,
    .model = NULL,
-   .cpu_func = &soclEnqueueCopyBuffer_cpu_task,
+   .cpu_funcs = { &soclEnqueueCopyBuffer_cpu_task, NULL },
    .opencl_func = &soclEnqueueCopyBuffer_opencl_task,
    .nbuffers = 2
 };

socl/src/cl_enqueuereadbuffer.c

@@ -61,8 +61,8 @@ static void soclEnqueueReadBuffer_opencl_task(void *descr[], void *args) {
 static struct starpu_codelet codelet_readbuffer = {
    .where = STARPU_OPENCL,
    .model = NULL,
-   .cpu_func = &soclEnqueueReadBuffer_cpu_task,
-   .opencl_func = &soclEnqueueReadBuffer_opencl_task,
+   .cpu_funcs = { &soclEnqueueReadBuffer_cpu_task, NULL },
+   .opencl_funcs = { &soclEnqueueReadBuffer_opencl_task, NULL },
    .nbuffers = 1
 };
 

socl/src/cl_enqueuewritebuffer.c

@@ -63,7 +63,7 @@ static void soclEnqueueWriteBuffer_opencl_task(void *descr[], void *args) {
 static struct starpu_codelet codelet_writebuffer = {
    .where = STARPU_OPENCL,
    .model = NULL,
-   .cpu_func = &soclEnqueueWriteBuffer_cpu_task,
+   .cpu_funcs = { &soclEnqueueWriteBuffer_cpu_task, NULL },
    .opencl_func = &soclEnqueueWriteBuffer_opencl_task,
    .nbuffers = 1
 };

socl/src/cl_getkernelworkgroupinfo.c

@@ -83,7 +83,7 @@ static void gkwgi_task2(void **UNUSED(desc), void *data) {
 
 static struct starpu_codelet gkwgi_codelet = {
    .where = STARPU_OPENCL,
-   .opencl_func = gkwgi_task2,
+   .opencl_funcs = { gkwgi_task2, NULL },
    .nbuffers = 0,
    .model = NULL
 };

socl/src/task.c

@@ -129,7 +129,7 @@ static void cputask_task(__attribute__((unused)) void *descr[], void *args) {
 static struct starpu_codelet cputask_codelet = {
    .where = STARPU_CPU,
    .model = NULL,
-   .cpu_func = &cputask_task
+   .cpu_funcs = { &cputask_task, NULL },
 };
 
 starpu_task task_create_cpu(void (*callback)(void*), void *arg, int free_arg) {