Browse Source

Make sure the content of openmp tasks is always executed

Samuel Thibault 7 years ago
parent
commit
e8b928af9c

+ 1 - 0
tests/openmp/array_slice_01.c

@@ -124,6 +124,7 @@ void task_region_g(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 		attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+		attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;

+ 2 - 0
tests/openmp/cuda_task_01.c

@@ -115,6 +115,7 @@ void master_g2(void *arg)
 	memset(&attr, 0, sizeof(attr));
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 #endif
 	attr.cl.cpu_funcs[0]  = NULL;
 	attr.cl.cuda_funcs[0] = task_region_g;
@@ -181,6 +182,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_01.c

@@ -61,6 +61,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/parallel_02.c

@@ -67,6 +67,7 @@ void parallel_region_1_f(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_2_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
@@ -81,6 +82,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_1_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_03.c

@@ -61,6 +61,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_barrier_01.c

@@ -70,6 +70,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_critical_01.c

@@ -79,6 +79,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_critical_inline_01.c

@@ -82,6 +82,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_critical_named_01.c

@@ -89,6 +89,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_critical_named_inline_01.c

@@ -82,6 +82,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_for_01.c

@@ -160,6 +160,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
 

+ 1 - 0
tests/openmp/parallel_for_02.c

@@ -89,6 +89,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_for_ordered_01.c

@@ -178,6 +178,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
 

+ 1 - 0
tests/openmp/parallel_master_01.c

@@ -78,6 +78,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_master_inline_01.c

@@ -72,6 +72,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_nested_lock_01.c

@@ -113,6 +113,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_sections_01.c

@@ -105,6 +105,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_sections_combined_01.c

@@ -99,6 +99,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_simple_lock_01.c

@@ -103,6 +103,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_single_copyprivate_01.c

@@ -86,6 +86,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_single_copyprivate_inline_01.c

@@ -85,6 +85,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_single_inline_01.c

@@ -89,6 +89,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_single_nowait_01.c

@@ -78,6 +78,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_single_wait_01.c

@@ -78,6 +78,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/task_01.c

@@ -69,6 +69,7 @@ void parallel_region_f(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.if_clause        = 1;
@@ -89,6 +90,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 3 - 0
tests/openmp/task_02.c

@@ -98,6 +98,7 @@ void task_region_g(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 		attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+		attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;
@@ -149,6 +150,7 @@ void master_g2(void *arg)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl.nbuffers      = 1;
@@ -201,6 +203,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/task_03.c

@@ -61,6 +61,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_f;
 	attr.cl.where         = STARPU_CPU;
 	attr.if_clause        = 1;

+ 3 - 0
tests/openmp/taskgroup_01.c

@@ -61,6 +61,7 @@ void taskgroup_f(void *arg)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -100,6 +101,7 @@ void parallel_region_f(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -124,6 +126,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 3 - 0
tests/openmp/taskgroup_02.c

@@ -61,6 +61,7 @@ void taskgroup_f(void *arg)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -104,6 +105,7 @@ void parallel_region_f(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -128,6 +130,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/taskwait_01.c

@@ -70,6 +70,7 @@ void parallel_region_f(void *buffers[], void *args)
 #ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags         = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -107,6 +108,7 @@ main (void)
 #ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
 #endif
+	attr.cl.flags        = STARPU_CODELET_SIMGRID_EXECUTE;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;