rename starpu_nop_perf_model into starpu_perfmodel_nop

doc/doxygen/chapters/api/performance_model.doxy

@@ -333,7 +333,7 @@ Return the estimated time to transfer a given size between two memory nodes.
 \ingroup API_Performance_Model
 Return the estimated time of a task with the given model and the given footprint.
 
-\var starpu_nop_perf_model
+\var starpu_perfmodel_nop
 Performance model which just always return 1µs.
 
 */

include/starpu_perfmodel.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2014, 2016-2017  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  CNRS
+ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017  CNRS
  * Copyright (C) 2011  Télécom-SudParis
  * Copyright (C) 2016  Inria
  *
@@ -202,7 +202,7 @@ double starpu_transfer_bandwidth(unsigned src_node, unsigned dst_node);
 double starpu_transfer_latency(unsigned src_node, unsigned dst_node);
 double starpu_transfer_predict(unsigned src_node, unsigned dst_node, size_t size);
 
-extern struct starpu_perfmodel starpu_nop_perf_model;
+extern struct starpu_perfmodel starpu_perfmodel_nop;
 
 #ifdef __cplusplus
 }

mpi/examples/comm/comm.c

@@ -37,7 +37,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/examples/comm/mix_comm.c

@@ -37,7 +37,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/examples/complex/mpi_complex.c

@@ -31,7 +31,7 @@ struct starpu_codelet foo_display =
 	.cpu_funcs = {display_foo_codelet},
 	.nbuffers = 1,
 	.modes = {STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/examples/stencil/stencil5.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011, 2013, 2015-2017              Université Bordeaux
- * Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016  CNRS
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -42,7 +42,7 @@ struct starpu_codelet stencil5_cl =
 	.cpu_funcs = {stencil5_cpu},
 	.nbuffers = 5,
 	.modes = {STARPU_RW, STARPU_R, STARPU_R, STARPU_R, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #ifdef STARPU_QUICK_CHECK

mpi/examples/stencil/stencil5_lb.c

@@ -43,7 +43,7 @@ struct starpu_codelet stencil5_cl =
 	.cpu_funcs = {stencil5_cpu},
 	.nbuffers = 5,
 	.modes = {STARPU_RW, STARPU_R, STARPU_R, STARPU_R, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #ifdef STARPU_QUICK_CHECK

mpi/tests/cache.c

@@ -28,7 +28,7 @@ struct starpu_codelet mycodelet_r =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_w =
@@ -36,7 +36,7 @@ struct starpu_codelet mycodelet_w =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_rw =
@@ -44,7 +44,7 @@ struct starpu_codelet mycodelet_rw =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void test(struct starpu_codelet *codelet, enum starpu_data_access_mode mode, starpu_data_handle_t data, int rank, int in_cache)

mpi/tests/cache_disable.c

@@ -28,7 +28,7 @@ struct starpu_codelet mycodelet_r =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/callback.c

@@ -32,7 +32,7 @@ struct starpu_codelet my_codelet =
 	.cpu_funcs = {my_func},
 	.cuda_funcs = {my_func},
 	.opencl_funcs = {my_func},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 static

mpi/tests/early_request.c

@@ -67,7 +67,7 @@ static struct starpu_codelet fill_tmp_buffer_cl =
 	.nbuffers = 1,
 	.modes = {STARPU_W},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "fill_tmp_buffer"
 };
@@ -90,7 +90,7 @@ static struct starpu_codelet read_ghost_value_cl =
 	.nbuffers = 1,
 	.modes = {STARPU_R},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "read_ghost_value"
 };
@@ -111,7 +111,7 @@ static struct starpu_codelet submitted_order =
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_W},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "submitted_order_enforcer"
 };

mpi/tests/insert_task.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012, 2013, 2014  CNRS
+ * Copyright (C) 2011, 2012, 2013, 2014, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -32,7 +32,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define X     4

mpi/tests/insert_task_block.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012, 2013, 2014  CNRS
+ * Copyright (C) 2011, 2012, 2013, 2014, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -49,7 +49,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.modes = {STARPU_RW}
 };

mpi/tests/insert_task_compute.c

@@ -34,7 +34,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int test(int rank, int node, int *before, int *after, int task_insert, int data_array)

mpi/tests/insert_task_count.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/insert_task_dyn_handles.c

@@ -41,7 +41,7 @@ struct starpu_codelet codelet =
 	.cpu_funcs_name = {"func_cpu"},
 	.nbuffers = STARPU_VARIABLE_NBUFFERS,
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 };
 

mpi/tests/insert_task_node_choice.c

@@ -35,7 +35,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 	.name = "insert_task_node_choice"
 };
 

mpi/tests/insert_task_owner.c

@@ -35,7 +35,7 @@ struct starpu_codelet mycodelet_r_w =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_R, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_rw_r =
@@ -43,7 +43,7 @@ struct starpu_codelet mycodelet_rw_r =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_rw_rw =
@@ -51,7 +51,7 @@ struct starpu_codelet mycodelet_rw_rw =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_w_r =
@@ -59,7 +59,7 @@ struct starpu_codelet mycodelet_w_r =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_W, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet_r_r =
@@ -67,7 +67,7 @@ struct starpu_codelet mycodelet_r_r =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_R, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/insert_task_owner2.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2012, 2015, 2017                    Université Bordeaux
- * Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016  CNRS
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -38,7 +38,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 4,
 	.modes = {STARPU_R, STARPU_RW, STARPU_W, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/insert_task_owner_data.c

@@ -32,7 +32,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/insert_task_recv_cache.c

@@ -37,7 +37,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define N     1000

mpi/tests/insert_task_sent_cache.c

@@ -37,7 +37,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define N     1000

mpi/tests/insert_task_seq.c

@@ -37,7 +37,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_RW, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 struct starpu_codelet mycodelet2 =
@@ -45,7 +45,7 @@ struct starpu_codelet mycodelet2 =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define X     4

mpi/tests/matrix.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2015, 2016  CNRS
+ * Copyright (C) 2015, 2016, 2017  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -33,7 +33,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_R, STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define N 4

mpi/tests/matrix2.c

@@ -33,7 +33,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_R, STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 #define N 4

mpi/tests/mpi_reduction.c

@@ -30,7 +30,7 @@ static struct starpu_codelet init_codelet =
 	.nbuffers = 1,
 	.modes = {STARPU_W},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "init_codelet"
 };
@@ -41,7 +41,7 @@ static struct starpu_codelet redux_codelet =
 	.modes = {STARPU_RW, STARPU_R},
 	.nbuffers = 2,
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "redux_codelet"
 };
@@ -52,7 +52,7 @@ static struct starpu_codelet dot_codelet =
 	.nbuffers = 2,
 	.modes = {STARPU_R, STARPU_REDUX},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "dot_codelet"
 };
@@ -63,7 +63,7 @@ static struct starpu_codelet display_codelet =
 	.nbuffers = 1,
 	.modes = {STARPU_R},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 	.name = "display_codelet"
 };

mpi/tests/mpi_scatter_gather.c

@@ -44,7 +44,7 @@ static struct starpu_codelet cl =
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
 #ifdef STARPU_SIMGRID
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 #endif
 };
 

mpi/tests/policy_register.c

@@ -28,7 +28,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_W, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int starpu_mpi_select_node_my_policy_0(int me, int nb_nodes, struct starpu_data_descr *descr, int nb_data)

mpi/tests/policy_selection.c

@@ -28,14 +28,14 @@ struct starpu_codelet mycodelet_2 =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 2,
 	.modes = {STARPU_W, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 struct starpu_codelet mycodelet_3 =
 {
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_W, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/policy_selection2.c

@@ -33,7 +33,7 @@ struct starpu_codelet mycodelet =
 	.cpu_funcs = {func_cpu},
 	.nbuffers = 3,
 	.modes = {STARPU_R, STARPU_W, STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)

mpi/tests/ring.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void increment_token(starpu_data_handle_t token_handle)

mpi/tests/ring_async.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void increment_token(starpu_data_handle_t token_handle)

mpi/tests/ring_async_implicit.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void increment_token(starpu_data_handle_t token_handle)

mpi/tests/ring_sync.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void increment_token(starpu_data_handle_t token_handle)

mpi/tests/ring_sync_detached.c

@@ -44,7 +44,7 @@ static struct starpu_codelet increment_cl =
 	.cpu_funcs = {increment_cpu},
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 void increment_token(starpu_data_handle_t handle)

mpi/tests/temporary.c

@@ -34,7 +34,7 @@ static struct starpu_codelet codelet_add =
 	.cpu_funcs = {func_add},
 	.nbuffers = 3,
 	.modes = {STARPU_W, STARPU_R, STARPU_R},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 	.flags = STARPU_CODELET_SIMGRID_EXECUTE,
 };
 

src/core/perfmodel/perfmodel.c

@@ -563,7 +563,7 @@ static double nop_cost_function(struct starpu_task *t STARPU_ATTRIBUTE_UNUSED, s
 	return 0.000001;
 }
 
-struct starpu_perfmodel starpu_nop_perf_model =
+struct starpu_perfmodel starpu_perfmodel_nop =
 {
 	.type = STARPU_PER_ARCH,
 	.arch_cost_function = nop_cost_function,

tests/datawizard/deps.c

@@ -43,7 +43,7 @@ static struct starpu_codelet cl_null =
 {
 	.cpu_funcs = {null_cpu_func},
 	.cpu_funcs_name = {"null_cpu_func"},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 	.name = "null",
 };
 
@@ -54,7 +54,7 @@ static struct starpu_codelet cl_prod =
 	.nbuffers = 1,
 	.modes = {STARPU_RW},
 	.flags = STARPU_CODELET_SIMGRID_EXECUTE,
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 	.name = "prod",
 };
 

tests/datawizard/variable_size.c

@@ -266,7 +266,7 @@ static struct starpu_codelet cl_init =
 	/*.cpu_funcs_name = {"kernel"},*/
 	.nbuffers = 1,
 	.modes = {STARPU_W},
-	.model = &starpu_nop_perf_model,
+	.model = &starpu_perfmodel_nop,
 };
 
 int main(int argc, char **argv)