Commit 9bf526b5 authored by Karl Wette's avatar Karl Wette
Browse files

Weave: remove special search application for profiling with Callgrind

- This reverts commit 15ff7633b98397cd3405b4d0d41ca55e582df090
- This reverts commit 9c6280ca09f6e42b48384337930bd47cc61ac88b

Original lalsuite-weave: f9e97ac466d7c7bb0aa4748487c19e9e857de694
parent fbe3dae7
......@@ -293,7 +293,6 @@ src/pulsar/Weave/*.testdir
src/pulsar/Weave/lalapps_Weave
src/pulsar/Weave/lalapps_WeaveCompare
src/pulsar/Weave/lalapps_WeaveSetup
src/pulsar/Weave/lalapps_Weave_Callgrind
src/pulsar/Xray/lalapps_Intermittent
src/pulsar/Xray/lalapps_SemiCoherentBinary_v2
src/pulsar/Xray/lalapps_binary2sfts
......
......@@ -371,10 +371,6 @@ fi
AM_CONDITIONAL([HAVE_BAMBI],[${hbf}])
AM_CONDITIONAL([HAVE_BAMBI_MPI],[${bambimpi}])
# check for valgrind/callgrind headers
AC_CHECK_HEADER([valgrind/callgrind.h],[valgrind_callgrind=true],[valgrind_callgrind=false])
AM_CONDITIONAL([VALGRIND_CALLGRIND],[test ${valgrind_callgrind} = true])
# check for boinc, and modify compiler for lal library checks
LALSUITE_CHECK_BOINC
......
......@@ -2,6 +2,7 @@ include $(top_srcdir)/gnuscripts/lalapps.am
TEST_EXTENSIONS = .sh
SH_LOG_COMPILER = /bin/bash $(srcdir)/test-compiler.sh
if !CFITSIO
SH_LOG_COMPILER += skip
endif
......@@ -49,13 +50,6 @@ lalapps_WeaveCompare_SOURCES = \
WeaveCompare.c \
$(END_OF_LIST)
if VALGRIND_CALLGRIND
noinst_PROGRAMS = lalapps_Weave_Callgrind
endif
lalapps_Weave_Callgrind_SOURCES = $(lalapps_Weave_SOURCES)
lalapps_Weave_Callgrind_CPPFLAGS = $(AM_CPPFLAGS) -DWEAVE_CALLGRIND
TESTS = \
TestInterpolating.sh \
TestNonInterpolating.sh \
......
......@@ -33,10 +33,6 @@
#include <lal/Random.h>
#include <lal/ExtrapolatePulsarSpins.h>
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
#include <valgrind/callgrind.h>
#endif
///
/// Internal definition of miscellaneous per-segment information
///
......@@ -66,11 +62,6 @@ static inline double cpu_time(void) { return XLALGetCPUTime(); }
int main( int argc, char *argv[] )
{
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
// Do not profile setup
CALLGRIND_STOP_INSTRUMENTATION;
#endif
// Set help information
lalUserVarHelpBrief = "search for gravitational-wave pulsars";
......@@ -1042,12 +1033,6 @@ int main( int argc, char *argv[] )
LogPrintfVerbatim( LOG_NORMAL, ", peak memory %.1fMB\n", XLALGetPeakHeapUsageMB() );
}
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
// Start profiling before main search loop
CALLGRIND_START_INSTRUMENTATION;
CALLGRIND_ZERO_STATS;
#endif
// Begin main search loop
BOOLEAN search_complete = 0;
while ( !search_complete ) {
......@@ -1252,12 +1237,6 @@ int main( int argc, char *argv[] )
} // End of main search loop
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
// Stop profiling and dump statistics after main search loop
CALLGRIND_STOP_INSTRUMENTATION;
CALLGRIND_DUMP_STATS_AT("main search loop");
#endif
// Total elapsed CPU and wall times
const double cpu_total = cpu_time() - cpu_zero;
const double wall_total = wall_time() - wall_zero;
......@@ -1273,12 +1252,6 @@ int main( int argc, char *argv[] )
LogPrintfVerbatim( LOG_NORMAL, ", total %.1f sec, CPU %.1f%%, peak memory %.1fMB\n", wall_total, 100.0 * cpu_total / wall_total, XLALGetPeakHeapUsageMB() );
}
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
// Start profiling before post-main search loop
CALLGRIND_START_INSTRUMENTATION;
CALLGRIND_ZERO_STATS;
#endif
{
// Start timing
double cpu_tic = cpu_time();
......@@ -1293,12 +1266,6 @@ int main( int argc, char *argv[] )
cpu_tic = cpu_toc;
}
#ifdef WEAVE_CALLGRIND // Set when compiling lalapps_Weave_Callgrind
// Stop profiling and dump statistics after post-main search loop
CALLGRIND_STOP_INSTRUMENTATION;
CALLGRIND_DUMP_STATS_AT("post-main search loop");
#endif
////////// Output search results //////////
if ( search_complete ) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment