Function renaming:

	 starpu_pack_cl_args   --> starpu_codelet_pack_args
	 starpu_unpack_cl_args --> starpu_codelet_unpack_args

doc/chapters/advanced-examples.texi

@@ -478,7 +478,7 @@ function; this is equivalent to using both @code{STARPU_CALLBACK} and
 
 Parameters to be passed to the codelet implementation are defined
 through the type @code{STARPU_VALUE}. The function
-@code{starpu_unpack_cl_args} must be called within the codelet
+@code{starpu_codelet_unpack_args} must be called within the codelet
 implementation to retrieve them.
 @end deftypefun
 
@@ -492,7 +492,7 @@ void func_cpu(void *descr[], void *_args)
         int ifactor;
         float ffactor;
 
-        starpu_unpack_cl_args(_args, &ifactor, &ffactor);
+        starpu_codelet_unpack_args(_args, &ifactor, &ffactor);
         *x0 = *x0 * ifactor;
         *x1 = *x1 * ffactor;
 @}
@@ -525,7 +525,7 @@ task->handles[0] = data_handles[0];
 task->handles[1] = data_handles[1];
 char *arg_buffer;
 size_t arg_buffer_size;
-starpu_pack_cl_args(&arg_buffer, &arg_buffer_size,
+starpu_codelet_pack_args(&arg_buffer, &arg_buffer_size,
                     STARPU_VALUE, &ifactor, sizeof(ifactor),
                     STARPU_VALUE, &ffactor, sizeof(ffactor),
                     0);

examples/cg/cg_kernels.c

@@ -289,7 +289,7 @@ int dot_kernel(starpu_data_handle_t v1,
 static void scal_kernel_cuda(void *descr[], void *cl_arg)
 {
 	TYPE p1;
-	starpu_unpack_cl_args(cl_arg, &p1);
+	starpu_codelet_unpack_args(cl_arg, &p1);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	unsigned n = STARPU_VECTOR_GET_NX(descr[0]);
@@ -304,7 +304,7 @@ static void scal_kernel_cuda(void *descr[], void *cl_arg)
 static void scal_kernel_cpu(void *descr[], void *cl_arg)
 {
 	TYPE alpha;
-	starpu_unpack_cl_args(cl_arg, &alpha);
+	starpu_codelet_unpack_args(cl_arg, &alpha);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	unsigned n = STARPU_VECTOR_GET_NX(descr[0]);
@@ -346,7 +346,7 @@ static void gemv_kernel_cuda(void *descr[], void *cl_arg)
 	unsigned ny = STARPU_MATRIX_GET_NY(descr[1]);
  
 	TYPE alpha, beta;
-	starpu_unpack_cl_args(cl_arg, &beta, &alpha);
+	starpu_codelet_unpack_args(cl_arg, &beta, &alpha);
 
 	/* Compute v1 = alpha M v2 + beta v1 */
 	cublasgemv('N', nx, ny, alpha, M, ld, v2, 1, beta, v1, 1);
@@ -365,7 +365,7 @@ static void gemv_kernel_cpu(void *descr[], void *cl_arg)
 	unsigned ny = STARPU_MATRIX_GET_NY(descr[1]);
 
 	TYPE alpha, beta;
-	starpu_unpack_cl_args(cl_arg, &beta, &alpha);
+	starpu_codelet_unpack_args(cl_arg, &beta, &alpha);
 
 	int worker_size = starpu_combined_worker_get_size();
 
@@ -450,7 +450,7 @@ int gemv_kernel(starpu_data_handle_t v1,
 static void scal_axpy_kernel_cuda(void *descr[], void *cl_arg)
 {
 	TYPE p1, p2;
-	starpu_unpack_cl_args(cl_arg, &p1, &p2);
+	starpu_codelet_unpack_args(cl_arg, &p1, &p2);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	TYPE *v2 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);
@@ -470,7 +470,7 @@ static void scal_axpy_kernel_cuda(void *descr[], void *cl_arg)
 static void scal_axpy_kernel_cpu(void *descr[], void *cl_arg)
 {
 	TYPE p1, p2;
-	starpu_unpack_cl_args(cl_arg, &p1, &p2);
+	starpu_codelet_unpack_args(cl_arg, &p1, &p2);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	TYPE *v2 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);
@@ -530,7 +530,7 @@ int scal_axpy_kernel(starpu_data_handle_t v1, TYPE p1,
 static void axpy_kernel_cuda(void *descr[], void *cl_arg)
 {
 	TYPE p1;
-	starpu_unpack_cl_args(cl_arg, &p1);
+	starpu_codelet_unpack_args(cl_arg, &p1);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	TYPE *v2 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);
@@ -547,7 +547,7 @@ static void axpy_kernel_cuda(void *descr[], void *cl_arg)
 static void axpy_kernel_cpu(void *descr[], void *cl_arg)
 {
 	TYPE p1;
-	starpu_unpack_cl_args(cl_arg, &p1);
+	starpu_codelet_unpack_args(cl_arg, &p1);
 
 	TYPE *v1 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[0]);
 	TYPE *v2 = (TYPE *)STARPU_VECTOR_GET_PTR(descr[1]);

examples/mandelbrot/mandelbrot.c

@@ -238,7 +238,7 @@ static void compute_block_opencl(void *descr[], void *cl_arg)
 	int iby, block_size;
 	double stepX, stepY;
 	int *pcnt; /* unused for CUDA tasks */
-	starpu_unpack_cl_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
+	starpu_codelet_unpack_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
 
 	cl_mem data = (cl_mem)STARPU_VECTOR_GET_DEV_HANDLE(descr[0]);
 
@@ -283,7 +283,7 @@ static void compute_block(void *descr[], void *cl_arg)
 	int iby, block_size;
 	double stepX, stepY;
 	int *pcnt; /* unused for sequential tasks */
-	starpu_unpack_cl_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
+	starpu_codelet_unpack_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
 
 	unsigned *data = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 
@@ -327,7 +327,7 @@ static void compute_block_spmd(void *descr[], void *cl_arg)
 	int iby, block_size;
 	double stepX, stepY;
 	int *pcnt;
-	starpu_unpack_cl_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
+	starpu_codelet_unpack_args(cl_arg, &iby, &block_size, &stepX, &stepY, &pcnt);
 
 	unsigned *data = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 

gcc-plugin/src/starpu.c

@@ -887,7 +887,7 @@ handle_task_attribute (tree *node, tree name, tree args,
     }
 
   /* Lookup & cache function declarations for later reuse.  */
-  LOOKUP_STARPU_FUNCTION (unpack_fn, "starpu_unpack_cl_args");
+  LOOKUP_STARPU_FUNCTION (unpack_fn, "starpu_codelet_unpack_args");
 
   return NULL_TREE;
 }
@@ -1373,7 +1373,7 @@ build_codelet_wrapper_definition (tree task_impl)
 	  }
       }
 
-    /* Build `starpu_unpack_cl_args (cl_args, &var1, &var2, ...)'.  */
+    /* Build `starpu_codelet_unpack_args (cl_args, &var1, &var2, ...)'.  */
 
     args = NULL;
     VEC_safe_push (tree, gc, args, TREE_CHAIN (DECL_ARGUMENTS (wrapper_decl)));

gcc-plugin/tests/mocks.h

@@ -122,11 +122,11 @@ starpu_insert_task (struct starpu_codelet *cl, ...)
   return 0;
 }
 
-/* Our own implementation of `starpu_unpack_cl_args', for debugging
+/* Our own implementation of `starpu_codelet_unpack_args', for debugging
    purposes.  */
 
 void
-starpu_unpack_cl_args (void *cl_raw_arg, ...)
+starpu_codelet_unpack_args (void *cl_raw_arg, ...)
 {
   va_list args;
   size_t nargs, arg, offset, size;

include/starpu_deprecated_api.h

@@ -51,6 +51,8 @@ typedef enum starpu_access_mode starpu_access_mode;
 #define starpu_print_bus_bandwidth     starpu_bus_print_bandwidth
 #define starpu_get_handle_interface_id starpu_handle_get_interface_id
 #define starpu_get_current_task        starpu_task_get_current
+#define starpu_unpack_cl_args          starpu_codelet_unpack_args
+#define starpu_pack_cl_args            starpu_codelet_pack_args
 
 #ifdef __cplusplus
 }

include/starpu_util.h

@@ -239,11 +239,11 @@ int starpu_insert_task(struct starpu_codelet *cl, ...);
 
 /* Retrieve the arguments of type STARPU_VALUE associated to a task
  * automatically created using starpu_insert_task. */
-void starpu_unpack_cl_args(void *cl_arg, ...);
+void starpu_codelet_unpack_args(void *cl_arg, ...);
 
 /* Pack arguments of type STARPU_VALUE into a buffer which can be
- * given to a codelet and later unpacked with starpu_unpack_cl_args */
-void starpu_pack_cl_args(char **arg_buffer, size_t *arg_buffer_size, ...);
+ * given to a codelet and later unpacked with starpu_codelet_unpack_args */
+void starpu_codelet_pack_args(char **arg_buffer, size_t *arg_buffer_size, ...);
 
 #ifdef __cplusplus
 }

mpi/examples/scatter_gather/mpi_scatter_gather.c

@@ -32,7 +32,7 @@ void cpu_codelet(void *descr[], void *_args)
 	float factor;
 
 	block = (float *)STARPU_MATRIX_GET_PTR(descr[0]);
-        starpu_unpack_cl_args(_args, &rank);
+        starpu_codelet_unpack_args(_args, &rank);
 	factor = block[0];
 
 	//fprintf(stderr,"rank %d factor %f\n", rank, factor);

src/util/starpu_insert_task.c

@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <util/starpu_insert_task_utils.h>
 
-void starpu_pack_cl_args(char **arg_buffer, size_t *arg_buffer_size, ...)
+void starpu_codelet_pack_args(char **arg_buffer, size_t *arg_buffer_size, ...)
 {
 	va_list varg_list;
 
@@ -35,7 +35,7 @@ void starpu_pack_cl_args(char **arg_buffer, size_t *arg_buffer_size, ...)
 	_starpu_pack_cl_args(*arg_buffer_size, arg_buffer, varg_list);
 }
 
-void starpu_unpack_cl_args(void *_cl_arg, ...)
+void starpu_codelet_unpack_args(void *_cl_arg, ...)
 {
 	unsigned char *cl_arg = (unsigned char *) _cl_arg;
 	unsigned current_arg_offset = 0;

tests/core/insert_task.c

@@ -24,7 +24,7 @@ void func_cpu(void *descr[], void *_args)
 	int ifactor;
 	float ffactor;
 
-	starpu_unpack_cl_args(_args, &ifactor, &ffactor);
+	starpu_codelet_unpack_args(_args, &ifactor, &ffactor);
         *x0 = *x0 * ifactor;
         *x1 = *x1 * ffactor;
 }
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 	task->handles[1] = data_handles[1];
 	char *arg_buffer;
 	size_t arg_buffer_size;
-	starpu_pack_cl_args(&arg_buffer, &arg_buffer_size,
+	starpu_codelet_pack_args(&arg_buffer, &arg_buffer_size,
 			    STARPU_VALUE, &ifactor, sizeof(ifactor),
 			    STARPU_VALUE, &ffactor, sizeof(ffactor),
 			    0);

tests/datawizard/data_lookup.c

@@ -28,7 +28,7 @@ static void task(void **buffers, void *args)
 	size_t size, i;
 
 	numbers = (float *) STARPU_VECTOR_GET_PTR(buffers[0]);
-	starpu_unpack_cl_args (args, &size);
+	starpu_codelet_unpack_args (args, &size);
 	for(i = 0; i < size; i++)
 	{
 		numbers[i] = i;

tests/datawizard/handle_to_pointer.c

@@ -28,7 +28,7 @@ static void cpu_task(void **buffers, void *args)
 	size_t size;
 
 	numbers = (int *) STARPU_VECTOR_GET_PTR(buffers[0]);
-	starpu_unpack_cl_args (args, &size);
+	starpu_codelet_unpack_args (args, &size);
 
 	for(i = 0; i < size; i++)
 	{
@@ -44,7 +44,7 @@ static void cuda_task(void **buffers, void *args)
 	size_t size;
 
 	numbers = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
-	starpu_unpack_cl_args (args, &size);
+	starpu_codelet_unpack_args (args, &size);
 
 	for(i = 0; i < size; i++)
 	{

tools/dev/rename.sed

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2010  Université de Bordeaux 1
-# Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+# Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -139,4 +139,5 @@ s/\bSTARPU_GET_CSR_ELEMSIZE\b/STARPU_CSR_GET_ELEMSIZE/g
 s/\bstarpu_print_bus_bandwidth\b/starpu_bus_print_bandwidth/g
 s/\bstarpu_get_handle_interface_id\b/starpu_handle_get_interface_id/g
 s/\bstarpu_get_current_task\b/starpu_task_get_current/g
-
+s/\bstarpu_pack_cl_args\b/starpu_codelet_pack_args/g
+s/\bstarpu_unpack_cl_args\b/starpu_codelet_unpack_args/g