tests: minor fixes following icc's warnings

tests/datawizard/copy.c

@@ -67,7 +67,6 @@ int main(int argc, char **argv)
         for (i = 0; i < nloops; i++)
         {
 		struct starpu_task *task_cpu, *task_gpu;
-                int ret;
 
 		task_cpu = starpu_task_create();
 		task_gpu = starpu_task_create();

tests/datawizard/dsm_stress.c

@@ -221,7 +221,7 @@ int main(int argc, char **argv)
 		task->callback_func = callback;
 		task->callback_arg = NULL;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

tests/datawizard/gpu_register.c

@@ -70,7 +70,7 @@ check_result(unsigned *t, size_t size)
 	{
 		if (t[i] != i*2)
 		{
-			FPRINTF(stderr,"t[%d] is %d instead of %d\n", i, t[i], 2*i);
+			FPRINTF(stderr,"t[%d] is %u instead of %d\n", i, t[i], 2*i);
 			return 1;
 		}
 	}

tests/datawizard/in_place_partition.c

@@ -84,7 +84,7 @@ int main(int argc, char **argv)
 	ret = EXIT_SUCCESS;
 	for (i = 0; i < size; i++) {
 		if (foo[i] != i*2) {
-			FPRINTF(stderr,"value %d is %d instead of %d\n", i, foo[i], 2*i);
+			FPRINTF(stderr,"value %d is %u instead of %d\n", i, foo[i], 2*i);
 			ret = EXIT_FAILURE;
 		}
 	}

tests/datawizard/increment_redux_v2.c

@@ -255,7 +255,7 @@ int main(int argc, char **argv)
 			}
 			task->handles[0] = handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}
@@ -264,7 +264,7 @@ int main(int argc, char **argv)
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");
 		if (var != ntasks *(loop+1))
 		{
-			_STARPU_DEBUG("%d != %d\n", var, ntasks*(loop+1));
+			_STARPU_DEBUG("%u != %u\n", var, ntasks*(loop+1));
 			starpu_data_release(handle);
 			starpu_data_unregister(handle);
 			goto err;
@@ -275,7 +275,7 @@ int main(int argc, char **argv)
 	starpu_data_unregister(handle);
 	if (var != ntasks *nloops)
 	{
-		_STARPU_DEBUG("%d != %d\n", var, ntasks*nloops);
+		_STARPU_DEBUG("%u != %u\n", var, ntasks*nloops);
 		goto err;
 	}
 

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

@@ -124,20 +124,20 @@ void
 print_stats(struct stats *s)
 {
 #ifdef STARPU_USE_CPU
-	FPRINTF(stderr, "cpu         : %d\n", s->cpu);
+	FPRINTF(stderr, "cpu         : %u\n", s->cpu);
 #endif /* !STARPU_USE_CPU */
 #ifdef STARPU_USE_CUDA
-	FPRINTF(stderr, "cuda        : %d\n" 
-			"cpu->cuda   : %d\n"
-			"cuda->cpu   : %d\n",
+	FPRINTF(stderr, "cuda        : %u\n" 
+			"cpu->cuda   : %u\n"
+			"cuda->cpu   : %u\n",
 			s->cuda,
 			s->cpu_to_cuda,
 			s->cuda_to_cpu);
 #endif /* !STARPU_USE_CUDA */
 #ifdef STARPU_USE_OPENCL
-	FPRINTF(stderr, "opencl      : %d\n" 
-			"cpu->opencl : %d\n"
-			"opencl->cpu : %d\n",
+	FPRINTF(stderr, "opencl      : %u\n" 
+			"cpu->opencl : %u\n"
+			"opencl->cpu : %u\n",
 			s->opencl,
 			s->cpu_to_opencl,
 			s->opencl_to_cpu);

tests/datawizard/scratch.c

@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 	{
 		if (A[i] != NLOOPS)
 		{
-			FPRINTF(stderr, "Error: Incorrect value A[%d] = %u != %d\n", i, A[i], NLOOPS);
+			FPRINTF(stderr, "Error: Incorrect value A[%u] = %u != %d\n", i, A[i], NLOOPS);
 			ret = EXIT_FAILURE;
 			break;
 		}

tests/datawizard/sync_and_notify_data.c

@@ -117,7 +117,6 @@ int main(int argc, char **argv)
 	unsigned iter;
 	for (iter = 0; iter < k; iter++)
 	{
-		int ret;
 		unsigned ind;
 		for (ind = 0; ind < n; ind++)
 		{

tests/datawizard/sync_and_notify_data_implicit.c

@@ -152,7 +152,6 @@ int main(int argc, char **argv)
 	unsigned iter;
 	for (iter = 0; iter < k; iter++)
 	{
-		int ret;
 		unsigned ind;
 		for (ind = 0; ind < n; ind++)
 		{

tests/datawizard/wt_broadcast.c

@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 			task->cl = &increment_cl;
 			task->handles[0] = handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}
@@ -125,7 +125,7 @@ int main(int argc, char **argv)
 	ret = EXIT_SUCCESS;
 	if (var != ntasks*nloops)
 	{
-		FPRINTF(stderr, "VAR is %d should be %d\n", var, ntasks);
+		FPRINTF(stderr, "VAR is %u should be %u\n", var, ntasks);
 		ret = EXIT_FAILURE;
 	}
 

tests/datawizard/wt_host.c

@@ -126,7 +126,7 @@ int main(int argc, char **argv)
 	if (var != ntasks*nloops)
 	{
 		ret = EXIT_FAILURE;
-		FPRINTF(stderr, "VAR is %d should be %d\n", var, ntasks);
+		FPRINTF(stderr, "VAR is %u should be %u\n", var, ntasks);
 	}
 
 	starpu_shutdown();

tests/main/get_current_task.c

@@ -98,7 +98,7 @@ int main(int argc, char **argv)
 		task->callback_func = check_task_callback;
 		task->callback_arg = task;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

tests/main/multithreaded.c

@@ -34,7 +34,7 @@ static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attri
 {
 }
 
-static struct starpu_codelet dummy_codelet = 
+static struct starpu_codelet dummy_codelet =
 {
 	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
 	.cpu_funcs = {dummy_func, NULL},
@@ -56,8 +56,8 @@ void *thread_func(void *arg __attribute__((unused)))
 		task->cl_arg = NULL;
 		task->callback_func = NULL;
 		task->callback_arg = NULL;
-		
-		int ret = starpu_task_submit(task);
+
+		ret = starpu_task_submit(task);
 		STARPU_ASSERT(!ret);
 	}
 
@@ -116,13 +116,13 @@ int main(int argc, char **argv)
 	unsigned t;
 	for (t = 0; t < nthreads; t++)
 	{
-		int ret = pthread_create(&threads[t], NULL, thread_func, NULL);
+		ret = pthread_create(&threads[t], NULL, thread_func, NULL);
 		STARPU_ASSERT(ret == 0);
 	}
 
 	for (t = 0; t < nthreads; t++)
 	{
-		int ret = pthread_join(threads[t], NULL);
+		ret = pthread_join(threads[t], NULL);
 		STARPU_ASSERT(ret == 0);
 	}
 

tests/microbenchs/redundant_buffer.c

@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 		task->handles[0] = v_handle;
 		task->handles[1] = v_handle;
 
-		int ret = starpu_task_submit(task);
+		ret = starpu_task_submit(task);
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}

tests/parallel_tasks/explicit_combined_worker.c

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 			task->execute_on_a_specific_worker = 1;
 			task->workerid = worker;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

tests/parallel_tasks/parallel_kernels_spmd.c

@@ -91,7 +91,7 @@ int main(int argc, char **argv)
 
 			task->handles[0] = v_handle;
 
-			int ret = starpu_task_submit(task);
+			ret = starpu_task_submit(task);
 			if (ret == -ENODEV) goto enodev;
 			STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 		}

tests/sched_policies/data_locality.c

@@ -117,12 +117,12 @@ run(struct starpu_sched_policy *policy)
 
 	/* All tasks should have been executed on the same GPU. */
 	ret = 0;
-	unsigned workerid = tasks[0]->profiling_info->workerid;
+	int workerid = tasks[0]->profiling_info->workerid;
 	for (i = 0; i < NTASKS; i++)
 	{
 		if (tasks[i]->profiling_info->workerid != workerid)
 		{
-			FPRINTF(stderr, "Error for task %d. Worker id %u different from expected worker id %u\n", i, tasks[i]->profiling_info->workerid, workerid);
+			FPRINTF(stderr, "Error for task %d. Worker id %d different from expected worker id %d\n", i, tasks[i]->profiling_info->workerid, workerid);
 			ret = 1;
 			break;
 		}