perfmodel: rename 'struct starpu_regression_model' to 'struct starpu_perfmodel_regression_model'

doc/chapters/basic-api.texi

@@ -1982,7 +1982,7 @@ Lock to protect concurrency between loading from disk (W), updating the values
 @end table
 @end deftp
 
-@deftp {Data Type} {struct starpu_regression_model}
+@deftp {Data Type} {struct starpu_perfmodel_regression_model}
 @table @asis
 @item @code{double sumlny} sum of ln(measured)
 @item @code{double sumlnx} sum of ln(size)
@@ -2024,7 +2024,7 @@ The history of performance measurements.
 Used by @code{STARPU_HISTORY_BASED} and @code{STARPU_NL_REGRESSION_BASED},
 records all execution history measures.
 
-@item @code{struct starpu_regression_model regression}
+@item @code{struct starpu_perfmodel_regression_model regression}
 Used by @code{STARPU_HISTORY_REGRESION_BASED} and
 @code{STARPU_NL_REGRESSION_BASED}, contains the estimated factors of the
 regression.

include/starpu_perfmodel.h

@@ -111,7 +111,7 @@ struct starpu_perfmodel_history_list
 	struct starpu_perfmodel_history_entry *entry;
 };
 
-struct starpu_regression_model
+struct starpu_perfmodel_regression_model
 {
 	/* sum of ln(measured) */
 	double sumlny;
@@ -150,7 +150,7 @@ struct starpu_per_arch_perfmodel
 	/* internal variables */
 	struct starpu_perfmodel_history_table *history;
 	struct starpu_perfmodel_history_list *list;
-	struct starpu_regression_model regression;
+	struct starpu_perfmodel_regression_model regression;
 #ifdef STARPU_MODEL_DEBUG
 	char debug_path[256];
 #endif

src/core/perfmodel/perfmodel_history.c

@@ -82,7 +82,7 @@ static void dump_reg_model(FILE *f, struct starpu_perfmodel *model, unsigned arc
 	struct starpu_per_arch_perfmodel *per_arch_model;
 
 	per_arch_model = &model->per_arch[arch][nimpl];
-	struct starpu_regression_model *reg_model;
+	struct starpu_perfmodel_regression_model *reg_model;
 	reg_model = &per_arch_model->regression;
 
 	/*
@@ -116,7 +116,7 @@ static void dump_reg_model(FILE *f, struct starpu_perfmodel *model, unsigned arc
 	fprintf(f, "%-15le\t%-15le\t%-15le\n", a, b, c);
 }
 
-static void scan_reg_model(FILE *f, struct starpu_regression_model *reg_model)
+static void scan_reg_model(FILE *f, struct starpu_perfmodel_regression_model *reg_model)
 {
 	int res;
 
@@ -970,7 +970,7 @@ double _starpu_regression_based_job_expected_perf(struct starpu_perfmodel *model
 {
 	double exp = NAN;
 	size_t size = _starpu_job_get_data_size(model, arch, nimpl, j);
-	struct starpu_regression_model *regmodel;
+	struct starpu_perfmodel_regression_model *regmodel;
 
 	regmodel = &model->per_arch[arch][nimpl].regression;
 
@@ -984,7 +984,7 @@ double _starpu_non_linear_regression_based_job_expected_perf(struct starpu_perfm
 {
 	double exp = NAN;
 	size_t size = _starpu_job_get_data_size(model, arch, nimpl, j);
-	struct starpu_regression_model *regmodel;
+	struct starpu_perfmodel_regression_model *regmodel;
 
 	regmodel = &model->per_arch[arch][nimpl].regression;
 
@@ -1113,7 +1113,7 @@ void _starpu_update_perfmodel_history(struct _starpu_job *j, struct starpu_perfm
 
 		if (model->type == STARPU_REGRESSION_BASED || model->type == STARPU_NL_REGRESSION_BASED)
 		{
-			struct starpu_regression_model *reg_model;
+			struct starpu_perfmodel_regression_model *reg_model;
 			reg_model = &per_arch_model->regression;
 
 			/* update the regression model */

tools/dev/rename.sed

@@ -14,6 +14,7 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+s/\bstruct starpu_regression_model\b/struct starpu_perfmodel_regression_model/g
 s/\bstruct starpu_history_table\b/struct starpu_perfmodel_history_table/g
 s/\bstruct starpu_history_entry\b/struct starpu_perfmodel_history_entry/g
 s/\bstruct starpu_history_list\b/struct starpu_perfmodel_history_list/g