Use dumb perfmodels only for simgrid

tests/openmp/array_slice_01.c

@@ -121,7 +121,9 @@ 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));
+#ifdef STARPU_SIMGRID
 		attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;
@@ -180,7 +182,9 @@ void master_g2(void *arg)
 	printf("master_g2: region_vector_handle = %p\n", region_vector_handle);
 
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl.nbuffers      = 1;
@@ -233,7 +237,9 @@ main (void)
 
 	assert(NX >= 2);
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/cuda_task_01.c

@@ -113,7 +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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = NULL;
 	attr.cl.cuda_funcs[0] = task_region_g;
 	attr.cl.where         = STARPU_CUDA;
@@ -176,7 +178,9 @@ main (void)
 	}
 
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_01.c

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

tests/openmp/parallel_02.c

@@ -64,7 +64,9 @@ 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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_2_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;
@@ -76,7 +78,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_1_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_03.c

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

tests/openmp/parallel_barrier_01.c

@@ -67,7 +67,9 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_critical_01.c

@@ -76,7 +76,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_critical_inline_01.c

@@ -79,7 +79,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_critical_named_01.c

@@ -86,7 +86,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_critical_named_inline_01.c

@@ -79,7 +79,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_for_01.c

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

tests/openmp/parallel_for_02.c

@@ -86,7 +86,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_for_ordered_01.c

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

tests/openmp/parallel_master_01.c

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

tests/openmp/parallel_master_inline_01.c

@@ -69,7 +69,9 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_nested_lock_01.c

@@ -110,7 +110,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_sections_01.c

@@ -102,7 +102,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_sections_combined_01.c

@@ -96,7 +96,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_simple_lock_01.c

@@ -100,7 +100,9 @@ main (void)
 	tid = pthread_self();
 	printf("<main>\n");
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_single_copyprivate_01.c

@@ -83,7 +83,9 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_single_copyprivate_inline_01.c

@@ -82,7 +82,9 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_single_inline_01.c

@@ -86,7 +86,9 @@ main (void)
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/parallel_single_nowait_01.c

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

tests/openmp/parallel_single_wait_01.c

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

tests/openmp/task_01.c

@@ -66,7 +66,9 @@ 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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.if_clause        = 1;
@@ -84,7 +86,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/task_02.c

@@ -95,7 +95,9 @@ 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));
+#ifdef STARPU_SIMGRID
 		attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 		attr.cl.cpu_funcs[0]  = task_region_h;
 		attr.cl.where         = STARPU_CPU;
 		attr.cl.nbuffers      = 1;
@@ -144,7 +146,9 @@ void master_g2(void *arg)
 	printf("master_g2: region_vector_handle = %p\n", region_vector_handle);
 
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl.nbuffers      = 1;
@@ -194,7 +198,9 @@ main (void)
 	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/task_03.c

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

tests/openmp/taskgroup_01.c

@@ -58,7 +58,9 @@ void taskgroup_f(void *arg)
 	struct starpu_omp_task_region_attr attr;
 	int *p_i = (int *)arg;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -95,7 +97,9 @@ 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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -117,7 +121,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/taskgroup_02.c

@@ -58,7 +58,9 @@ void taskgroup_f(void *arg)
 	struct starpu_omp_task_region_attr attr;
 	int *p_i = (int *)arg;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -99,7 +101,9 @@ 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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -121,7 +125,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;

tests/openmp/taskwait_01.c

@@ -67,7 +67,9 @@ 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));
+#ifdef STARPU_SIMGRID
 	attr.cl.model         = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0]  = task_region_g;
 	attr.cl.where         = STARPU_CPU;
 	attr.cl_arg_size      = sizeof(void *);
@@ -102,7 +104,9 @@ main (void)
 {
 	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
+#ifdef STARPU_SIMGRID
 	attr.cl.model        = &starpu_perfmodel_nop;
+#endif
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;
 	attr.if_clause       = 1;