Changes to VT:

- compiler wrappers: removed invocation of pdbcomment; it removes essential information from the PDB file for instrumenting functions This commit was SVN r27687.
2012-12-18 13:41:21 +00:00 · 2012-12-18 13:41:21 +00:00 · 3509deecc3
--- a/ompi/contrib/vt/vt/ChangeLog
+++ b/ompi/contrib/vt/vt/ChangeLog
@ -15,6 +15,9 @@
 		- memory (de)allocation functions     : "MEM"  -> "LIBC-MALLOC"
 		- I/O functions                       : "I/O"  -> "LIBC-I/O"
 		- child process execution (e.g. execl): "LIBC" -> "LIBC-EXEC"
+	- compiler wrappers:
+		- removed invocation of pdbcomment; it removes essential
+		  information from the PDB file for instrumenting functions

 5.14openmpi
 	- updated version of internal OTF to 1.12.1openmpi
--- a/ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4
@ -10,8 +10,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	VT_WRAPPER_CC_TAUINST_OPTS=
 	VT_WRAPPER_CC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_CC_TAUINST_PARSE_OPTS=
-	VT_WRAPPER_CC_TAUINST_COMMENT_BIN=
-	VT_WRAPPER_CC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_CC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_CC_DEFAULT_PARTYPE="seq"

@ -25,8 +23,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	VT_WRAPPER_CXX_TAUINST_OPTS=
 	VT_WRAPPER_CXX_TAUINST_PARSE_BIN=
 	VT_WRAPPER_CXX_TAUINST_PARSE_OPTS=
-	VT_WRAPPER_CXX_TAUINST_COMMENT_BIN=
-	VT_WRAPPER_CXX_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_CXX_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_CXX_DEFAULT_PARTYPE="seq"

@ -40,8 +36,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	VT_WRAPPER_FC_TAUINST_OPTS=
 	VT_WRAPPER_FC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_FC_TAUINST_PARSE_OPTS=
-	VT_WRAPPER_FC_TAUINST_COMMENT_BIN=
-	VT_WRAPPER_FC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_FC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_FC_DEFAULT_PARTYPE="seq"

@ -55,8 +49,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	VT_WRAPPER_NVCC_TAUINST_OPTS=
 	VT_WRAPPER_NVCC_TAUINST_PARSE_BIN=
 	VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS=
-	VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN=
-	VT_WRAPPER_NVCC_TAUINST_COMMENT_OPTS=
 	VT_WRAPPER_NVCC_COMPINST_COMPILER_FLAGS=
 	VT_WRAPPER_NVCC_AVAIL_INST="manual"
 	VT_WRAPPER_NVCC_DEFAULT_INST="manual"
@ -357,19 +349,15 @@ AC_DEFUN([ACVT_COMPWRAP],
 		VT_WRAPPER_CC_TAUINST_OPTS="-c -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_CC_TAUINST_PARSE_BIN="$tauinst_cparse_cmd"
 		VT_WRAPPER_CC_TAUINST_PARSE_OPTS="$mpiincdir"
-		VT_WRAPPER_CC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_CXX_TAUINST_OPTS="-c++ -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_CXX_TAUINST_PARSE_BIN="$tauinst_cxxparse_cmd"
 		VT_WRAPPER_CXX_TAUINST_PARSE_OPTS="$VT_WRAPPER_CC_TAUINST_PARSE_OPTS"
-		VT_WRAPPER_CXX_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_FC_TAUINST_OPTS="-fortran -spec \${datadir}/TAUINST.SPEC"
 		VT_WRAPPER_FC_TAUINST_PARSE_BIN="$tauinst_fparse_cmd"
 		VT_WRAPPER_FC_TAUINST_PARSE_OPTS="$fmpiincdir"
-		VT_WRAPPER_FC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_NVCC_TAUINST_OPTS="$VT_WRAPPER_CC_TAUINST_OPTS"
 		VT_WRAPPER_NVCC_TAUINST_PARSE_BIN="$VT_WRAPPER_CC_TAUINST_PARSE_BIN"
 		VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS="$VT_WRAPPER_CC_TAUINST_PARSE_OPTS $CUDATKINCDIR"
-		VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN="$tauinst_comment_cmd"
 		VT_WRAPPER_NVCC_AVAIL_INST="$VT_WRAPPER_NVCC_AVAIL_INST tauinst"
 		VT_WRAPPER_AVAIL_INST="$VT_WRAPPER_AVAIL_INST tauinst"
 	])
@ -384,8 +372,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_CC_TAUINST_PARSE_OPTS)
-	AC_SUBST(VT_WRAPPER_CC_TAUINST_COMMENT_BIN)
-	AC_SUBST(VT_WRAPPER_CC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_CC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_CC_DEFAULT_PARTYPE)

@ -399,8 +385,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_CXX_TAUINST_PARSE_OPTS)
-	AC_SUBST(VT_WRAPPER_CXX_TAUINST_COMMENT_BIN)
-	AC_SUBST(VT_WRAPPER_CXX_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_CXX_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_CXX_DEFAULT_PARTYPE)

@ -414,8 +398,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_FC_TAUINST_PARSE_OPTS)
-	AC_SUBST(VT_WRAPPER_FC_TAUINST_COMMENT_BIN)
-	AC_SUBST(VT_WRAPPER_FC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_FC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_FC_DEFAULT_PARTYPE)

@ -429,8 +411,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_OPTS)
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_PARSE_BIN)
 	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS)
-	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN)
-	AC_SUBST(VT_WRAPPER_NVCC_TAUINST_COMMENT_OPTS)
 	AC_SUBST(VT_WRAPPER_NVCC_COMPINST_COMPILER_FLAGS)
 	AC_SUBST(VT_WRAPPER_NVCC_AVAIL_INST)
 	AC_SUBST(VT_WRAPPER_NVCC_DEFAULT_INST)
--- a/ompi/contrib/vt/vt/config/m4/acinclude.tauinst.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.tauinst.m4
@ -9,7 +9,6 @@ AC_DEFUN([ACVT_TAUINST],
 	tauinst_cparse_cmd=
 	tauinst_cxxparse_cmd=
 	tauinst_fparse_cmd=
-	tauinst_comment_cmd=

 	AC_ARG_ENABLE(tauinst,
 		AC_HELP_STRING([--enable-tauinst],
@ -52,15 +51,6 @@ AC_DEFUN([ACVT_TAUINST],
 		tauinst_fparse_cmd=$withval
 	])

-	AC_ARG_WITH(pdt-comment,
-		AC_HELP_STRING([--with-pdt-comment=PDTCOMMENT],
-		[give the command for PDT comment parser, default: pdbcomment]),
-	[
-		AS_IF([test x"$withval" = "xyes" -o x"$withval" = "xno"],
-		[AC_MSG_ERROR([value of '--with-pdt-comment' not properly set!])])
-		tauinst_comment_cmd=$withval
-	])
-
 	AS_IF([test "$check_tauinst" = "yes"],
 	[
 		AC_CHECK_PROG(tauinst_cmd, tau_instrumentor, tau_instrumentor)
@ -87,9 +77,6 @@ AC_DEFUN([ACVT_TAUINST],
 			[
 				tauinst_fparse_cmd=
 			])
-			AC_CHECK_PROG(tauinst_comment_cmd, pdbcomment, pdbcomment)
-			AS_IF([test x"$tauinst_comment_cmd" = x],
-			[AC_MSG_WARN([no pdbcomment found; You might experience compile-time problems with comments if using TAU instrumentation])])

 			AS_IF([test x"$tauinst_cparse_cmd$tauinst_cxxparse_cmd$tauinst_fparse_cmd" = x],
 			[
--- a/ompi/contrib/vt/vt/doc/UserManual.html
+++ b/ompi/contrib/vt/vt/doc/UserManual.html
@ -67,7 +67,7 @@ BODY			{ font-family: sans-serif; }
 <P>

 <P>
-<B><BIG CLASS="XHUGE">VampirTrace 5.15b&nbsp;User Manual</BIG></B>
+<B><BIG CLASS="XHUGE">VampirTrace 5.14.1&nbsp;User Manual</BIG></B>
 <BR>
 <BR>
 <BR>
@ -355,20 +355,20 @@ OpenMP events, and performance counters.
 <P>
 After a successful tracing run, VampirTrace writes all collected data to a  
 trace file in the Open Trace Format (OTF)<A NAME="tex2html1"
-  HREF="#foot1601"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1599"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
 As a result, the information is available for post-mortem analysis and 
 visualization by various tools. 
 Most notably, VampirTrace provides the input data for the Vampir analysis  
 and visualization tool<A NAME="tex2html2"
-  HREF="#foot1602"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1600"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>. 

 <P>
 VampirTrace is included in OpenMPI&nbsp;1.3 and later versions.
 If not disabled explicitly, VampirTrace is built automatically when installing
 OpenMPI<A NAME="tex2html3"
-  HREF="#foot1603"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1601"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.

 <P>
@ -1185,7 +1185,7 @@ in a single file, that
  The names in between may contain wildcards as ``?'', ``*', and ``#'', each entry gets a new line.
  The lists end with <TT>END[_FILE]_&lt;INCLUDE|EXCLUDE&gt;_LIST</TT>. For further information on selective 
  profiling have a look at the TAU documentation<A NAME="tex2html4"
-  HREF="#foot1627"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1625"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
  To announce the file through the compiler wrapper use the option <TT>-vt:tau</TT>:
 <PRE>
@ -1202,7 +1202,7 @@ Binary Instrumentation Using Dyninst
 The option <TT>-vt:inst dyninst</TT> is used with the compiler wrapper to 
 instrument the application during runtime (binary instrumentation), by using 
 Dyninst<A NAME="tex2html5"
-  HREF="#foot1628"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1626"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
 Recompiling is not necessary for this kind of instrumentation,
 but relinking:
@ -1353,7 +1353,7 @@ Tracing Calls to 3rd-Party Libraries
  VampirTrace is also capable to trace calls to third party libraries, which come with
  at least one C header file even without the library's source code. If VampirTrace was
  built with support for library tracing (the CTool library<A NAME="tex2html6"
-  HREF="#foot1629"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1627"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>  is required), the tool <TT>vtlibwrapgen</TT> can be used to
  generate a wrapper library to intercept each call to the actual library functions.
  This wrapper library can be linked to the application or used in combination with the
@ -2029,7 +2029,7 @@ for the enhanced timer synchronization:

 <UL>
 <LI>CLAPACK <A NAME="tex2html7"
-  HREF="#foot1639"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1637"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>
 </LI>
 <LI>AMD ACML
@ -3689,7 +3689,7 @@ default: automatically by configure.
 enable support for Dyninst instrumentation,
                              default: enable if found by configure.
                              <SPAN  CLASS="textbf">Note:</SPAN> Requires Dyninst<A NAME="tex2html8"
-  HREF="#foot1667"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1665"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A> version 6.1 or higher!

 <P>
@ -3711,9 +3711,9 @@ enable support for automatic source code
                              instrumentation by using TAU, default: enable if
                              found by configure.
                              <SPAN  CLASS="textbf">Note:</SPAN> Requires PDToolkit<A NAME="tex2html9"
-  HREF="#foot1668"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1666"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A> or TAU<A NAME="tex2html10"
-  HREF="#foot1669"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1667"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>!

 <P>
@ -4037,13 +4037,6 @@ give the command for PDT C++ source code parser, default: <TT>cxxparse</TT>
 <BR>
 give the command for PDT Fortran source code parser, default: <TT>f95parse, f90parse, or gfparse</TT>

-<P>
-</DD>
-<DT><STRONG><TT>-with-pdt-comment=PDTCOMMENT</TT></STRONG></DT>
-<DD>&nbsp;
-<BR>
-give the command for PDT comment parser, default: <TT>pdbcomment</TT>
-
 <P>
 </DD>
 <DT><STRONG><TT>-with-papi-dir=PAPIDIR</TT></STRONG></DT>
@ -4311,7 +4304,7 @@ give the path for JVMTI-include files, default:

 <P>
 To enable support for generating wrapper for 3th-Party libraries the C code parser CTool<A NAME="tex2html11"
-  HREF="#foot1670"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot1668"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A> is needed:

 <P>
@ -5473,7 +5466,7 @@ Since IOFSL servers can handle multiple clients, an N:M mapping of clients to se

 <P>
 When using the IOFSL integration, all write requests in OTF are issued using the zoidfs API<A NAME="tex2html12"
-  HREF="#foot3277"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot3273"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>. Those writes are handled by the IOFSL forwarding servers and aggregated into a single file using the atomic append feature. The offset in the multifile is returned to OTF and stored in a second file, the so called index file, in order to maintain the mapping between written blocks and streams. For any block of a stream written into the multifile, the index file contains the ID of the stream, the start of the block, and its length. This allows for an efficient reading of blocks since only the index file has to be scanned for entries for a given stream ID. Additionally, a large number of logical files (streams) can be stored using only two physical files.

 <P>
@ -5485,7 +5478,7 @@ Installation</A>
 <P>
 In order to use this setup, IOFSL and VampirTrace have to be compiled in order.
 In the following sections, the directory <TT>&lt;install_dir&gt;</TT> should be replaced with a - possibly user-local - directory used for installation, e.g. <TT>$HOME/local</TT><A NAME="tex2html13"
-  HREF="#foot3281"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot3277"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
 The installation procedure for IOFSL is described at https://trac.mcs.anl.gov/projects/iofsl/wiki/Building.
 Currently the <TT>iofsl_vampir</TT> git branch is required.
@ -5664,7 +5657,7 @@ They will be launched on dedicated compute nodes that are part of the batch Job
 PBS Options</A>
 </H4>
 It is important to reserve a sufficient number of processor cores. The number of cores requested must be large enough to contain the number of application cores plus the number of cores required for the IOFSL server instances. Each IOFSL server will run on a dedicated node<A NAME="tex2html14"
-  HREF="#foot3325"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot3321"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.Thus N_allocated &#8805;((N_IOFSL * 16) + N_Application) must hold.
 <P>
 Example using 64 server instances:
@ -5761,10 +5754,10 @@ Configuring the Server</A>
 The server is configured using a configuration file.
 At server start-up, this file is provided using the <TT>-config</TT> argument.
 The cray XK6 configuration file is provided in the package<A NAME="tex2html15"
-  HREF="#foot3465"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot3461"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
 For more information about the options available please refer to the IOFSL documentation<A NAME="tex2html16"
-  HREF="#foot3466"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
+  HREF="#foot3462"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A>.
 The most important option is the <TT>serverlist</TT> entry in the <TT>bmi</TT> section which takes a list of server addresses, e.g. :
 <PRE>
@ -6170,99 +6163,99 @@ If you provide us with your additions afterwards we will consider merging them
 into the official VampirTrace package.
 <BR><HR><H4>Footnotes</H4>
 <DL>
-<DT><A NAME="foot1601">... (OTF)</A><A
+<DT><A NAME="foot1599">... (OTF)</A><A
 HREF="#tex2html1"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.tu-dresden.de/zih/otf

 </DD>
-<DT><A NAME="foot1602">... tool </A><A
+<DT><A NAME="foot1600">... tool </A><A
 HREF="#tex2html2"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.vampir.eu

 </DD>
-<DT><A NAME="foot1603">...
+<DT><A NAME="foot1601">...
 Open MPI </A><A
 HREF="#tex2html3"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.open-mpi.org/faq/?category=vampirtrace

 </DD>
-<DT><A NAME="foot1627">... documentation </A><A
+<DT><A NAME="foot1625">... documentation </A><A
 HREF="#tex2html4"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.cs.uoregon.edu/Research/tau/docs/newguide/bk05ch02.html#d0e3770

 </DD>
-<DT><A NAME="foot1628">...
+<DT><A NAME="foot1626">...
 Dyninst </A><A
 HREF="#tex2html5"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.dyninst.org

 </DD>
-<DT><A NAME="foot1629">... library </A><A
+<DT><A NAME="foot1627">... library </A><A
 HREF="#tex2html6"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://sourceforge.net/projects/ctool

 </DD>
-<DT><A NAME="foot1639">... CLAPACK</A><A
+<DT><A NAME="foot1637">... CLAPACK</A><A
 HREF="#tex2html7"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>www.netlib.org/clapack

 </DD>
-<DT><A NAME="foot1667">... Dyninst </A><A
+<DT><A NAME="foot1665">... Dyninst </A><A
 HREF="#tex2html8"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.dyninst.org

 </DD>
-<DT><A NAME="foot1668">... PDToolkit </A><A
+<DT><A NAME="foot1666">... PDToolkit </A><A
 HREF="#tex2html9"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://www.cs.uoregon.edu/research/pdt/home.php

 </DD>
-<DT><A NAME="foot1669">... TAU </A><A
+<DT><A NAME="foot1667">... TAU </A><A
 HREF="#tex2html10"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://tau.uoregon.edu

 </DD>
-<DT><A NAME="foot1670">... CTool </A><A
+<DT><A NAME="foot1668">... CTool </A><A
 HREF="#tex2html11"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>http://sourceforge.net/projects/ctool

 </DD>
-<DT><A NAME="foot3277">... API</A><A
+<DT><A NAME="foot3273">... API</A><A
 HREF="#tex2html12"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>The OTF master control file is written using POSIX I/O in any case.

 </DD>
-<DT><A NAME="foot3281">...$HOME/local</A><A
+<DT><A NAME="foot3277">...$HOME/local</A><A
 HREF="#tex2html13"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>The software packages can be installed in different directories.

 </DD>
-<DT><A NAME="foot3325">... node</A><A
+<DT><A NAME="foot3321">... node</A><A
 HREF="#tex2html14"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>The server makes use of all the nodes resources by multithreading and allocating large I/O buffers

 </DD>
-<DT><A NAME="foot3465">... package</A><A
+<DT><A NAME="foot3461">... package</A><A
 HREF="#tex2html15"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD><TT>tools/vtiofsl/platform/crayxk6-iofwd.cf</TT>

 </DD>
-<DT><A NAME="foot3466">... documentation</A><A
+<DT><A NAME="foot3462">... documentation</A><A
 HREF="#tex2html16"><SUP><IMG  ALIGN="BOTTOM" BORDER="1" ALT="[*]"
 SRC="/usr/share/latex2html/icons/footnote.png"></SUP></A></DT>
 <DD>https://trac.mcs.anl.gov/projects/iofsl/wiki/ConfigurationFile
--- a/ompi/contrib/vt/vt/doc/UserManual.pdf
+++ b/ompi/contrib/vt/vt/doc/UserManual.pdf
--- a/ompi/contrib/vt/vt/tools/vtwrapper/vt_wrapper.cc
+++ b/ompi/contrib/vt/vt/tools/vtwrapper/vt_wrapper.cc
@ -246,8 +246,6 @@ struct ConfigS
  std::string tauinst_args;          // TAU instrumentor arguments
  std::string tauinst_parsecmd;      // PDT source code parser command
  std::string tauinst_parseargs;     // PDT parser arguments
-  std::string tauinst_commentcmd;    // PDT comment parser command
-  std::string tauinst_commentargs;   // PDT comment parser arguments

  std::vector<ModFileS>
    mod_files;                       // source files to be modified by OPARI
@ -352,7 +350,7 @@ readDataFile()
    std::string( vt_installdirs_get( VT_INSTALLDIR_DATADIR ) ) + "/" +
    std::string( ExeName ) + "-wrapper-data.txt";

-  const uint32_t keys_num = 33;
+  const uint32_t keys_num = 31;
  const std::string keys[] = {
    "version", "language", "compiler_env", "compiler_flags_env",
    "compiler", "compiler_flags", "linker_flags", "libs", "preprocessor",
@ -360,9 +358,8 @@ readDataFile()
    "vtmtlib", "vthyblib", "vtpomplib", "vtdynattlib", "opari_bin",
    "opari_opts", "opari_tab_compiler", "opari_tab_compiler_flags",
    "compinst_compiler_flags", "dyninst_compiler_flags", "tauinst_bin",
-    "tauinst_opts", "tauinst_parse_bin", "tauinst_parse_opts",
-    "tauinst_comment_bin", "tauinst_comment_opts", "inst_avail", "inst_default",
-    "partype_default"
+    "tauinst_opts", "tauinst_parse_bin", "tauinst_parse_opts", "inst_avail",
+    "inst_default", "partype_default"
  };

  std::ifstream in( data_file.c_str() );
@ -588,17 +585,7 @@ readDataFile()
        Config.tauinst_parseargs = value;
        break;
      }
-      case 29: // tauinst_comment_bin
-      {
-        Config.tauinst_commentcmd = value;
-        break;
-      }
-      case 30: // tauinst_comment_opts
-      {
-        Config.tauinst_commentargs = value;
-        break;
-      }
-      case 31: // inst_avail
+      case 29: // inst_avail
      {
        char cvalue[128];
        strncpy( cvalue, value.c_str(), sizeof( cvalue ) - 1 );
@ -629,7 +616,7 @@ readDataFile()

        break;
      }
-      case 32: // inst_default
+      case 30: // inst_default
      {
        if( !Config.setInstType( value ) )
        {
@ -641,7 +628,7 @@ readDataFile()
        }
        break;
      }
-      case 33: // partype_default
+      case 31: // partype_default
      {
        if( value.compare( "seq" ) == 0 )
        {
@ -1709,22 +1696,6 @@ doWrap()
        // show/execute PDT parse command
        if( ( rc = showOrExecuteCommand( cmd ) ) != 0 )
          return rc;
-
-        // extend PDB file by comment information, if possible
-        //
-        if( Config.tauinst_commentcmd.length() > 0 )
-        {
-          // compose PDT comment parser command
-          //
-          cmd =
-            Config.tauinst_commentcmd + " " +
-            pdb_file + " -o " + pdb_file + " " +
-            Config.tauinst_commentargs;
-
-          // show/execute PDT comment parser command
-          if( ( rc = showOrExecuteCommand( cmd ) ) != 0 )
-            return rc;
-        }
      }
      else
      {
--- a/ompi/contrib/vt/vt/tools/vtwrapper/vtc++-wrapper-data.txt.in
+++ b/ompi/contrib/vt/vt/tools/vtwrapper/vtc++-wrapper-data.txt.in
@ -26,8 +26,6 @@ tauinst_bin=@VT_WRAPPER_TAUINST_BIN@
 tauinst_opts=@VT_WRAPPER_CXX_TAUINST_OPTS@
 tauinst_parse_bin=@VT_WRAPPER_CXX_TAUINST_PARSE_BIN@
 tauinst_parse_opts=@VT_WRAPPER_CXX_TAUINST_PARSE_OPTS@
-tauinst_comment_bin=@VT_WRAPPER_CXX_TAUINST_COMMENT_BIN@
-tauinst_comment_opts=@VT_WRAPPER_CXX_TAUINST_COMMENT_OPTS@
 inst_avail=@VT_WRAPPER_AVAIL_INST@
 inst_default=@VT_WRAPPER_DEFAULT_INST@
 partype_default=@VT_WRAPPER_CXX_DEFAULT_PARTYPE@
--- a/ompi/contrib/vt/vt/tools/vtwrapper/vtcc-wrapper-data.txt.in
+++ b/ompi/contrib/vt/vt/tools/vtwrapper/vtcc-wrapper-data.txt.in
@ -26,8 +26,6 @@ tauinst_bin=@VT_WRAPPER_TAUINST_BIN@
 tauinst_opts=@VT_WRAPPER_CC_TAUINST_OPTS@
 tauinst_parse_bin=@VT_WRAPPER_CC_TAUINST_PARSE_BIN@
 tauinst_parse_opts=@VT_WRAPPER_CC_TAUINST_PARSE_OPTS@
-tauinst_comment_bin=@VT_WRAPPER_CC_TAUINST_COMMENT_BIN@
-tauinst_comment_opts=@VT_WRAPPER_CC_TAUINST_COMMENT_OPTS@
 inst_avail=@VT_WRAPPER_AVAIL_INST@
 inst_default=@VT_WRAPPER_DEFAULT_INST@
 partype_default=@VT_WRAPPER_CC_DEFAULT_PARTYPE@
--- a/ompi/contrib/vt/vt/tools/vtwrapper/vtfort-wrapper-data.txt.in
+++ b/ompi/contrib/vt/vt/tools/vtwrapper/vtfort-wrapper-data.txt.in
@ -26,8 +26,6 @@ tauinst_bin=@VT_WRAPPER_TAUINST_BIN@
 tauinst_opts=@VT_WRAPPER_FC_TAUINST_OPTS@
 tauinst_parse_bin=@VT_WRAPPER_FC_TAUINST_PARSE_BIN@
 tauinst_parse_opts=@VT_WRAPPER_FC_TAUINST_PARSE_OPTS@
-tauinst_comment_bin=@VT_WRAPPER_FC_TAUINST_COMMENT_BIN@
-tauinst_comment_opts=@VT_WRAPPER_FC_TAUINST_COMMENT_OPTS@
 inst_avail=@VT_WRAPPER_AVAIL_INST@
 inst_default=@VT_WRAPPER_DEFAULT_INST@
 partype_default=@VT_WRAPPER_FC_DEFAULT_PARTYPE@
--- a/ompi/contrib/vt/vt/tools/vtwrapper/vtnvcc-wrapper-data.txt.in
+++ b/ompi/contrib/vt/vt/tools/vtwrapper/vtnvcc-wrapper-data.txt.in
@ -26,8 +26,6 @@ tauinst_bin=@VT_WRAPPER_TAUINST_BIN@
 tauinst_opts=@VT_WRAPPER_NVCC_TAUINST_OPTS@
 tauinst_parse_bin=@VT_WRAPPER_NVCC_TAUINST_PARSE_BIN@
 tauinst_parse_opts=@VT_WRAPPER_NVCC_TAUINST_PARSE_OPTS@
-tauinst_comment_bin=@VT_WRAPPER_NVCC_TAUINST_COMMENT_BIN@
-tauinst_comment_opts=@VT_WRAPPER_NVCC_TAUINST_COMMENT_OPTS@
 inst_avail=@VT_WRAPPER_NVCC_AVAIL_INST@
 inst_default=@VT_WRAPPER_NVCC_DEFAULT_INST@
 partype_default=@VT_WRAPPER_NVCC_DEFAULT_PARTYPE@