tests: use FPRINTF instead of printf to disable printing when environment variable STARPU_SSILENT is set

tests/datawizard/interfaces/multiformat/multiformat_conversion_codelets.c

@@ -15,11 +15,12 @@
  */
 #include <starpu.h>
 #include "multiformat_types.h"
+#include "../../../common/helper.h"
 
 #ifdef STARPU_USE_CUDA
 void cuda_to_cpu(void *buffers[], void *arg)
 {
-	fprintf(stderr, "Entering %s\n", __func__);
+	FPRINTF(stderr, "Entering %s\n", __func__);
 	struct struct_of_arrays *src = STARPU_MULTIFORMAT_GET_CUDA_PTR(buffers[0]);
 	struct point *dst = STARPU_MULTIFORMAT_GET_PTR(buffers[0]);
 	int n = STARPU_MULTIFORMAT_GET_NX(buffers[0]);

tests/datawizard/interfaces/multiformat/multiformat_interface.c

@@ -16,6 +16,7 @@
 #include <starpu.h>
 #include "multiformat_types.h"
 #include "../test_interfaces.h"
+#include "../../../common/helper.h"
 
 static void test_multiformat_cpu_func(void *buffers[], void *args);
 #ifdef STARPU_USE_CUDA
@@ -54,7 +55,7 @@ test_multiformat_cpu_func(void *buffers[], void *args)
 
 	for (i = 0; i < n; i++)
 	{
-			fprintf(stderr, "(%d %d) [%d]", aos[i].x, aos[i].y, factor);
+			FPRINTF(stderr, "(%d %d) [%d]", aos[i].x, aos[i].y, factor);
 		if (aos[i].x != i * factor || aos[i].y != i * factor)
 		{
 			multiformat_config.copy_failed = 1;
@@ -62,7 +63,7 @@ test_multiformat_cpu_func(void *buffers[], void *args)
 		aos[i].x = -aos[i].x;
 		aos[i].y = -aos[i].y;
 	}
-	fprintf(stderr, "\n");
+	FPRINTF(stderr, "\n");
 }
 
 
@@ -118,6 +119,7 @@ int
 main(void)
 {
 #ifdef STARPU_USE_CPU
+	int ret;
 	data_interface_test_summary *summary;
 	struct starpu_conf conf = {
 		.ncpus   = -1,
@@ -125,7 +127,8 @@ main(void)
 		.nopencl = 1
 	};
 
-	starpu_init(&conf);
+	ret = starpu_init(&conf);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	register_data();
 
@@ -143,6 +146,6 @@ main(void)
 #else
 	/* Without the CPU, there is no point in using the multiformat
 	 * interface, so this test is pointless. */
-	return EXIT_SUCCESS;
+	return STARPU_TEST_SKIPPED;
 #endif
 }

tests/datawizard/interfaces/test_interfaces.c

@@ -24,6 +24,7 @@
 #include <assert.h>
 
 #include "test_interfaces.h"
+#include "../../common/helper.h"
 
 /*
  * This is definitely note thrad-safe.
@@ -92,39 +93,39 @@ void data_interface_test_summary_print(FILE *f,
 	if (!f)
 		f = stderr;
 
-	(void) fprintf(f, "%s : %s\n",
-			current_config->name, enum_to_string(s->success));
+	FPRINTF(f, "%s : %s\n",
+		current_config->name, enum_to_string(s->success));
 
-	(void) fprintf(f, "Asynchronous :\n");
+	FPRINTF(f, "Asynchronous :\n");
 #ifdef STARPU_USE_CUDA
-	(void) fprintf(f, "\tCPU    -> CUDA   : %s\n",
-			enum_to_string(s->cpu_to_cuda_async));
-	(void) fprintf(f, "\tCUDA   -> CUDA   : %s\n",
+	FPRINTF(f, "\tCPU    -> CUDA   : %s\n",
+		enum_to_string(s->cpu_to_cuda_async));
+	FPRINTF(f, "\tCUDA   -> CUDA   : %s\n",
 			enum_to_string(s->cuda_to_cuda_async));
-	(void) fprintf(f, "\tCUDA   -> CPU    : %s\n",
+	FPRINTF(f, "\tCUDA   -> CPU    : %s\n",
 			enum_to_string(s->cuda_to_cpu_async));
 #endif /* !STARPU_USE_CUDA */
 #ifdef STARPU_USE_OPENCL
-	(void) fprintf(f, "\tCPU    -> OpenCl : %s\n",
-			enum_to_string(s->cpu_to_opencl_async));
-	(void) fprintf(f, "\tOpenCl -> CPU    : %s\n",
-			enum_to_string(s->opencl_to_cpu_async));
+	FPRINTF(f, "\tCPU    -> OpenCl : %s\n",
+		enum_to_string(s->cpu_to_opencl_async));
+	FPRINTF(f, "\tOpenCl -> CPU    : %s\n",
+		enum_to_string(s->opencl_to_cpu_async));
 #endif /* !STARPU_USE_OPENCL */
 
-	(void) fprintf(f, "Synchronous :\n");
+	FPRINTF(f, "Synchronous :\n");
 #ifdef STARPU_USE_CUDA
-	(void) fprintf(f, "\tCPU    -> CUDA   ; %s\n",
-			enum_to_string(s->cpu_to_cuda));
-	(void) fprintf(f, "\tCUDA   -> CUDA   : %s\n",
-			enum_to_string(s->cuda_to_cuda));
-	(void) fprintf(f, "\tCUDA   -> CPU    : %s\n",
-			enum_to_string(s->cuda_to_cpu));
+	FPRINTF(f, "\tCPU    -> CUDA   ; %s\n",
+		enum_to_string(s->cpu_to_cuda));
+	FPRINTF(f, "\tCUDA   -> CUDA   : %s\n",
+		enum_to_string(s->cuda_to_cuda));
+	FPRINTF(f, "\tCUDA   -> CPU    : %s\n",
+		enum_to_string(s->cuda_to_cpu));
 #endif /* !STARPU_USE_CUDA */
 #ifdef STARPU_USE_OPENCL
-	(void) fprintf(f, "\tCPU    -> OpenCl : %s\n",
-			enum_to_string(s->cpu_to_opencl));
-	(void) fprintf(f, "\tOpenCl -> CPU    : %s\n",
-			enum_to_string(s->opencl_to_cpu));
+	FPRINTF(f, "\tCPU    -> OpenCl : %s\n",
+		enum_to_string(s->cpu_to_opencl));
+	FPRINTF(f, "\tOpenCl -> CPU    : %s\n",
+		enum_to_string(s->opencl_to_cpu));
 #endif /* !STARPU_USE_OPENCL */
 }
 
@@ -276,7 +277,7 @@ create_task(struct starpu_task **taskp, enum starpu_archtype type, int id)
 			{
 				if (id >= n_cpus)
 				{
-					fprintf(stderr, "Not enough CPU workers\n");
+					FPRINTF(stderr, "Not enough CPU workers\n");
 					return -ENODEV;
 				}
 				workerid = *(cpu_workers + id);
@@ -290,7 +291,7 @@ create_task(struct starpu_task **taskp, enum starpu_archtype type, int id)
 			{
 				if (id >= n_cudas)
 				{
-					fprintf(stderr, "Not enough CUDA workers\n");
+					FPRINTF(stderr, "Not enough CUDA workers\n");
 					return -ENODEV;
 				}
 				workerid = cuda_workers[id];
@@ -305,7 +306,7 @@ create_task(struct starpu_task **taskp, enum starpu_archtype type, int id)
 			{
 				if (id >= n_opencls)
 				{
-					fprintf(stderr, "Not enough OpenCL workers\n");
+					FPRINTF(stderr, "Not enough OpenCL workers\n");
 					return -ENODEV;
 				}
 				workerid = *(opencl_workers + id);
@@ -360,7 +361,7 @@ ram_to_cuda(void)
 	if (err != 0)
 		return TASK_SUBMISSION_FAILURE;
 
-	fprintf(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
+	FPRINTF(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
 	return current_config->copy_failed;
 }
 
@@ -379,7 +380,7 @@ cuda_to_cuda(void)
 	if (err != 0)
 		return TASK_SUBMISSION_FAILURE;
 
-	fprintf(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
+	FPRINTF(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
 	return current_config->copy_failed;
 }
 #endif
@@ -398,7 +399,7 @@ cuda_to_ram(void)
 	if (err != 0)
 		return TASK_SUBMISSION_FAILURE;
 
-	fprintf(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
+	FPRINTF(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
 	return current_config->copy_failed;
 }
 #endif /* !STARPU_USE_CUDA */
@@ -418,7 +419,7 @@ ram_to_opencl()
 	if (err != 0)
 		return TASK_SUBMISSION_FAILURE;
 
-	fprintf(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
+	FPRINTF(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
 	return current_config->copy_failed;
 }
 
@@ -436,7 +437,7 @@ opencl_to_ram()
 	if (err != 0)
 		return TASK_SUBMISSION_FAILURE;
 
-	fprintf(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
+	FPRINTF(stderr, "[%s] : %d\n", __func__, current_config->copy_failed);
 	return current_config->copy_failed;
 }
 #endif /* !STARPU_USE_OPENCL */
@@ -564,7 +565,7 @@ run_tests(struct test_config *conf)
 {
 	if (load_conf(conf) == 1)
 	{
-		fprintf(stderr, "Failed to load conf.\n");
+		FPRINTF(stderr, "Failed to load conf.\n");
 		return NULL;
 	}
 	run_async();

tests/perfmodels/regression_based.c

@@ -101,7 +101,7 @@ static void show_task_perfs(int size, struct starpu_task *task) {
 
 		unsigned nimpl;
 		for (nimpl = 0; nimpl < STARPU_MAXIMPLEMENTATIONS; nimpl++) {
-			printf("Expected time for %d on %s:\t%f\n",
+			FPRINTF(stdout, "Expected time for %d on %s:\t%f\n",
 				size, name, starpu_task_expected_length(task, starpu_worker_get_perf_archtype(workerid), nimpl));
 		}
 	}