tests: remove STARPU_SKIP_IF_VALGRIND as code if small enough not to be too long when executed with valgrind

tests/datawizard/acquire_cb_insert.c

@@ -24,8 +24,6 @@
 
 void which_index_cpu(void *descr[], void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
 
 	/* A real case would actually compute something */
@@ -42,8 +40,6 @@ struct starpu_codelet which_index =
 
 void work_cpu(void *descr[], void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	int i, n = STARPU_VECTOR_GET_NX(descr[0]);
 	float *x0 = (float *)STARPU_VECTOR_GET_PTR(descr[0]);
 
@@ -132,7 +128,7 @@ int main(int argc, char **argv)
 
 	starpu_free(f);
 	starpu_shutdown();
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	fprintf(stderr, "WARNING: No one can execute this task\n");

tests/datawizard/acquire_release.c

@@ -34,8 +34,6 @@ extern void increment_opencl(void *buffers[], void *args);
 
 void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *tokenptr = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	(*tokenptr)++;
 }
@@ -124,7 +122,7 @@ int main(int argc, char **argv)
 		ret = EXIT_SUCCESS;
 	else
 		ret = EXIT_FAILURE;
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	starpu_data_unregister(token_handle);

tests/datawizard/acquire_release2.c

@@ -34,8 +34,6 @@ extern void increment_opencl(void *buffers[], void *args);
 
 void increment_cpu(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *tokenptr = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	(*tokenptr)++;
 }
@@ -123,7 +121,7 @@ int main(int argc, char **argv)
 		ret = EXIT_SUCCESS;
 	else
 		ret = EXIT_FAILURE;
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	starpu_data_unregister(token_handle);

tests/datawizard/critical_section_with_void_interface.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010  Université de Bordeaux 1
- * Copyright (C) 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2012, 2013  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
@@ -29,8 +29,6 @@ int critical_var;
 
 static void critical_section(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	/* We do not protect this variable because it is only accessed when the
 	 * "void_handle" piece of data is accessed. */
 	critical_var++;
@@ -82,7 +80,7 @@ int main(int argc, char **argv)
 
 	starpu_shutdown();
 
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	fprintf(stderr, "WARNING: No one can execute this task\n");

tests/datawizard/manual_reduction.c

@@ -77,8 +77,6 @@ static void initialize_per_worker_handle(void *arg STARPU_ATTRIBUTE_UNUSED)
 
 static void cpu_redux_func(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *a = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned *b = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[1]);
 
@@ -102,8 +100,6 @@ static struct starpu_codelet reduction_codelet =
 
 static void cpu_func_incr(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*val = *val + 1;
 }

tests/datawizard/mpi_like.c

@@ -55,8 +55,6 @@ void opencl_codelet_unsigned_inc(void *buffers[], void *args);
 
 void increment_handle_cpu_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*val += 1;
 }
@@ -235,5 +233,5 @@ int main(int argc, char **argv)
 		ret = EXIT_FAILURE;
 	}
 
-	STARPU_RETURN(ret);
+	return ret;
 }

tests/datawizard/mpi_like_async.c

@@ -76,8 +76,6 @@ void opencl_codelet_unsigned_inc(void *buffers[], void *args);
 
 void increment_handle_cpu_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*val += 1;
 
@@ -400,5 +398,5 @@ int main(int argc, char **argv)
 
 	starpu_shutdown();
 
-	STARPU_RETURN(ret);
+	return ret;
 }

tests/datawizard/sync_and_notify_data.c

@@ -63,16 +63,12 @@ static unsigned v[VECTORSIZE] STARPU_ATTRIBUTE_ALIGNED(128) = {0, 0, 0, 0};
 
 void cpu_codelet_incA(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[0]++;
 }
 
 void cpu_codelet_incC(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[2]++;
 }
@@ -183,10 +179,10 @@ int main(int argc, char **argv)
 	if ((v[0] != n*k) || (v[1] != k) || (v[2] != n*k))
 	{
 		FPRINTF(stderr, "Incorrect result\n");
-		STARPU_RETURN(EXIT_FAILURE);
+		return EXIT_FAILURE;
 	}
 
-	STARPU_RETURN(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 
 enodev:
 	starpu_data_unregister(v_handle);

tests/datawizard/sync_and_notify_data_implicit.c

@@ -62,16 +62,12 @@ static unsigned v[VECTORSIZE] STARPU_ATTRIBUTE_ALIGNED(128) = {0, 0, 0, 0};
 
 void cpu_codelet_incA(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[0]++;
 }
 
 void cpu_codelet_incC(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *val = (unsigned *)STARPU_VECTOR_GET_PTR(descr[0]);
 	val[2]++;
 }
@@ -178,7 +174,7 @@ int main(int argc, char **argv)
 		FPRINTF(stderr, "Incorrect result\n");
 		ret = EXIT_FAILURE;
 	}
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	starpu_data_unregister(v_handle);

tests/datawizard/write_only_tmp_buffer.c

@@ -58,8 +58,6 @@ static void cuda_codelet_null(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args
 
 void cpu_codelet_null(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	char *buf = (char *)STARPU_VECTOR_GET_PTR(descr[0]);
 
 	*buf = 42;

tests/datawizard/wt_broadcast.c

@@ -28,8 +28,6 @@ static starpu_data_handle_t handle;
 /* dummy OpenCL implementation */
 static void increment_opencl_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE_UNUSED)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	cl_mem d_token = (cl_mem)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned h_token;
 
@@ -47,8 +45,6 @@ static void increment_opencl_kernel(void *descr[], void *cl_arg STARPU_ATTRIBUTE
 #ifdef STARPU_USE_CUDA
 static void increment_cuda_kernel(void *descr[], void *arg)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *tokenptr = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	unsigned host_token;
 
@@ -65,8 +61,6 @@ static void increment_cuda_kernel(void *descr[], void *arg)
 
 static void increment_cpu_kernel(void *descr[], void *arg)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	unsigned *tokenptr = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
 	*tokenptr = *tokenptr + 1;
 }
@@ -135,7 +129,7 @@ int main(int argc, char **argv)
 
 	starpu_shutdown();
 
-	STARPU_RETURN(ret);
+	return ret;
 
 enodev:
 	starpu_data_unregister(handle);

tests/errorcheck/invalid_blocking_calls.c

@@ -26,8 +26,6 @@ static unsigned *data;
 
 void wrong_func(void *descr[], void *arg)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	/* The function is expected to fail. This is indicated in tests/Makefile.am */
 	/* try to fetch data in the RAM while we are in a codelet, such a
 	 * blocking call is forbidden */

tests/main/get_current_task.c

@@ -30,7 +30,6 @@ static unsigned ntasks = 65536;
 
 void check_task_func(void *descr[], void *arg)
 {
-	STARPU_SKIP_IF_VALGRIND;
 }
 
 static void check_task_callback(void *arg)

tests/main/insert_task_array.c

@@ -26,7 +26,6 @@ void func_cpu(void *descr[], void *_args)
 
 	starpu_codelet_unpack_args(_args, &factor);
 
-	STARPU_SKIP_IF_VALGRIND;
         *x0 = *x0 * factor;
         *x1 = *x1 * (float)factor;
 }
@@ -84,6 +83,6 @@ enodev:
 	{
 		FPRINTF(stderr, "VALUES: %d %f\n", x, f);
 		ret = !(x == 12 && f == 24.0);
-		STARPU_RETURN(ret);
+		return ret;
 	}
 }

tests/main/starpu_task_bundle.c

@@ -23,8 +23,6 @@
 
 void func_cpu(void *descr[], void *args)
 {
-	STARPU_SKIP_IF_VALGRIND;
-
 	float *x = (float *) STARPU_VARIABLE_GET_PTR(descr[0]);
 	float factor;