minor code optimizations

src/core/perfmodel/perfmodel_history.c

@@ -310,7 +310,7 @@ void load_history_based_model(struct starpu_perfmodel_t *model, unsigned scan_hi
 	pthread_spin_lock(&model->model_mutex);
 
 	/* perhaps some other thread got in before ... */
-	if (!model->is_loaded)
+	if (STARPU_UNLIKELY(!model->is_loaded))
 	{
 		/* make sure the performance model directory exists (or create it) */
 		if (!directory_existence_was_tested)
@@ -373,7 +373,7 @@ double regression_based_job_expected_length(struct starpu_perfmodel_t *model, en
 	size_t size = job_get_data_size(j);
 	struct starpu_regression_model_t *regmodel;
 
-	if (!model->is_loaded)
+	if (STARPU_UNLIKELY(!model->is_loaded))
 		load_history_based_model(model, 0);
 
 	regmodel = &model->per_arch[arch].regression;
@@ -391,10 +391,10 @@ double history_based_job_expected_length(struct starpu_perfmodel_t *model, enum
 	struct starpu_history_entry_t *entry;
 	struct starpu_htbl32_node_s *history;
 
-	if (!model->is_loaded)
+	if (STARPU_UNLIKELY(!model->is_loaded))
 		load_history_based_model(model, 1);
 
-	if (!j->footprint_is_computed)
+	if (STARPU_UNLIKELY(!j->footprint_is_computed))
 		compute_buffers_footprint(j);
 		
 	uint32_t key = j->footprint;

src/drivers/gordon/driver_gordon.c

@@ -243,10 +243,9 @@ static void gordon_callback_list_func(void *arg)
 		job_t j = job_list_pop_back(wrapper_list);
 
 		struct gordon_ppu_job_s * gordon_task = &task_wrapper->gordon_job[task_cnt];
-		
-		if (j->task->cl->model && j->task->cl->model->benchmarking)
+		struct starpu_perfmodel_t *model = j->task->cl->model;
+		if (model && model->benchmarking)
 		{
-			//fprintf(stderr, "gordon_task -> execution time %lx\n", gordon_task->measured);
 			update_perfmodel_history(j, STARPU_GORDON_DEFAULT, gordon_task->measured);
 		}
 
@@ -350,7 +349,8 @@ int inject_task_list(struct job_list_s *list, struct worker_s *worker)
 
 		gordon_jobs[index].index = task->cl->gordon_func;
 
-		if (j->task->cl->model && j->task->cl->model->benchmarking)
+		struct starpu_perfmodel_t *model = j->task->cl->model;
+		if (model && model->benchmarking)
 			gordon_jobs[index].sampling = 1;
 
 		/* we should not hardcore the memory node ... XXX */