Просмотр исходного кода

Remove the --enable-paje-condelet-details configure option: vite r1430 has been released more than two years ago, it's even in Debian Jessie, so we can assume people have it on their desktop machine

Samuel Thibault лет назад: 8
Родитель
Сommit
9ec78f8163

+ 0 - 6
configure.ac

@@ -1899,12 +1899,6 @@ if test x$use_fxt = xyes; then
 		FXT_LIBS="$(pkg-config --variable=libdir fxt)/libfxt.a -Wl,--as-needed $(pkg-config --libs --static fxt) -Wl,--no-as-needed"
 		FXT_LIBS="$(pkg-config --variable=libdir fxt)/libfxt.a -Wl,--as-needed $(pkg-config --libs --static fxt) -Wl,--no-as-needed"
 	fi
 	fi
 
 
-        AC_ARG_ENABLE(paje-codelet-details, [AS_HELP_STRING([--enable-paje-codelet-details],
-			[enable details about codelets in the paje trace])],
-			enable_paje_codelet_details=$enableval, enable_paje_codelet_details=no)
-        if  test x$enable_paje_codelet_details = xyes; then
-        	AC_DEFINE(STARPU_ENABLE_PAJE_CODELET_DETAILS, [1], [enable details about codelets in the paje trace])
-        fi
 	##########################################
 	##########################################
 	# Poti is a library to generate paje trace files
 	# Poti is a library to generate paje trace files
 	##########################################
 	##########################################

+ 2 - 8
doc/doxygen/chapters/380_offline_performance_tools.doxy

@@ -122,10 +122,6 @@ $ vite paje.trace
 
 
 To get names of tasks instead of "unknown", fill the optional
 To get names of tasks instead of "unknown", fill the optional
 starpu_codelet::name, or use a performance model for them.
 starpu_codelet::name, or use a performance model for them.
-Details of the codelet execution can be obtained by passing
-\ref enable-paje-codelet-details "--enable-paje-codelet-details" when
-configuring StarPU and using a recent enough version of ViTE (at least
-r1430).
 
 
 In the MPI execution case, \ref STARPU_GENERATE_TRACE will not work as expected
 In the MPI execution case, \ref STARPU_GENERATE_TRACE will not work as expected
 (each node will try to generate paje.trace, thus mixing outputs...), you have to
 (each node will try to generate paje.trace, thus mixing outputs...), you have to
@@ -140,10 +136,8 @@ By default, all tasks are displayed using a green color. To display tasks with
 varying colors, pass option <c>-c</c> to <c>starpu_fxt_tool</c>.
 varying colors, pass option <c>-c</c> to <c>starpu_fxt_tool</c>.
 
 
 To identify tasks precisely, the application can set the starpu_task::tag_id field of the
 To identify tasks precisely, the application can set the starpu_task::tag_id field of the
-task (or use \ref STARPU_TAG_ONLY when using starpu_task_insert()), and with a recent
-enough version of ViTE (>= r1430) and the
-\ref enable-paje-codelet-details "--enable-paje-codelet-details"
-StarPU configure option, the value of the tag will show up in the trace.
+task (or use \ref STARPU_TAG_ONLY when using starpu_task_insert()), and
+the value of the tag will show up in the trace.
 
 
 It can also set the starpu_task::name field of the task (or use \ref STARPU_NAME)
 It can also set the starpu_task::name field of the task (or use \ref STARPU_NAME)
 when using starpu_task_insert()), to replace in traces the name of the codelet
 when using starpu_task_insert()), to replace in traces the name of the codelet

+ 0 - 8
doc/doxygen/chapters/510_configure_options.doxy

@@ -436,14 +436,6 @@ Enable performance debugging through gprof.
 Enable performance model debugging.
 Enable performance model debugging.
 </dd>
 </dd>
 
 
-<dt>--enable-paje-codelet-details</dt>
-<dd>
-\anchor enable-paje-codelet-details
-\addindex __configure__--enable-paje-codelet-details
-Enable details about codelets in the paje trace. This requires a recent enough
-version of ViTE (at least r1430).
-</dd>
-
 <dt>--enable-fxt-lock</dt>
 <dt>--enable-fxt-lock</dt>
 <dd>
 <dd>
 \anchor enable-fxt-lock
 \anchor enable-fxt-lock

+ 0 - 6
src/debug/traces/starpu_fxt.c

@@ -778,7 +778,6 @@ static void thread_pop_state(double time, const char *prefix, long unsigned int
 #endif
 #endif
 }
 }
 
 
-#ifdef STARPU_ENABLE_PAJE_CODELET_DETAILS
 static void worker_set_detailed_state(double time, const char *prefix, long unsigned int workerid, const char *name, unsigned long size, const char *parameters, unsigned long footprint, unsigned long long tag, unsigned long job_id, double gflop, unsigned X, unsigned Y, unsigned Z)
 static void worker_set_detailed_state(double time, const char *prefix, long unsigned int workerid, const char *name, unsigned long size, const char *parameters, unsigned long footprint, unsigned long long tag, unsigned long job_id, double gflop, unsigned X, unsigned Y, unsigned Z)
 {
 {
 #ifdef STARPU_HAVE_POTI
 #ifdef STARPU_HAVE_POTI
@@ -790,7 +789,6 @@ static void worker_set_detailed_state(double time, const char *prefix, long unsi
 	fprintf(out_paje_file, "20	%.9f	%sw%lu	WS	%s	%lu	%s	%08lx	%016llx	%lu	%f	%u	%u	%u\n", time, prefix, workerid, name, size, parameters, footprint, tag, job_id, gflop, X, Y, Z);
 	fprintf(out_paje_file, "20	%.9f	%sw%lu	WS	%s	%lu	%s	%08lx	%016llx	%lu	%f	%u	%u	%u\n", time, prefix, workerid, name, size, parameters, footprint, tag, job_id, gflop, X, Y, Z);
 #endif
 #endif
 }
 }
-#endif
 
 
 static void mpicommthread_set_state(double time, const char *prefix, const char *name)
 static void mpicommthread_set_state(double time, const char *prefix, const char *name)
 {
 {
@@ -1306,7 +1304,6 @@ static void handle_start_codelet_body(struct fxt_ev_64 *ev, struct starpu_fxt_op
 	task->name = strdup(name);
 	task->name = strdup(name);
 	task->node = node;
 	task->node = node;
 
 
-#ifndef STARPU_ENABLE_PAJE_CODELET_DETAILS
 	if (out_paje_file)
 	if (out_paje_file)
 	{
 	{
 		char *prefix = options->file_prefix;
 		char *prefix = options->file_prefix;
@@ -1328,7 +1325,6 @@ static void handle_start_codelet_body(struct fxt_ev_64 *ev, struct starpu_fxt_op
 	}
 	}
 	if (trace_file)
 	if (trace_file)
 		recfmt_worker_set_state(start_codelet_time, ev->param[2], name, "Task");
 		recfmt_worker_set_state(start_codelet_time, ev->param[2], name, "Task");
-#endif /* STARPU_ENABLE_PAJE_CODELET_DETAILS */
 
 
 	struct _starpu_computation *comp = ongoing_computation[worker];
 	struct _starpu_computation *comp = ongoing_computation[worker];
 	if (!comp)
 	if (!comp)
@@ -1442,7 +1438,6 @@ static void handle_codelet_details(struct fxt_ev_64 *ev, struct starpu_fxt_optio
 	if (out_paje_file)
 	if (out_paje_file)
 	{
 	{
 
 
-#ifdef STARPU_ENABLE_PAJE_CODELET_DETAILS
 		char *prefix = options->file_prefix;
 		char *prefix = options->file_prefix;
 		unsigned sched_ctx = ev->param[0];
 		unsigned sched_ctx = ev->param[0];
 
 
@@ -1459,7 +1454,6 @@ static void handle_codelet_details(struct fxt_ev_64 *ev, struct starpu_fxt_optio
 			fprintf(out_paje_file, "20	%.9f	%sw%d	Ctx%u	%s	%ld	%s	%08lx	%016lx	%lu\n", last_codelet_start[worker], prefix, worker, sched_ctx, _starpu_last_codelet_symbol[worker], ev->param[1], parameters,  ev->param[2], ev->param[4], job_id);
 			fprintf(out_paje_file, "20	%.9f	%sw%d	Ctx%u	%s	%ld	%s	%08lx	%016lx	%lu\n", last_codelet_start[worker], prefix, worker, sched_ctx, _starpu_last_codelet_symbol[worker], ev->param[1], parameters,  ev->param[2], ev->param[4], job_id);
 #endif
 #endif
 		}
 		}
-#endif /* STARPU_ENABLE_PAJE_CODELET_DETAILS */
 	}
 	}
 }
 }
 
 

+ 0 - 2
src/debug/traces/starpu_paje.c

@@ -130,7 +130,6 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 	fprintf(file, "%%	EndContainer	string\n");
 	fprintf(file, "%%	EndContainer	string\n");
 	fprintf(file, "%%	Key	string\n");
 	fprintf(file, "%%	Key	string\n");
 	fprintf(file, "%%EndEventDef\n");
 	fprintf(file, "%%EndEventDef\n");
-#ifdef STARPU_ENABLE_PAJE_CODELET_DETAILS
 	fprintf(file, "%%EventDef PajeSetState 20\n");
 	fprintf(file, "%%EventDef PajeSetState 20\n");
 	fprintf(file, "%%	Time	date\n");
 	fprintf(file, "%%	Time	date\n");
 	fprintf(file, "%%	Container	string\n");
 	fprintf(file, "%%	Container	string\n");
@@ -147,7 +146,6 @@ void _starpu_fxt_write_paje_header(FILE *file STARPU_ATTRIBUTE_UNUSED)
 	fprintf(file, "%%	Z	string\n");
 	fprintf(file, "%%	Z	string\n");
 	fprintf(file, "%%EndEventDef\n");
 	fprintf(file, "%%EndEventDef\n");
 #endif
 #endif
-#endif
 
 
 #ifdef STARPU_HAVE_POTI
 #ifdef STARPU_HAVE_POTI
 	poti_DefineContainerType("MPIP", "0", "MPI Program");
 	poti_DefineContainerType("MPIP", "0", "MPI Program");