Split the late_task_deps test into smaller tests for the different situations:

- express deps after the submission of a non-synchronous task
- express deps after the submission of a synchronous task
- express deps within the callback of a task

tests/Makefile.am

@@ -86,7 +86,9 @@ check_PROGRAMS += 				\
 	core/empty_task_sync_point		\
 	core/tag_wait_api			\
 	core/task_wait_api			\
-	core/late_task_deps			\
+	core/declare_deps_in_callback		\
+	core/declare_deps_after_submission	\
+	core/declare_deps_after_submission_synchronous	\
 	core/get_current_task			\
 	datawizard/sync_and_notify_data		\
 	datawizard/dsm_stress			\
@@ -159,8 +161,14 @@ core_tag_wait_api_SOURCES =			\
 core_task_wait_api_SOURCES =			\
 	core/task_wait_api.c
 
-core_late_task_deps_SOURCES =			\
-	core/late_task_deps.c
+core_declare_deps_in_callback_SOURCES =		\
+	core/declare_deps_in_callback.c
+
+core_declare_deps_after_submission_SOURCES =	\
+	core/declare_deps_after_submission.c
+
+core_declare_deps_after_submission_synchronous_SOURCES =	\
+	core/declare_deps_after_submission_synchronous.c
 
 core_get_current_task_SOURCES =			\
 	core/get_current_task.c

tests/core/late_task_deps.c

@@ -22,17 +22,6 @@
 
 #define NLOOPS	128
 
-static void callback(void *arg)
-{
-	struct starpu_task *taskA, *taskB;
-
-	taskA = starpu_get_current_task();
-	taskB = arg;
-
-	starpu_task_declare_deps_array(taskB, 1, &taskA);
-	starpu_submit_task(taskB);
-}
-
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 }
@@ -59,12 +48,12 @@ static struct starpu_task *create_dummy_task(void)
 int main(int argc, char **argv)
 {
 	int ret;
+	unsigned loop;
 
 	starpu_init(NULL);
 
 	struct starpu_task *taskA, *taskB;
-	
-	unsigned loop;
+
 	for (loop = 0; loop < NLOOPS; loop++)
 	{
 		taskA = create_dummy_task();
@@ -96,45 +85,6 @@ int main(int argc, char **argv)
 
 	starpu_wait_all_tasks();
 
-	for (loop = 0; loop < NLOOPS; loop++)
-	{
-		taskA = create_dummy_task();
-		taskB = create_dummy_task();
-
-		/* By default, dynamically allocated tasks are destroyed at
-		 * termination, we cannot declare a dependency on something
-		 * that does not exist anymore. */
-		taskA->destroy = 0;
-		taskA->synchronous = 1;
-
-		ret = starpu_submit_task(taskA);
-		STARPU_ASSERT(!ret);
-
-		starpu_task_declare_deps_array(taskB, 1, &taskA);
-
-		taskB->synchronous = 1;
-
-		ret = starpu_submit_task(taskB);
-		STARPU_ASSERT(!ret);
-
-		starpu_task_destroy(taskA);
-	}
-
-	starpu_wait_all_tasks();
-
-	for (loop = 0; loop < NLOOPS; loop++)
-	{
-		taskA = create_dummy_task();
-		taskB = create_dummy_task();
-
-		taskA->callback_func = callback;
-		taskA->callback_arg = taskB;
-
-		starpu_submit_task(taskA);
-	}
-
-	starpu_wait_all_tasks();
-
 	starpu_shutdown();
 
 	return 0;

tests/core/declare_deps_after_submission_synchronous.c

@@ -0,0 +1,86 @@
+/*
+ * StarPU
+ * Copyright (C) INRIA 2008-2010 (see AUTHORS file)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <starpu.h>
+
+#define NLOOPS	128
+
+static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+{
+}
+
+static starpu_codelet dummy_codelet = 
+{
+	.where = STARPU_CPU|STARPU_CUDA,
+	.cpu_func = dummy_func,
+	.cuda_func = dummy_func,
+	.model = NULL,
+	.nbuffers = 0
+};
+
+static struct starpu_task *create_dummy_task(void)
+{
+	struct starpu_task *task = starpu_task_create();
+
+	task->cl = &dummy_codelet;
+	task->cl_arg = NULL;
+
+	return task;
+}
+
+int main(int argc, char **argv)
+{
+	int ret;
+	unsigned loop;
+
+	starpu_init(NULL);
+
+	struct starpu_task *taskA, *taskB;
+
+	for (loop = 0; loop < NLOOPS; loop++)
+	{
+		taskA = create_dummy_task();
+		taskB = create_dummy_task();
+
+		/* By default, dynamically allocated tasks are destroyed at
+		 * termination, we cannot declare a dependency on something
+		 * that does not exist anymore. */
+		taskA->destroy = 0;
+		taskA->synchronous = 1;
+
+		ret = starpu_submit_task(taskA);
+		STARPU_ASSERT(!ret);
+
+		starpu_task_declare_deps_array(taskB, 1, &taskA);
+
+		taskB->synchronous = 1;
+
+		ret = starpu_submit_task(taskB);
+		STARPU_ASSERT(!ret);
+
+		starpu_task_destroy(taskA);
+	}
+
+	starpu_wait_all_tasks();
+
+	starpu_shutdown();
+
+	return 0;
+}

tests/core/declare_deps_in_callback.c

@@ -0,0 +1,84 @@
+/*
+ * StarPU
+ * Copyright (C) INRIA 2008-2010 (see AUTHORS file)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <starpu.h>
+
+#define NLOOPS	128
+
+static void callback(void *arg)
+{
+	struct starpu_task *taskA, *taskB;
+
+	taskA = starpu_get_current_task();
+	taskB = arg;
+
+	starpu_task_declare_deps_array(taskB, 1, &taskA);
+	starpu_submit_task(taskB);
+}
+
+static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+{
+}
+
+static starpu_codelet dummy_codelet = 
+{
+	.where = STARPU_CPU|STARPU_CUDA,
+	.cpu_func = dummy_func,
+	.cuda_func = dummy_func,
+	.model = NULL,
+	.nbuffers = 0
+};
+
+static struct starpu_task *create_dummy_task(void)
+{
+	struct starpu_task *task = starpu_task_create();
+
+	task->cl = &dummy_codelet;
+	task->cl_arg = NULL;
+
+	return task;
+}
+
+int main(int argc, char **argv)
+{
+	int ret;
+	unsigned loop;
+
+	starpu_init(NULL);
+
+	struct starpu_task *taskA, *taskB;
+
+	for (loop = 0; loop < NLOOPS; loop++)
+	{
+		taskA = create_dummy_task();
+		taskB = create_dummy_task();
+
+		taskA->callback_func = callback;
+		taskA->callback_arg = taskB;
+
+		starpu_submit_task(taskA);
+	}
+
+	starpu_wait_all_tasks();
+
+	starpu_shutdown();
+
+	return 0;
+}