src/core: rename _starpu_load_perfmodel to _starpu_init_and_load_perfmodel

src/core/perfmodel/perfmodel.c

@@ -133,7 +133,7 @@ static double common_task_expected_perf(struct starpu_perfmodel *model, struct s
 	return (exp/alpha);
 }
 
-void _starpu_load_perfmodel(struct starpu_perfmodel *model)
+void _starpu_init_and_load_perfmodel(struct starpu_perfmodel *model)
 {
 	if (!model || model->is_loaded)
 		return;
@@ -174,7 +174,7 @@ static double starpu_model_expected_perf(struct starpu_task *task, struct starpu
 {
 	if (model)
 	{
-		_starpu_load_perfmodel(model);
+		_starpu_init_and_load_perfmodel(model);
 
 		struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
 

src/core/perfmodel/perfmodel.h

@@ -72,7 +72,7 @@ double _starpu_history_based_job_expected_perf(struct starpu_perfmodel *model, s
 void _starpu_load_per_arch_based_model(struct starpu_perfmodel *model);
 void _starpu_load_common_based_model(struct starpu_perfmodel *model);
 void _starpu_load_history_based_model(struct starpu_perfmodel *model, unsigned scan_history);
-void _starpu_load_perfmodel(struct starpu_perfmodel *model);
+void _starpu_init_and_load_perfmodel(struct starpu_perfmodel *model);
 void _starpu_initialize_registered_performance_models(void);
 void _starpu_deinitialize_registered_performance_models(void);
 void _starpu_deinitialize_performance_model(struct starpu_perfmodel *model);

src/core/perfmodel/perfmodel_history.c

@@ -1404,7 +1404,7 @@ void starpu_perfmodel_update_history(struct starpu_perfmodel *model, struct star
 	STARPU_ASSERT_MSG(0, "We are not supposed to update history when simulating execution");
 #endif
 
-	_starpu_load_perfmodel(model);
+	_starpu_init_and_load_perfmodel(model);
 	/* Record measurement */
 	_starpu_update_perfmodel_history(job, model, arch, cpuid, measured, nimpl);
 	/* and save perfmodel on termination */

src/core/task.c

@@ -486,10 +486,10 @@ int starpu_task_submit(struct starpu_task *task)
 		_starpu_detect_implicit_data_deps(task);
 
 		if (task->cl->model)
-			_starpu_load_perfmodel(task->cl->model);
+			_starpu_init_and_load_perfmodel(task->cl->model);
 
 		if (task->cl->power_model)
-			_starpu_load_perfmodel(task->cl->power_model);
+			_starpu_init_and_load_perfmodel(task->cl->power_model);
 	}
 
 	if (bundle)
@@ -505,10 +505,10 @@ int starpu_task_submit(struct starpu_task *task)
 		while (entry)
 		{
 			if (entry->task->cl->model)
-				_starpu_load_perfmodel(entry->task->cl->model);
+				_starpu_init_and_load_perfmodel(entry->task->cl->model);
 
 			if (entry->task->cl->power_model)
-				_starpu_load_perfmodel(entry->task->cl->power_model);
+				_starpu_init_and_load_perfmodel(entry->task->cl->power_model);
 
 			entry = entry->next;
 		}
@@ -568,10 +568,10 @@ int _starpu_task_submit_nodeps(struct starpu_task *task)
 	if (task->cl)
 	{
 		if (task->cl->model)
-			_starpu_load_perfmodel(task->cl->model);
+			_starpu_init_and_load_perfmodel(task->cl->model);
 
 		if (task->cl->power_model)
-			_starpu_load_perfmodel(task->cl->power_model);
+			_starpu_init_and_load_perfmodel(task->cl->power_model);
 	}
 
 	struct _starpu_job *j = _starpu_get_job_associated_to_task(task);
@@ -629,10 +629,10 @@ int _starpu_task_submit_conversion_task(struct starpu_task *task,
 
 	/* We should factorize that */
 	if (task->cl->model)
-		_starpu_load_perfmodel(task->cl->model);
+		_starpu_init_and_load_perfmodel(task->cl->model);
 
 	if (task->cl->power_model)
-		_starpu_load_perfmodel(task->cl->power_model);
+		_starpu_init_and_load_perfmodel(task->cl->power_model);
 
 	/* We retain handle reference count */
 	unsigned i;