Add missing files in dist

tools/Makefile.am

@@ -37,11 +37,25 @@ dist_pkgdata_perfmodels_sampling_bus_DATA = \
 	perfmodels/sampling/bus/attila.config	\
 	perfmodels/sampling/bus/attila.latency	\
 	perfmodels/sampling/bus/attila.platform.xml	\
+	perfmodels/sampling/bus/attila.platform.v4.xml	\
+	perfmodels/sampling/bus/idgraf.affinity	\
+	perfmodels/sampling/bus/idgraf.bandwidth	\
+	perfmodels/sampling/bus/idgraf.config	\
+	perfmodels/sampling/bus/idgraf.latency	\
+	perfmodels/sampling/bus/idgraf.platform.xml	\
+	perfmodels/sampling/bus/idgraf.platform.v4.xml
 	perfmodels/sampling/bus/mirage.affinity	\
 	perfmodels/sampling/bus/mirage.bandwidth	\
 	perfmodels/sampling/bus/mirage.config	\
 	perfmodels/sampling/bus/mirage.latency	\
-	perfmodels/sampling/bus/mirage.platform.xml
+	perfmodels/sampling/bus/mirage.platform.xml	\
+	perfmodels/sampling/bus/mirage.platform.v4.xml	\
+	perfmodels/sampling/bus/sirocco.affinity	\
+	perfmodels/sampling/bus/sirocco.bandwidth	\
+	perfmodels/sampling/bus/sirocco.config	\
+	perfmodels/sampling/bus/sirocco.latency	\
+	perfmodels/sampling/bus/sirocco.platform.xml	\
+	perfmodels/sampling/bus/sirocco.platform.v4.xml
 
 dist_pkgdata_perfmodels_sampling_codelets_DATA = \
 	perfmodels/sampling/codelets/44/chol_model_11.attila	\
@@ -60,6 +74,22 @@ dist_pkgdata_perfmodels_sampling_codelets_DATA = \
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_12.attila	\
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_21.attila	\
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_22.attila	\
+	perfmodels/sampling/codelets/44/chol_model_11.idgraf	\
+	perfmodels/sampling/codelets/44/chol_model_21.idgraf	\
+	perfmodels/sampling/codelets/44/chol_model_22.idgraf	\
+	perfmodels/sampling/codelets/44/cl_update.idgraf	\
+	perfmodels/sampling/codelets/44/save_cl_bottom.idgraf	\
+	perfmodels/sampling/codelets/44/save_cl_top.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_sgemm_gemm.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_dgemm_gemm.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_11.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_12.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_21.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_22.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_11.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_12.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_21.idgraf	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_22.idgraf	\
 	perfmodels/sampling/codelets/44/chol_model_11.mirage	\
 	perfmodels/sampling/codelets/44/chol_model_21.mirage	\
 	perfmodels/sampling/codelets/44/chol_model_22.mirage	\
@@ -75,7 +105,23 @@ dist_pkgdata_perfmodels_sampling_codelets_DATA = \
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_11.mirage	\
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_12.mirage	\
 	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_21.mirage	\
-	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_22.mirage
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_22.mirage	\
+	perfmodels/sampling/codelets/44/chol_model_11.sirocco	\
+	perfmodels/sampling/codelets/44/chol_model_21.sirocco	\
+	perfmodels/sampling/codelets/44/chol_model_22.sirocco	\
+	perfmodels/sampling/codelets/44/cl_update.sirocco	\
+	perfmodels/sampling/codelets/44/save_cl_bottom.sirocco	\
+	perfmodels/sampling/codelets/44/save_cl_top.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_sgemm_gemm.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_dgemm_gemm.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_11.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_12.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_21.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_slu_lu_model_22.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_11.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_12.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_21.sirocco	\
+	perfmodels/sampling/codelets/44/starpu_dlu_lu_model_22.sirocco
 
 EXTRA_DIST =				\
 	dev/rename.sed			\

tools/starpu_fxt_data_trace.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2013       Joris Pablo
- * Copyright (C) 2011-2014  Universite de Bordeaux
+ * Copyright (C) 2011-2014, 2016  Universite de Bordeaux
  * Copyright (C) 2014, 2015       CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ static void usage()
         fprintf(stderr, "\n");
 }
 
-static void parse_args(int argc, char **argv)
+static int parse_args(int argc, char **argv)
 {
 	int i;
 
@@ -46,7 +46,7 @@ static void parse_args(int argc, char **argv)
 	{
 		fprintf(stderr, "Incorrect usage, aborting\n");
                 usage();
-		exit(77);
+		return 77;
 	}
 
 	for (i = 1; i < argc; i++)
@@ -54,15 +54,16 @@ static void parse_args(int argc, char **argv)
 		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
 		{
 			usage();
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 
 		if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0)
 		{
 		        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 	}
+	return 0;
 }
 
 static void write_gp(int argc, char **argv)
@@ -144,7 +145,8 @@ static void write_gp(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
-	parse_args(argc, argv);
+	int ret = parse_args(argc, argv);
+	if (ret) return ret;
 	starpu_fxt_write_data_trace(argv[1]);
 	write_gp(argc - 2, argv + 2);
 	starpu_perfmodel_free_sampling_directories();

tools/starpu_fxt_stats.c

@@ -51,7 +51,7 @@ static void usage()
         fprintf(stderr, "\n");
 }
 
-static void parse_args(int argc, char **argv, char **fin, char **fout)
+static int parse_args(int argc, char **argv, char **fin, char **fout)
 {
 	int i;
 
@@ -74,13 +74,13 @@ static void parse_args(int argc, char **argv, char **fin, char **fout)
 		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
 		{
 			usage();
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 
 		if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0)
 		{
 		        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 	}
 
@@ -88,8 +88,9 @@ static void parse_args(int argc, char **argv, char **fin, char **fout)
 	{
 		fprintf(stderr, "Incorrect usage, aborting\n");
                 usage();
-		exit(77);
+		return 77;
 	}
+	return 0;
 }
 
 static void handle_data_copy(void)
@@ -113,7 +114,8 @@ int main(int argc, char **argv)
 	int fd_in;
 	FILE *fd_out;
 
-	parse_args(argc, argv, &fin, &fout);
+	ret = parse_args(argc, argv, &fin, &fout);
+	if (ret) return ret;
 
 	fd_in = open(fin, O_RDONLY);
 	if (fd_in < 0)

tools/starpu_fxt_tool.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011-2014  Universite de Bordeaux
+ * Copyright (C) 2011-2014, 2016  Universite de Bordeaux
  * Copyright (C) 2012-2015  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -44,7 +44,7 @@ static void usage()
 
 static struct starpu_fxt_options options;
 
-static void parse_args(int argc, char **argv)
+static int parse_args(int argc, char **argv)
 {
 	/* Default options */
 	starpu_fxt_options_init(&options);
@@ -93,14 +93,14 @@ static void parse_args(int argc, char **argv)
 		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
 		{
 			usage();
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 
 		if (strcmp(argv[i], "-v") == 0
 		 || strcmp(argv[i], "--version") == 0)
 		{
 		        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
-			exit(EXIT_SUCCESS);
+			return EXIT_SUCCESS;
 		}
 
 		/* That's pretty dirty: if the reading_input_filenames flag is
@@ -117,13 +117,15 @@ static void parse_args(int argc, char **argv)
 	{
 		fprintf(stderr, "Incorrect usage, aborting\n");
                 usage();
-		exit(77);
+		return 77;
 	}
+	return 0;
 }
 
 int main(int argc, char **argv)
 {
-	parse_args(argc, argv);
+	int ret = parse_args(argc, argv);
+	if (ret) return ret;
 
 	starpu_fxt_generate_trace(&options);