tests: Update towards new codelet/task interface which defines access modes for data handles into starpu_codelet and no longer in starpu_task

tests/datawizard/increment_redux.c

@@ -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
@@ -190,7 +190,8 @@ static struct starpu_codelet increment_cl =
 	.opencl_funcs = {increment_opencl_kernel, NULL},
 #endif
 	.cpu_funcs = {increment_cpu_kernel, NULL},
-	.nbuffers = 1
+	.nbuffers = 1,
+	.modes = {STARPU_REDUX}
 };
 
 int main(int argc, char **argv)
@@ -217,9 +218,7 @@ int main(int argc, char **argv)
 			struct starpu_task *task = starpu_task_create();
 
 			task->cl = &increment_cl;
-
-			task->buffers[0].mode = STARPU_REDUX;
-			task->buffers[0].handle = handle;
+			task->handles[0] = handle;
 
 			int ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;

tests/datawizard/increment_redux_v2.c

@@ -189,7 +189,8 @@ static struct starpu_codelet increment_cl =
 	.opencl_funcs = {increment_opencl_kernel, NULL},
 #endif
 	.cpu_funcs = {increment_cpu_kernel, NULL},
-	.nbuffers = 1
+	.nbuffers = 1,
+	.modes = {STARPU_RW}
 };
 
 static struct starpu_codelet increment_cl_redux =
@@ -202,7 +203,8 @@ static struct starpu_codelet increment_cl_redux =
 	.opencl_funcs = {increment_opencl_kernel, NULL},
 #endif
 	.cpu_funcs = {increment_cpu_kernel, NULL},
-	.nbuffers = 1
+	.nbuffers = 1,
+	.modes = {STARPU_REDUX}
 };
 
 int main(int argc, char **argv)
@@ -231,14 +233,12 @@ int main(int argc, char **argv)
 			if (t % 10 == 0)
 			{
 				task->cl = &increment_cl;
-				task->buffers[0].mode = STARPU_RW;
 			}
 			else
 			{
 				task->cl = &increment_cl_redux;
-				task->buffers[0].mode = STARPU_REDUX;
 			}
-			task->buffers[0].handle = handle;
+			task->handles[0] = handle;
 
 			int ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;

tests/datawizard/interfaces/multiformat/advanced/multiformat_cuda_opencl.c

@@ -47,13 +47,13 @@ test(void)
 	{
 		.where     = STARPU_CUDA,
 		.cuda_funcs = {cuda_func, NULL},
-		.nbuffers  = 1
+		.nbuffers  = 1,
+		.modes = {STARPU_RW}
 	};
 
 	task_cuda = starpu_task_create();
 	task_cuda->cl = &cl_cuda;
-	task_cuda->buffers[0].handle = handle;
-	task_cuda->buffers[0].mode = STARPU_RW;
+	task_cuda->handles[0] = handle;
 	ret = starpu_task_submit(task_cuda);
 	if (ret != 0)
 		return 1; 
@@ -62,21 +62,20 @@ test(void)
 	{
 		.where       = STARPU_OPENCL,
 		.opencl_funcs = {opencl_func, NULL},
-		.nbuffers    = 1
+		.nbuffers    = 1,
+		.modes = {STARPU_RW}
 	};
 
 	task_opencl = starpu_task_create();
 	task_opencl->cl = &cl_opencl;
-	task_opencl->buffers[0].handle = handle;
-	task_opencl->buffers[0].mode = STARPU_RW;
+	task_opencl->handles[0] = handle;
 	ret = starpu_task_submit(task_opencl);
 	if (ret != 0)
 		return 1;
 
 	task_cuda2 = starpu_task_create();
 	task_cuda2->cl = &cl_cuda;
-	task_cuda2->buffers[0].handle = handle;
-	task_cuda2->buffers[0].mode = STARPU_RW;
+	task_cuda2->handles[0] = handle;
 	ret = starpu_task_submit(task_cuda2);
 	if (ret != 0)
 		return 1;

tests/datawizard/interfaces/test_interfaces.c

@@ -301,6 +301,7 @@ create_task(struct starpu_task **taskp, enum starpu_archtype type, int id)
 	int workerid;
 	static struct starpu_codelet cl;
 	cl.nbuffers = 1;
+	cl.modes[0] = STARPU_RW;
 
 	switch (type)
 	{
@@ -356,8 +357,7 @@ create_task(struct starpu_task **taskp, enum starpu_archtype type, int id)
 	struct starpu_task *task = starpu_task_create();
 	task->synchronous = 1;
 	task->cl = &cl;
-	task->buffers[0].handle = *current_config->handle;
-	task->buffers[0].mode = STARPU_RW;
+	task->handles[0] = *current_config->handle;
 	if (id != -1)
 	{
 		task->execute_on_a_specific_worker = 1;
@@ -546,7 +546,7 @@ ram_to_ram(void)
 	if (err != 0)
 		goto out;
 
-	task->buffers[0].handle = dst;
+	task->handles[0] = dst;
 	err = starpu_task_submit(task);
 	if (err != 0)
 	{

tests/datawizard/sync_and_notify_data.c

@@ -160,14 +160,15 @@ int main(int argc, char **argv)
 #ifdef STARPU_USE_GORDON
 				.gordon_func = kernel_incC_id,
 #endif
-				.nbuffers = 1
+				.nbuffers = 1,
+				.modes = {STARPU_RW}
+
 			};
 
 			struct starpu_task *task = starpu_task_create();
 			task->cl = &cl_inc_c;
 
-			task->buffers[0].handle = v_handle;
-			task->buffers[0].mode = STARPU_RW;
+			task->handles[0] = v_handle;
 
 			task->synchronous = 1;
 

tests/parallel_tasks/parallel_kernels_spmd.c

@@ -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
@@ -52,7 +52,8 @@ static struct starpu_codelet cl =
 	.cuda_funcs = {codelet_null, NULL},
         .opencl_funcs = {codelet_null, NULL},
 	.model = &model,
-	.nbuffers = 1
+	.nbuffers = 1,
+	.modes = {STARPU_R}
 };
 
 
@@ -92,8 +93,7 @@ int main(int argc, char **argv)
 			struct starpu_task *task = starpu_task_create();
 			task->cl = &cl;
 
-			task->buffers[0].handle = v_handle;
-			task->buffers[0].mode = STARPU_R;
+			task->handles[0] = v_handle;
 
 			int ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;