浏览代码

Add dumb performance models for openmp tasks for now

Samuel Thibault 7 年之前
父节点
当前提交
1c3b6b57d5

+ 3 - 0
tests/openmp/array_slice_01.c

@@ -121,6 +121,7 @@ void task_region_g(void *buffers[], void *args)
 		printf("depth 1 task, block 2: vector_slice_2_handle = %p\n", vector_slice_2_handle);
 
 		memset(&attr, 0, sizeof(attr));
+		attr.cl.model         = &starpu_perfmodel_nop;
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;
@@ -179,6 +180,7 @@ void master_g2(void *arg)
 	printf("master_g2: region_vector_handle = %p\n", region_vector_handle);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl.nbuffers      = 1;
@@ -231,6 +233,7 @@ main (void)
 
 	assert(NX >= 2);
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 3 - 1
tests/openmp/cuda_task_01.c

@@ -113,8 +113,9 @@ void master_g2(void *arg)
 	printf("master_g2: region_vector_handles[1] = %p\n", region_vector_handles[1]);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = NULL;
-	attr.cl.cuda_funcs[0]  = task_region_g;
+	attr.cl.cuda_funcs[0] = task_region_g;
 	attr.cl.where         = STARPU_CUDA;
 	attr.cl.nbuffers      = 2;
 	attr.cl.modes[0]      = STARPU_R;
@@ -175,6 +176,7 @@ main (void)
 	}
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/parallel_01.c

@@ -58,6 +58,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/parallel_02.c

@@ -64,6 +64,7 @@ void parallel_region_1_f(void *buffers[], void *args)
 	worker_id = starpu_worker_get_id();
 	printf("[tid %p] parallel region 1: task thread = %d\n", (void *)tid, worker_id);
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_2_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
@@ -75,6 +76,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -58,6 +58,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -67,6 +67,7 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -76,6 +76,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -79,6 +79,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -86,6 +86,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -79,6 +79,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -157,6 +157,7 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
 

+ 1 - 0
tests/openmp/parallel_for_02.c

@@ -86,6 +86,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -175,6 +175,7 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
 

+ 1 - 0
tests/openmp/parallel_master_01.c

@@ -75,6 +75,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -69,6 +69,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -110,6 +110,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -102,6 +102,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -96,6 +96,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -100,6 +100,7 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -83,6 +83,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -82,6 +82,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -86,6 +86,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -75,6 +75,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	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

@@ -75,6 +75,7 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/task_01.c

@@ -66,6 +66,7 @@ void parallel_region_f(void *buffers[], void *args)
 	printf("[tid %p] task thread = %d: implicit task \"f\"\n", (void *)tid, worker_id);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.if_clause        = 1;
@@ -83,6 +84,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 3 - 0
tests/openmp/task_02.c

@@ -95,6 +95,7 @@ void task_region_g(void *buffers[], void *args)
 		printf("depth 1 task, block 2: task_vector_handle = %p\n", task_vector_handle);
 
 		memset(&attr, 0, sizeof(attr));
+		attr.cl.model         = &starpu_perfmodel_nop;
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;
@@ -143,6 +144,7 @@ void master_g2(void *arg)
 	printf("master_g2: region_vector_handle = %p\n", region_vector_handle);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl.nbuffers      = 1;
@@ -192,6 +194,7 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 1 - 0
tests/openmp/task_03.c

@@ -58,6 +58,7 @@ main (void)
 {
 	struct starpu_omp_task_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_f;
 	attr.cl.where         = STARPU_CPU;
 	attr.if_clause        = 1;

+ 3 - 0
tests/openmp/taskgroup_01.c

@@ -58,6 +58,7 @@ void taskgroup_f(void *arg)
 	struct starpu_omp_task_region_attr attr;
 	int *p_i = (int *)arg;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -94,6 +95,7 @@ void parallel_region_f(void *buffers[], void *args)
 	printf("[tid %p] task thread = %d: implicit task \"f\": taskgroup\n", (void *)tid, worker_id);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -115,6 +117,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 3 - 0
tests/openmp/taskgroup_02.c

@@ -58,6 +58,7 @@ void taskgroup_f(void *arg)
 	struct starpu_omp_task_region_attr attr;
 	int *p_i = (int *)arg;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -98,6 +99,7 @@ void parallel_region_f(void *buffers[], void *args)
 	printf("[tid %p] task thread = %d: implicit task \"f\": taskgroup\n", (void *)tid, worker_id);
 
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -119,6 +121,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

+ 2 - 0
tests/openmp/taskwait_01.c

@@ -67,6 +67,7 @@ void parallel_region_f(void *buffers[], void *args)
 	printf("[tid %p] task thread = %d: implicit task \"f\"\n", (void *)tid, worker_id);
 	
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model         = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -101,6 +102,7 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+	attr.cl.model        = &starpu_perfmodel_nop;
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;