perfmodel: move functions starpu_perfmodel_print and starpu_perfmodel_print_all to public API

doc/chapters/basic-api.texi

@@ -2052,6 +2052,14 @@ returns the architecture type of a given worker.
 prints a list of all performance models on @var{output}.
 @end deftypefun
 
+@deftypefun void starpu_perfmodel_print ({struct starpu_perfmodel *}@var{model}, {enum starpu_perf_archtype} @var{arch}, unsigned @var{nimpl}, {char *}@var{parameter}, {uint32_t *}footprint, {FILE *}@var{output})
+todo
+@end deftypefun
+
+@deftypefun int starpu_perfmodel_print_all({struct starpu_perfmodel *}@var{model}, {char *}@var{arch}, @var{char *}parameter,  {uint32_t *}@var{footprint}, {FILE *}@var{output})
+todo
+@end deftypefun
+
 @deftypefun void starpu_bus_print_bandwidth ({FILE *}@var{f})
 prints a matrix of bus bandwidths on @var{f}.
 @end deftypefun

include/starpu_perfmodel.h

@@ -201,7 +201,10 @@ enum starpu_perf_archtype starpu_worker_get_perf_archtype(int workerid);
 int starpu_perfmodel_load_symbol(const char *symbol, struct starpu_perfmodel *model);
 void starpu_perfmodel_debugfilepath(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, char *path, size_t maxlen, unsigned nimpl);
 void starpu_perfmodel_get_arch_name(enum starpu_perf_archtype arch, char *archname, size_t maxlen, unsigned nimpl);
+
 int starpu_perfmodel_list(FILE *output);
+void starpu_perfmodel_print(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, char *parameter, uint32_t *footprint, FILE *output);
+int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char *parameter, uint32_t *footprint, FILE *output);
 
 void starpu_perfmodel_update_history(struct starpu_perfmodel *model, struct starpu_task *, enum starpu_perf_archtype arch, unsigned cpuid, unsigned nimpl, double measured);
 

src/Makefile.am

@@ -139,6 +139,7 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 						\
 	core/perfmodel/perfmodel_history.c			\
 	core/perfmodel/perfmodel_bus.c				\
 	core/perfmodel/perfmodel.c				\
+	core/perfmodel/perfmodel_print.c			\
 	core/perfmodel/regression.c				\
 	core/sched_policy.c					\
 	core/priorities.c					\

src/core/perfmodel/perfmodel_print.c

@@ -0,0 +1,254 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2011  Université de Bordeaux 1
+ * Copyright (C) 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011  Télécom-SudParis
+ *
+ * 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
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <starpu.h>
+#include <starpu_perfmodel.h>
+#include <common/config.h>
+
+static
+void _starpu_perfmodel_print_history_based(struct starpu_per_arch_perfmodel *per_arch_model, char *parameter, uint32_t *footprint, FILE *output)
+{
+	struct starpu_history_list *ptr;
+
+	ptr = per_arch_model->list;
+
+	if (!parameter && ptr)
+		fprintf(output, "# hash\t\tsize\t\tmean\t\tstddev\t\tn\n");
+
+	while (ptr)
+	{
+		struct starpu_history_entry *entry = ptr->entry;
+		if (!footprint || entry->footprint == *footprint)
+		{
+			if (!parameter)
+			{
+				/* There isn't a parameter that is explicitely requested, so we display all parameters */
+				printf("%08x\t%-15lu\t%-15le\t%-15le\t%u\n", entry->footprint,
+					(unsigned long) entry->size, entry->mean, entry->deviation, entry->nsample);
+			}
+			else
+			{
+				/* only display the parameter that was specifically requested */
+				if (strcmp(parameter, "mean") == 0)
+				{
+					printf("%-15le\n", entry->mean);
+				}
+
+				if (strcmp(parameter, "stddev") == 0)
+				{
+					printf("%-15le\n", entry->deviation);
+					return;
+				}
+			}
+		}
+
+		ptr = ptr->next;
+	}
+}
+
+void starpu_perfmodel_print(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, char *parameter, uint32_t *footprint, FILE *output)
+{
+	struct starpu_per_arch_perfmodel *arch_model = &model->per_arch[arch][nimpl];
+	char archname[32];
+
+	if (arch_model->regression.nsample || arch_model->regression.valid || arch_model->regression.nl_valid || arch_model->list)
+	{
+		starpu_perfmodel_get_arch_name(arch, archname, 32, nimpl);
+		fprintf(output, "performance model for %s\n", archname);
+	}
+
+	if (parameter == NULL)
+	{
+		/* no specific parameter was requested, so we display everything */
+		if (arch_model->regression.nsample)
+		{
+			fprintf(output, "\tRegression : #sample = %d\n", arch_model->regression.nsample);
+		}
+
+		/* Only display the regression model if we could actually build a model */
+		if (arch_model->regression.valid)
+		{
+			fprintf(output, "\tLinear: y = alpha size ^ beta\n");
+			fprintf(output, "\t\talpha = %e\n", arch_model->regression.alpha);
+			fprintf(output, "\t\tbeta = %e\n", arch_model->regression.beta);
+		}
+		else
+		{
+			//fprintf(output, "\tLinear model is INVALID\n");
+		}
+
+		if (arch_model->regression.nl_valid)
+		{
+			fprintf(output, "\tNon-Linear: y = a size ^b + c\n");
+			fprintf(output, "\t\ta = %e\n", arch_model->regression.a);
+			fprintf(output, "\t\tb = %e\n", arch_model->regression.b);
+			fprintf(output, "\t\tc = %e\n", arch_model->regression.c);
+		}
+		else
+		{
+			//fprintf(output, "\tNon-Linear model is INVALID\n");
+		}
+
+		_starpu_perfmodel_print_history_based(arch_model, parameter, footprint, output);
+
+#if 0
+		char debugname[1024];
+		starpu_perfmodel_debugfilepath(model, arch, debugname, 1024, nimpl);
+		printf("\t debug file path : %s\n", debugname);
+#endif
+	}
+	else
+	{
+		/* only display the parameter that was specifically requested */
+		if (strcmp(parameter, "a") == 0)
+		{
+			printf("%e\n", arch_model->regression.a);
+			return;
+		}
+
+		if (strcmp(parameter, "b") == 0)
+		{
+			printf("%e\n", arch_model->regression.b);
+			return;
+		}
+
+		if (strcmp(parameter, "c") == 0)
+		{
+			printf("%e\n", arch_model->regression.c);
+			return;
+		}
+
+		if (strcmp(parameter, "alpha") == 0)
+		{
+			printf("%e\n", arch_model->regression.alpha);
+			return;
+		}
+
+		if (strcmp(parameter, "beta") == 0)
+		{
+			printf("%e\n", arch_model->regression.beta);
+			return;
+		}
+
+		if (strcmp(parameter, "path-file-debug") == 0)
+		{
+			char debugname[256];
+			starpu_perfmodel_debugfilepath(model, arch, debugname, 1024, nimpl);
+			printf("%s\n", debugname);
+			return;
+		}
+
+		if ((strcmp(parameter, "mean") == 0) || (strcmp(parameter, "stddev") == 0))
+		{
+			_starpu_perfmodel_print_history_based(arch_model, parameter, footprint, output);
+			return;
+		}
+
+		/* TODO display if it's valid ? */
+
+		fprintf(output, "Unknown parameter requested, aborting.\n");
+		exit(-1);
+	}
+}
+
+int starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char *parameter, uint32_t *footprint, FILE *output)
+{
+	if (arch == NULL)
+	{
+		/* display all architectures */
+		unsigned archid;
+		unsigned implid;
+		for (archid = 0; archid < STARPU_NARCH_VARIATIONS; archid++)
+		{
+			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
+			{ /* Display all codelets on each arch */
+				starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, output);
+			}
+		}
+	}
+	else
+	{
+		if (strcmp(arch, "cpu") == 0)
+		{
+			unsigned implid;
+			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
+				starpu_perfmodel_print(model, STARPU_CPU_DEFAULT,implid, parameter, footprint, output); /* Display all codelets on cpu */
+			return 0;
+		}
+
+		int k;
+		if (sscanf(arch, "cpu:%d", &k) == 1)
+		{
+			/* For combined CPU workers */
+			if ((k < 1) || (k > STARPU_MAXCPUS))
+			{
+				fprintf(output, "Invalid CPU size\n");
+				exit(-1);
+			}
+
+			unsigned implid;
+			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
+				starpu_perfmodel_print(model, (enum starpu_perf_archtype) (STARPU_CPU_DEFAULT + k - 1), implid, parameter, footprint, output);
+			return 0;
+		}
+
+		if (strcmp(arch, "cuda") == 0)
+		{
+			unsigned archid;
+			unsigned implid;
+			for (archid = STARPU_CUDA_DEFAULT; archid < STARPU_CUDA_DEFAULT + STARPU_MAXCUDADEVS; archid++)
+			{
+				for (implid = 0; implid <STARPU_MAXIMPLEMENTATIONS; implid ++)
+				{
+					char archname[32];
+					starpu_perfmodel_get_arch_name((enum starpu_perf_archtype) archid, archname, 32, implid);
+					fprintf(output, "performance model for %s\n", archname);
+					starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, output);
+				}
+			}
+			return 0;
+		}
+
+		/* There must be a cleaner way ! */
+		int gpuid;
+		int nmatched;
+		nmatched = sscanf(arch, "cuda_%d", &gpuid);
+		if (nmatched == 1)
+		{
+			unsigned archid = STARPU_CUDA_DEFAULT+ gpuid;
+			unsigned implid;
+			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
+				starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, output);
+			return 0;
+		}
+
+		if (strcmp(arch, "gordon") == 0)
+		{
+			fprintf(output, "performance model for gordon\n");
+			unsigned implid;
+			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
+				starpu_perfmodel_print(model, STARPU_GORDON_DEFAULT, implid, parameter, footprint, output);
+			return 0;
+		}
+
+		fprintf(output, "Unknown architecture requested\n");
+		return -1;
+	}
+	return 0;
+}
+

tools/starpu_perfmodel_display.c

@@ -133,237 +133,6 @@ static void parse_args(int argc, char **argv)
 	}
 }
 
-static
-void starpu_perfmodel_print_history_based(struct starpu_per_arch_perfmodel *per_arch_model, char *parameter, uint32_t *footprint, FILE *f)
-{
-	struct starpu_history_list *ptr;
-
-	ptr = per_arch_model->list;
-
-	if (!parameter && ptr)
-		fprintf(f, "# hash\t\tsize\t\tmean\t\tdev\t\tn\n");
-
-	while (ptr)
-	{
-		struct starpu_history_entry *entry = ptr->entry;
-		if (!footprint || entry->footprint == *footprint)
-		{
-			if (!parameter)
-			{
-				/* There isn't a parameter that is explicitely requested, so we display all parameters */
-				printf("%08x\t%-15lu\t%-15le\t%-15le\t%u\n", entry->footprint,
-					(unsigned long) entry->size, entry->mean, entry->deviation, entry->nsample);
-			}
-			else
-			{
-				/* only display the parameter that was specifically requested */
-				if (strcmp(parameter, "mean") == 0)
-				{
-					printf("%-15le\n", entry->mean);
-				}
-
-				if (strcmp(parameter, "stddev") == 0)
-				{
-					printf("%-15le\n", entry->deviation);
-					return;
-				}
-			}
-		}
-
-		ptr = ptr->next;
-	}
-}
-
-static void starpu_perfmodel_print(struct starpu_perfmodel *model, enum starpu_perf_archtype arch, unsigned nimpl, char *parameter, uint32_t *footprint, FILE *f)
-{
-	struct starpu_per_arch_perfmodel *arch_model = &model->per_arch[arch][nimpl];
-	char archname[32];
-
-	if (arch_model->regression.nsample || arch_model->regression.valid || arch_model->regression.nl_valid || arch_model->list)
-	{
-		starpu_perfmodel_get_arch_name(arch, archname, 32, nimpl);
-		fprintf(f, "performance model for %s\n", archname);
-	}
-
-	if (parameter == NULL)
-	{
-		/* no specific parameter was requested, so we display everything */
-		if (arch_model->regression.nsample)
-		{
-			fprintf(f, "\tRegression : #sample = %d\n", arch_model->regression.nsample);
-		}
-
-		/* Only display the regression model if we could actually build a model */
-		if (arch_model->regression.valid)
-		{
-			fprintf(f, "\tLinear: y = alpha size ^ beta\n");
-			fprintf(f, "\t\talpha = %e\n", arch_model->regression.alpha);
-			fprintf(f, "\t\tbeta = %e\n", arch_model->regression.beta);
-		}
-		else
-		{
-			//fprintf(f, "\tLinear model is INVALID\n");
-		}
-
-		if (arch_model->regression.nl_valid)
-		{
-			fprintf(f, "\tNon-Linear: y = a size ^b + c\n");
-			fprintf(f, "\t\ta = %e\n", arch_model->regression.a);
-			fprintf(f, "\t\tb = %e\n", arch_model->regression.b);
-			fprintf(f, "\t\tc = %e\n", arch_model->regression.c);
-		}
-		else
-		{
-			//fprintf(f, "\tNon-Linear model is INVALID\n");
-		}
-
-		starpu_perfmodel_print_history_based(arch_model, parameter, footprint, f);
-
-#if 0
-		char debugname[1024];
-		starpu_perfmodel_debugfilepath(model, arch, debugname, 1024, nimpl);
-		printf("\t debug file path : %s\n", debugname);
-#endif
-	}
-	else
-	{
-		/* only display the parameter that was specifically requested */
-		if (strcmp(parameter, "a") == 0)
-		{
-			printf("%e\n", arch_model->regression.a);
-			return;
-		}
-
-		if (strcmp(parameter, "b") == 0)
-		{
-			printf("%e\n", arch_model->regression.b);
-			return;
-		}
-
-		if (strcmp(parameter, "c") == 0)
-		{
-			printf("%e\n", arch_model->regression.c);
-			return;
-		}
-
-		if (strcmp(parameter, "alpha") == 0)
-		{
-			printf("%e\n", arch_model->regression.alpha);
-			return;
-		}
-
-		if (strcmp(parameter, "beta") == 0)
-		{
-			printf("%e\n", arch_model->regression.beta);
-			return;
-		}
-
-		if (strcmp(parameter, "path-file-debug") == 0)
-		{
-			char debugname[256];
-			starpu_perfmodel_debugfilepath(model, arch, debugname, 1024, nimpl);
-			printf("%s\n", debugname);
-			return;
-		}
-
-		if ((strcmp(parameter, "mean") == 0) || (strcmp(parameter, "stddev")))
-		{
-			starpu_perfmodel_print_history_based(arch_model, parameter, footprint, f);
-			return;
-		}
-
-		/* TODO display if it's valid ? */
-
-		fprintf(f, "Unknown parameter requested, aborting.\n");
-		exit(-1);
-	}
-}
-
-static void starpu_perfmodel_print_all(struct starpu_perfmodel *model, char *arch, char *parameter, uint32_t *footprint, FILE *f)
-{
-	if (arch == NULL)
-	{
-		/* display all architectures */
-		unsigned archid;
-		unsigned implid;
-		for (archid = 0; archid < STARPU_NARCH_VARIATIONS; archid++)
-		{
-			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
-			{ /* Display all codelets on each arch */
-				starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, f);
-			}
-		}
-	}
-	else
-	{
-		if (strcmp(arch, "cpu") == 0)
-		{
-			unsigned implid;
-			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
-				starpu_perfmodel_print(model, STARPU_CPU_DEFAULT,implid, parameter, footprint, f); /* Display all codelets on cpu */
-			return;
-		}
-
-		int k;
-		if (sscanf(arch, "cpu:%d", &k) == 1)
-		{
-			/* For combined CPU workers */
-			if ((k < 1) || (k > STARPU_MAXCPUS))
-			{
-				fprintf(f, "Invalid CPU size\n");
-				exit(-1);
-			}
-
-			unsigned implid;
-			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
-				starpu_perfmodel_print(model, (enum starpu_perf_archtype) (STARPU_CPU_DEFAULT + k - 1), implid, parameter, footprint, f);
-			return;
-		}
-
-		if (strcmp(arch, "cuda") == 0)
-		{
-			unsigned archid;
-			unsigned implid;
-			for (archid = STARPU_CUDA_DEFAULT; archid < STARPU_CUDA_DEFAULT + STARPU_MAXCUDADEVS; archid++)
-			{
-				for (implid = 0; implid <STARPU_MAXIMPLEMENTATIONS; implid ++)
-				{
-					char archname[32];
-					starpu_perfmodel_get_arch_name((enum starpu_perf_archtype) archid, archname, 32, implid);
-					fprintf(f, "performance model for %s\n", archname);
-					starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, f);
-				}
-			}
-			return;
-		}
-
-		/* There must be a cleaner way ! */
-		int gpuid;
-		int nmatched;
-		nmatched = sscanf(arch, "cuda_%d", &gpuid);
-		if (nmatched == 1)
-		{
-			unsigned archid = STARPU_CUDA_DEFAULT+ gpuid;
-			unsigned implid;
-			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
-				starpu_perfmodel_print(model, (enum starpu_perf_archtype) archid, implid, parameter, footprint, f);
-			return;
-		}
-
-		if (strcmp(arch, "gordon") == 0)
-		{
-			fprintf(f, "performance model for gordon\n");
-			unsigned implid;
-			for (implid = 0; implid < STARPU_MAXIMPLEMENTATIONS; implid++)
-				starpu_perfmodel_print(model, STARPU_GORDON_DEFAULT, implid, parameter, footprint, f);
-			return;
-		}
-
-		fprintf(f, "Unknown architecture requested, aborting.\n");
-		exit(-1);
-	}
-}
-
 int main(int argc, char **argv)
 {
 #ifdef __MINGW32__