Browse Source

Add a new test to make sure that it is possible to use tasks with cl=NULL to
synchronize (this seems broken yet).

Cédric Augonnet 15 years ago
parent
commit
cf92403d35
2 changed files with 77 additions and 0 deletions
  1. 4 0
      tests/Makefile.am
  2. 73 0
      tests/core/empty_task_sync_point_tasks.c

+ 4 - 0
tests/Makefile.am

@@ -85,6 +85,7 @@ check_PROGRAMS += 				\
 	core/subgraph_repeat_regenerate		\
 	core/empty_task				\
 	core/empty_task_sync_point		\
+	core/empty_task_sync_point_tasks	\
 	core/tag_wait_api			\
 	core/task_wait_api			\
 	core/declare_deps_in_callback		\
@@ -158,6 +159,9 @@ core_empty_task_SOURCES =			\
 core_empty_task_sync_point_SOURCES =		\
 	core/empty_task_sync_point.c
 
+core_empty_task_sync_point_tasks_SOURCES =	\
+	core/empty_task_sync_point_tasks.c
+
 core_tag_wait_api_SOURCES =			\
 	core/tag_wait_api.c
 

+ 73 - 0
tests/core/empty_task_sync_point_tasks.c

@@ -0,0 +1,73 @@
+/*
+ * 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 <starpu.h>
+
+static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
+{
+}
+
+static starpu_codelet dummy_codelet = 
+{
+	.where = STARPU_CPU|STARPU_CUDA|STARPU_OPENCL,
+	.cpu_func = dummy_func,
+	.cuda_func = dummy_func,
+	.opencl_func = dummy_func,
+	.model = NULL,
+	.nbuffers = 0
+};
+
+int main(int argc, char **argv)
+{
+	starpu_init(NULL);
+
+	/* {A,B,C} -> D -> {E,F}, D is empty */
+	struct starpu_task *taskA = starpu_task_create();
+	taskA->cl = &dummy_codelet;
+	
+	struct starpu_task *taskB = starpu_task_create();
+	taskB->cl = &dummy_codelet;
+	
+	struct starpu_task *taskC = starpu_task_create();
+	taskC->cl = &dummy_codelet;
+
+	struct starpu_task *taskD = starpu_task_create();
+	taskD->cl = NULL;
+
+	struct starpu_task *taskE = starpu_task_create();
+	taskE->cl = &dummy_codelet;
+
+	struct starpu_task *taskF = starpu_task_create();
+	taskF->cl = &dummy_codelet;
+
+	struct starpu_task *tasksABC[3] = {taskA, taskB, taskC};
+	starpu_task_declare_deps_array(taskD, 3, tasksABC);
+	starpu_task_declare_deps_array(taskE, 1, &taskD);
+	starpu_task_declare_deps_array(taskF, 1, &taskD);
+
+	starpu_task_submit(taskA);
+	starpu_task_submit(taskB);
+	starpu_task_submit(taskC);
+	starpu_task_submit(taskD);
+	starpu_task_submit(taskE);
+	starpu_task_submit(taskF);
+
+	starpu_task_wait_for_all();
+
+	starpu_shutdown();
+
+	return 0;
+}