diff -urNp oprofile-0.9.2/Makefile.in oprofile-0.9.2-perfmon2/Makefile.in --- oprofile-0.9.2/Makefile.in 2006-09-15 11:32:05.000000000 -0700 +++ oprofile-0.9.2-perfmon2/Makefile.in 2007-01-22 04:51:28.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -146,6 +146,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/aclocal.m4 oprofile-0.9.2-perfmon2/aclocal.m4 --- oprofile-0.9.2/aclocal.m4 2006-09-15 11:31:58.000000000 -0700 +++ oprofile-0.9.2-perfmon2/aclocal.m4 2007-01-09 07:19:15.000000000 -0800 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- diff -urNp oprofile-0.9.2/config.h.in oprofile-0.9.2-perfmon2/config.h.in --- oprofile-0.9.2/config.h.in 2006-09-15 11:31:59.000000000 -0700 +++ oprofile-0.9.2-perfmon2/config.h.in 2007-01-09 07:21:33.000000000 -0800 @@ -15,6 +15,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBIBERTY_H +/* Define to 1 if you have the `pfm' library (-lpfm). */ +#undef HAVE_LIBPFM + /* Define to 1 if you have the `popt' library (-lpopt). */ #undef HAVE_LIBPOPT diff -urNp oprofile-0.9.2/configure oprofile-0.9.2-perfmon2/configure --- oprofile-0.9.2/configure 2006-09-15 11:32:06.000000000 -0700 +++ oprofile-0.9.2-perfmon2/configure 2007-01-22 04:51:29.000000000 -0800 @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB DATE OPROFILE_DIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LD KSRC KINC kernel_support_TRUE kernel_support_FALSE KVERS OPROFILE_MODULE_ARCH MODINSTALLDIR EXTRA_CFLAGS_MODULE topdir EGREP SIZE_T_TYPE PTRDIFF_T_TYPE CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS QT_INCLUDES QT_LDFLAGS MOC UIC QT_LIB QT_VERSION XSLTPROC have_xsltproc_TRUE have_xsltproc_FALSE XML_CATALOG XSLTPROC_FLAGS DOCBOOK_ROOT CAT_ENTRY_START CAT_ENTRY_END LIBERTY_LIBS BFD_LIBS POPT_LIBS have_qt_TRUE have_qt_FALSE OP_CFLAGS OP_CXXFLAGS OP_DOCDIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB DATE OPROFILE_DIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LD KSRC KINC kernel_support_TRUE kernel_support_FALSE KVERS OPROFILE_MODULE_ARCH MODINSTALLDIR EXTRA_CFLAGS_MODULE topdir EGREP SIZE_T_TYPE PTRDIFF_T_TYPE CXXCPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS QT_INCLUDES QT_LDFLAGS MOC UIC QT_LIB QT_VERSION XSLTPROC have_xsltproc_TRUE have_xsltproc_FALSE XML_CATALOG XSLTPROC_FLAGS DOCBOOK_ROOT CAT_ENTRY_START CAT_ENTRY_END LIBERTY_LIBS BFD_LIBS POPT_LIBS PFM_LIBS have_qt_TRUE have_qt_FALSE OP_CFLAGS OP_CXXFLAGS OP_DOCDIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -864,6 +864,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-pch enable precompiled header (default is disabled) + --enable-perfmon2 enable option for perfmon2 use on non-ia64 processors (default is disabled) --enable-gcov enable option for gcov coverage testing (default is disabled) --disable-werror disable -Werror flag (default is enabled for non-release) --disable-optimization disable optimization flags (default is enabled) @@ -986,7 +987,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -2463,8 +2464,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2522,8 +2522,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2639,8 +2638,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2694,8 +2692,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2740,8 +2737,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2785,8 +2781,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3378,8 +3373,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3437,8 +3431,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3509,8 +3502,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3554,8 +3546,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3794,8 +3785,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3848,8 +3838,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3946,8 +3935,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4030,8 +4018,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4084,8 +4071,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4147,8 +4133,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4219,8 +4204,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4282,8 +4266,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4362,8 +4345,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4424,8 +4406,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4572,8 +4553,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4645,8 +4625,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4734,8 +4713,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4905,8 +4883,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4974,8 +4951,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5129,8 +5105,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5237,8 +5212,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5339,8 +5313,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5410,8 +5383,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5474,8 +5446,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5545,8 +5516,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5673,8 +5643,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5730,8 +5699,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5782,8 +5750,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5858,8 +5825,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5950,8 +5916,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6226,9 +6191,12 @@ ac_link='$CXX -o conftest$ac_exeext $CXX ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking for X" >&5 + +if test "x$ac_path_x_has_been_run" != xyes; then + echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 +ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6321,7 +6289,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for a specified header file. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6395,8 +6363,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6456,10 +6423,15 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -6507,8 +6479,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6559,8 +6530,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6636,8 +6606,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6692,8 +6661,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6761,8 +6729,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6870,8 +6837,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6935,8 +6901,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7004,8 +6969,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7109,8 +7073,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7174,8 +7137,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7272,8 +7234,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7337,8 +7298,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7435,8 +7395,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7500,8 +7459,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7580,8 +7538,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7899,8 +7856,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7967,7 +7923,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CPPFLAGS="$CPPFLAGS $QT_INCLUDES" cat > conftest.$ac_ext < "%%%"QT_VERSION_STR"%%%" @@ -8034,8 +7990,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8173,6 +8128,229 @@ POPT_LIBS="-lpopt" +# Check whether --enable-perfmon2 or --disable-perfmon2 was given. +if test "${enable_perfmon2+set}" = set; then + enableval="$enable_perfmon2" + enable_perfmon2=$enableval +else + enable_perfmon2=no +fi; +if test "$enable_perfmon2" = yes; then + +echo "$as_me:$LINENO: checking for pfm_start in -lpfm" >&5 +echo $ECHO_N "checking for pfm_start in -lpfm... $ECHO_C" >&6 +if test "${ac_cv_lib_pfm_pfm_start+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpfm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pfm_start (); +int +main () +{ +pfm_start (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pfm_pfm_start=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_pfm_pfm_start=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_pfm_pfm_start" >&5 +echo "${ECHO_T}$ac_cv_lib_pfm_pfm_start" >&6 +if test $ac_cv_lib_pfm_pfm_start = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPFM 1 +_ACEOF + + LIBS="-lpfm $LIBS" + +else + { { echo "$as_me:$LINENO: error: pfm library not found" >&5 +echo "$as_me: error: pfm library not found" >&2;} + { (exit 1); exit 1; }; } +fi + + PFM_LIBS="-lpfm" + + +echo "$as_me:$LINENO: checking whether ${CC} -DOPROF_PERFMON2 is understood" >&5 +echo $ECHO_N "checking whether ${CC} -DOPROF_PERFMON2 is understood... $ECHO_C" >&6 + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +SAVE_CFLAGS=$CFLAGS +CFLAGS=-DOPROF_PERFMON2 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; OP_CFLAGS="${OP_CFLAGS} -DOPROF_PERFMON2" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=$SAVE_CFLAGS +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + +echo "$as_me:$LINENO: checking whether ${CXX} -DOPROF_PERFMON2 is understood" >&5 +echo $ECHO_N "checking whether ${CXX} -DOPROF_PERFMON2 is understood... $ECHO_C" >&6 + + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +SAVE_CXXFLAGS=$CXXFLAGS +CXXFLAGS=-DOPROF_PERFMON2 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; OP_CXXFLAGS="${OP_CXXFLAGS} -DOPROF_PERFMON2" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +CXXFLAGS=$SAVE_CXXFLAGS +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi + # do NOT put tests here, they will fail in the case X is not installed ! @@ -8223,8 +8401,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8291,8 +8468,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8359,8 +8535,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8427,8 +8602,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8495,8 +8669,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8563,8 +8736,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8631,8 +8803,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8699,8 +8870,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8776,8 +8946,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8844,8 +9013,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8912,8 +9080,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8980,8 +9147,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9060,8 +9226,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9128,8 +9293,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9995,6 +10159,7 @@ s,@CAT_ENTRY_END@,$CAT_ENTRY_END,;t t s,@LIBERTY_LIBS@,$LIBERTY_LIBS,;t t s,@BFD_LIBS@,$BFD_LIBS,;t t s,@POPT_LIBS@,$POPT_LIBS,;t t +s,@PFM_LIBS@,$PFM_LIBS,;t t s,@have_qt_TRUE@,$have_qt_TRUE,;t t s,@have_qt_FALSE@,$have_qt_FALSE,;t t s,@OP_CFLAGS@,$OP_CFLAGS,;t t @@ -10168,11 +10333,6 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -10211,6 +10371,12 @@ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff -urNp oprofile-0.9.2/configure.in oprofile-0.9.2-perfmon2/configure.in --- oprofile-0.9.2/configure.in 2006-09-15 11:29:40.000000000 -0700 +++ oprofile-0.9.2-perfmon2/configure.in 2007-01-05 07:01:16.000000000 -0800 @@ -133,6 +133,18 @@ AC_SUBST(LIBERTY_LIBS) AC_SUBST(BFD_LIBS) AC_SUBST(POPT_LIBS) +dnl enable option to use perfmon use on processors other than ia64 +AC_ARG_ENABLE(perfmon2, + [ --enable-perfmon2 enable option for perfmon2 use on non-ia64 processors (default is disabled)], + enable_perfmon2=$enableval, enable_perfmon2=no) +if test "$enable_perfmon2" = yes; then + AC_CHECK_LIB(pfm, pfm_start,, AC_MSG_ERROR([pfm library not found])) + PFM_LIBS="-lpfm" + AC_SUBST(PFM_LIBS) + AX_CFLAGS_OPTION(OP_CFLAGS,[-DOPROF_PERFMON2]) + AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-DOPROF_PERFMON2]) +fi + # do NOT put tests here, they will fail in the case X is not installed ! AM_CONDITIONAL(have_qt, test -n "$QT_LIB") diff -urNp oprofile-0.9.2/daemon/Makefile.am oprofile-0.9.2-perfmon2/daemon/Makefile.am --- oprofile-0.9.2/daemon/Makefile.am 2005-08-04 11:27:26.000000000 -0700 +++ oprofile-0.9.2-perfmon2/daemon/Makefile.am 2007-01-09 06:14:03.000000000 -0800 @@ -22,10 +22,12 @@ oprofiled_SOURCES = \ opd_mangling.h \ opd_perfmon.h \ opd_perfmon.c \ + opd_perfmon_22.c \ + opd_perfmon_compat.c \ opd_anon.h \ opd_anon.c -LIBS=@POPT_LIBS@ @LIBERTY_LIBS@ +LIBS=@POPT_LIBS@ @LIBERTY_LIBS@ @PFM_LIBS@ AM_CPPFLAGS = \ -I ${top_srcdir}/libabi \ diff -urNp oprofile-0.9.2/daemon/Makefile.in oprofile-0.9.2-perfmon2/daemon/Makefile.in --- oprofile-0.9.2/daemon/Makefile.in 2006-09-15 11:32:01.000000000 -0700 +++ oprofile-0.9.2-perfmon2/daemon/Makefile.in 2007-01-22 04:51:23.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(oprofiled_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -65,6 +63,7 @@ am_oprofiled_OBJECTS = init.$(OBJEXT) op opd_stats.$(OBJEXT) opd_sfile.$(OBJEXT) opd_kernel.$(OBJEXT) \ opd_trans.$(OBJEXT) opd_cookie.$(OBJEXT) opd_events.$(OBJEXT) \ opd_mangling.$(OBJEXT) opd_perfmon.$(OBJEXT) \ + opd_perfmon_22.$(OBJEXT) opd_perfmon_compat.$(OBJEXT) \ opd_anon.$(OBJEXT) oprofiled_OBJECTS = $(am_oprofiled_OBJECTS) oprofiled_DEPENDENCIES = liblegacy/liblegacy.a ../libabi/libabi.a \ @@ -130,7 +129,7 @@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBERTY_LIBS = @LIBERTY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = @POPT_LIBS@ @LIBERTY_LIBS@ +LIBS = @POPT_LIBS@ @LIBERTY_LIBS@ @PFM_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MOC = @MOC@ @@ -148,6 +147,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ @@ -231,6 +231,8 @@ oprofiled_SOURCES = \ opd_mangling.h \ opd_perfmon.h \ opd_perfmon.c \ + opd_perfmon_22.c \ + opd_perfmon_compat.c \ opd_anon.h \ opd_anon.c @@ -324,6 +326,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_kernel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_mangling.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_perfmon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_perfmon_22.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_perfmon_compat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_sfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opd_trans.Po@am__quote@ diff -urNp oprofile-0.9.2/daemon/liblegacy/Makefile.in oprofile-0.9.2-perfmon2/daemon/liblegacy/Makefile.in --- oprofile-0.9.2/daemon/liblegacy/Makefile.in 2006-09-15 11:32:01.000000000 -0700 +++ oprofile-0.9.2-perfmon2/daemon/liblegacy/Makefile.in 2007-01-22 04:51:24.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(liblegacy_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -139,6 +137,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/daemon/opd_perfmon.c oprofile-0.9.2-perfmon2/daemon/opd_perfmon.c --- oprofile-0.9.2/daemon/opd_perfmon.c 2004-12-12 15:26:35.000000000 -0800 +++ oprofile-0.9.2-perfmon2/daemon/opd_perfmon.c 2007-01-10 08:08:36.000000000 -0800 @@ -8,8 +8,6 @@ * @author John Levon */ -#ifdef __ia64__ - /* need this for sched_setaffinity() in */ #define _GNU_SOURCE @@ -34,6 +32,24 @@ #include #endif +/* FIXME fatal_error is just temporary */ +static void fatal_error(char *fmt,...) __attribute__((noreturn)); + +static int pfm_version, use_compat; +#define PFM_VERSION_22 (2<<16|2) + +static void +fatal_error(char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + + exit(EXIT_FAILURE); +} + extern op_cpu cpu_type; #ifndef HAVE_SCHED_SETAFFINITY @@ -63,25 +79,6 @@ sched_setaffinity(pid_t pid, size_t len, } #endif - -#ifndef HAVE_PERFMONCTL -#ifndef __NR_perfmonctl -#define __NR_perfmonctl 1175 -#endif - -static int perfmonctl(int fd, int cmd, void * arg, int narg) -{ - return syscall(__NR_perfmonctl, fd, cmd, arg, narg); -} -#endif - - -static unsigned char uuid[16] = { - 0x77, 0x7a, 0x6e, 0x61, 0x20, 0x65, 0x73, 0x69, - 0x74, 0x6e, 0x72, 0x20, 0x61, 0x65, 0x0a, 0x6c -}; - - static size_t nr_cpus; struct child { @@ -97,21 +94,29 @@ static struct child * children; static void perfmon_start_child(int ctx_fd) { - if (perfmonctl(ctx_fd, PFM_START, 0, 0) == -1) { - perror("Couldn't start perfmon: "); - exit(EXIT_FAILURE); - } -} + int ret; + if (use_compat) + ret = do_start_child_compat(ctx_fd); + else + ret = do_start_child(ctx_fd); + + if (ret == -1) + fatal_error("Couldn't start perfmon: %s\n", strerror(errno)); +} static void perfmon_stop_child(int ctx_fd) { - if (perfmonctl(ctx_fd, PFM_STOP, 0, 0) == -1) { - perror("Couldn't stop perfmon: "); - exit(EXIT_FAILURE); - } -} + int ret; + if (use_compat) + ret = do_stop_child_compat(ctx_fd); + else + ret = do_stop_child(ctx_fd); + + if (ret == -1) + fatal_error("Couldn't stop perfmon: %s\n", strerror(errno)); +} static void child_sigusr1(int val __attribute__((unused))) { @@ -149,17 +154,16 @@ static void child_sigterm(int val __attr static void set_affinity(size_t cpu) { cpu_set_t set; + int err; CPU_ZERO(&set); CPU_SET(cpu, &set); - int err = sched_setaffinity(getpid(), sizeof(set), &set); + err = sched_setaffinity(getpid(), sizeof(set), &set); - if (err == -1) { - fprintf(stderr, "Failed to set affinity: %s\n", + if (err == -1) + fatal_error("Failed to set affinity: %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } } @@ -177,125 +181,72 @@ static void setup_signals(void) act.sa_flags = 0; sigemptyset(&act.sa_mask); - if (sigaction(SIGUSR1, &act, NULL)) { - perror("oprofiled: install of SIGUSR1 handler failed: "); - exit(EXIT_FAILURE); - } + if (sigaction(SIGUSR1, &act, NULL)) + fatal_error("oprofiled: install of SIGUSR1 handler failed: %s\n", + strerror(errno)); act.sa_handler = child_sigusr2; act.sa_flags = 0; sigemptyset(&act.sa_mask); - if (sigaction(SIGUSR2, &act, NULL)) { - perror("oprofiled: install of SIGUSR2 handler failed: "); - exit(EXIT_FAILURE); - } + if (sigaction(SIGUSR2, &act, NULL)) + fatal_error("oprofiled: install of SIGUSR2 handler failed: %s\n", + strerror(errno)); act.sa_handler = child_sigterm; act.sa_flags = 0; sigemptyset(&act.sa_mask); - if (sigaction(SIGTERM, &act, NULL)) { - perror("oprofiled: install of SIGTERM handler failed: "); - exit(EXIT_FAILURE); - } + if (sigaction(SIGTERM, &act, NULL)) + fatal_error("oprofiled: install of SIGTERM handler failed: %s\n", + strerror(errno)); } - /** create the per-cpu context */ static void create_context(struct child * self) { - pfarg_context_t ctx; - int err; + int ret; - memset(&ctx, 0, sizeof(pfarg_context_t)); - memcpy(&ctx.ctx_smpl_buf_id, &uuid, 16); - ctx.ctx_flags = PFM_FL_SYSTEM_WIDE; - - err = perfmonctl(0, PFM_CREATE_CONTEXT, &ctx, 1); - if (err == -1) { - fprintf(stderr, "CREATE_CONTEXT failed: %s\n", - strerror(errno)); - exit(EXIT_FAILURE); - } + if (use_compat) + ret = do_create_context_compat(); + else + ret = do_create_context(); + if (ret == -1) + fatal_error("create context failed: %s\n", + strerror(errno)); - self->ctx_fd = ctx.ctx_fd; + self->ctx_fd = ret; } - /** program the perfmon counters */ static void write_pmu(struct child * self) { - pfarg_reg_t pc[OP_MAX_COUNTERS]; - pfarg_reg_t pd[OP_MAX_COUNTERS]; - int err; - size_t i; - - memset(pc, 0, sizeof(pc)); - memset(pd, 0, sizeof(pd)); - -#define PMC_GEN_INTERRUPT (1UL << 5) -#define PMC_PRIV_MONITOR (1UL << 6) -/* McKinley requires pmc4 to have bit 23 set (enable PMU). - * It is supposedly ignored in other pmc registers. - */ -#define PMC_MANDATORY (1UL << 23) -#define PMC_USER (1UL << 3) -#define PMC_KERNEL (1UL << 0) - for (i = 0; i < op_nr_counters && opd_events[i].name; ++i) { - struct opd_event * event = &opd_events[i]; - pc[i].reg_num = event->counter + 4; - pc[i].reg_value = PMC_GEN_INTERRUPT; - pc[i].reg_value |= PMC_PRIV_MONITOR; - pc[i].reg_value |= PMC_MANDATORY; - (event->user) ? (pc[i].reg_value |= PMC_USER) - : (pc[i].reg_value &= ~PMC_USER); - (event->kernel) ? (pc[i].reg_value |= PMC_KERNEL) - : (pc[i].reg_value &= ~PMC_KERNEL); - pc[i].reg_value &= ~(0xff << 8); - pc[i].reg_value |= ((event->value & 0xff) << 8); - pc[i].reg_value &= ~(0xf << 16); - pc[i].reg_value |= ((event->um & 0xf) << 16); - pc[i].reg_smpl_eventid = event->counter; - } - - for (i = 0; i < op_nr_counters && opd_events[i].name; ++i) { - struct opd_event * event = &opd_events[i]; - pd[i].reg_value = ~0UL - event->count + 1; - pd[i].reg_short_reset = ~0UL - event->count + 1; - pd[i].reg_num = event->counter + 4; - } - - err = perfmonctl(self->ctx_fd, PFM_WRITE_PMCS, pc, i); - if (err == -1) { - perror("Couldn't write PMCs: "); - exit(EXIT_FAILURE); - } + int ret; + + if (use_compat) + ret = do_write_pmu_compat(self->ctx_fd); + else + ret = do_write_pmu(self->ctx_fd); + + if (ret == -1) + fatal_error("create write PMU: %s\n", + strerror(errno)); - err = perfmonctl(self->ctx_fd, PFM_WRITE_PMDS, pd, i); - if (err == -1) { - perror("Couldn't write PMDs: "); - exit(EXIT_FAILURE); - } } +static void load_context(struct child * self, size_t cpu) +{ + int ret; + + if (use_compat) + ret = do_load_context_compat(self->ctx_fd, self->pid, cpu); + else + ret = do_load_context(self->ctx_fd, self->pid, cpu); -static void load_context(struct child * self) -{ - pfarg_load_t load_args; - int err; - - memset(&load_args, 0, sizeof(load_args)); - load_args.load_pid = self->pid; - - err = perfmonctl(self->ctx_fd, PFM_LOAD_CONTEXT, &load_args, 1); - if (err == -1) { - perror("Couldn't load context: "); - exit(EXIT_FAILURE); - } + if (ret == -1) + fatal_error("Couldn't load context: %s\n", strerror(errno)); } - static void notify_parent(struct child * self, size_t cpu) { for (;;) { @@ -303,15 +254,12 @@ static void notify_parent(struct child * ret = write(self->up_pipe[1], &cpu, sizeof(size_t)); if (ret == sizeof(size_t)) break; - if (ret < 0 && errno != EINTR) { - fprintf(stderr, "Failed to write child pipe with %s\n", - strerror(errno)); - exit(EXIT_FAILURE); - } + if (ret < 0 && errno != EINTR) + fatal_error("Failed to write child pipe with %s\n", + strerror(errno)); } } - static void run_child(size_t cpu) { struct child * self = &children[cpu]; @@ -329,7 +277,7 @@ static void run_child(size_t cpu) write_pmu(self); - load_context(self); + load_context(self, cpu); notify_parent(self, cpu); @@ -367,11 +315,9 @@ static void wait_for_child(struct child ret = read(child->up_pipe[0], &tmp, sizeof(size_t)); if (ret == sizeof(size_t)) break; - if (ret < 0 && errno != EINTR) { - fprintf(stderr, "Failed to read child pipe with %s\n", + if (ret < 0 && errno != EINTR) + fatal_error("Failed to read child pipe with %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } } printf("Perfmon child up on CPU%d\n", (int)tmp); fflush(stdout); @@ -380,6 +326,44 @@ static void wait_for_child(struct child close(child->up_pipe[1]); } +static void perfmon_get_version(void) +{ + FILE *fp; + char *buf = NULL; + size_t len = 0; + char *p; + int ret; + + fp = fopen("/sys/kernel/perfmon/version", "r"); + if (fp == NULL) + fatal_error("host kernel does not have perfmon support\n"); + + ret = getline(&buf, &len, fp); + if (ret < 0) + fatal_error("cannot extract perfmon version\n"); + + p = strchr(buf, '.'); + if (p == NULL) + goto invalid_format; + + *p = '\0'; + pfm_version = atoi(buf) << 16; + p++; + pfm_version |= atoi(p); + + free(buf); + fclose(fp); + + /* + * check if using v2.0 (IA-64 only) + */ + if (pfm_version <= PFM_VERSION_22) + use_compat = 1; + return; + +invalid_format: + fatal_error("cannot parse perfmon version number\n"); +} void perfmon_init(void) { @@ -390,10 +374,14 @@ void perfmon_init(void) return; nr = sysconf(_SC_NPROCESSORS_ONLN); - if (nr == -1) { - fprintf(stderr, "Couldn't determine number of CPUs.\n"); - exit(EXIT_FAILURE); - } + if (nr == -1) + fatal_error("Couldn't determine number of CPUs.\n"); + + perfmon_get_version(); + if (use_compat) + do_perfmon_init_compat(); + else + do_perfmon_init(); nr_cpus = nr; @@ -402,16 +390,14 @@ void perfmon_init(void) for (i = 0; i < nr_cpus; ++i) { int ret; - if (pipe(children[i].up_pipe)) { - perror("Couldn't create child pipe.\n"); - exit(EXIT_FAILURE); - } + if (pipe(children[i].up_pipe)) + fatal_error("Couldn't create child pipe: %s\n", strerror(errno)); ret = fork(); - if (ret == -1) { - fprintf(stderr, "Couldn't fork perfmon child.\n"); - exit(EXIT_FAILURE); - } else if (ret == 0) { + if (ret == -1) + fatal_error("Couldn't fork perfmon child.\n"); + + if (ret == 0) { printf("Running perfmon child on CPU%d.\n", (int)i); fflush(stdout); run_child(i); @@ -460,5 +446,3 @@ void perfmon_stop(void) for (i = 0; i < nr_cpus; ++i) kill(children[i].pid, SIGUSR2); } - -#endif /* __ia64__ */ diff -urNp oprofile-0.9.2/daemon/opd_perfmon.h oprofile-0.9.2-perfmon2/daemon/opd_perfmon.h --- oprofile-0.9.2/daemon/opd_perfmon.h 2003-10-22 03:51:37.000000000 -0700 +++ oprofile-0.9.2-perfmon2/daemon/opd_perfmon.h 2007-01-10 06:38:49.000000000 -0800 @@ -11,8 +11,6 @@ #ifndef OPD_PERFMON_H #define OPD_PERFMON_H -#ifdef __ia64__ - #include void perfmon_init(void); @@ -20,6 +18,15 @@ void perfmon_exit(void); void perfmon_start(void); void perfmon_stop(void); +#ifdef __ia64__ +extern void do_perfmon_init_compat(void); +extern int do_start_child_compat(int fd); +extern int do_stop_child_compat(int fd); +extern int do_create_context_compat(void); +extern int do_write_pmu_compat(int fd); +extern int do_load_context_compat(int fd, pid_t pid, size_t cpu); + +#ifndef OPROF_PERFMON2 /* The following is from asm/perfmon.h. When it's installed on * enough boxes, we can remove this and include the platform * perfmon.h @@ -79,28 +86,32 @@ typedef struct { #define PFM_CREATE_CONTEXT 0x08 #define PFM_LOAD_CONTEXT 0x10 #define PFM_FL_SYSTEM_WIDE 0x02 +#endif #else -void perfmon_init(void) -{ -} - - -void perfmon_exit(void) -{ -} - - -void perfmon_start(void) -{ -} - - -void perfmon_stop(void) -{ -} - -#endif /* __ia64__ */ +#define do_perfmon_init_compat() +#define do_start_child_compat(fd) (-1) +#define do_stop_child_compat(fd) (-1) +#define do_create_context_compat() (-1) +#define do_write_pmu_compat(fd) (-1) +#define do_load_context_compat(fd, pid, cpu) (-1) +#endif + +#ifdef OPROF_PERFMON2 +extern void do_perfmon_init(void); +extern int do_start_child(int fd); +extern int do_stop_child(int fd); +extern int do_create_context(void); +extern int do_write_pmu(int fd); +extern int do_load_context(int fd, pid_t pid, size_t cpu); +#else +#define do_perfmon_init_compat() +#define do_start_child(fd) (-1) +#define do_stop_child(fd) (-1) +#define do_create_context() (-1) +#define do_write_pmu(fd) (-1) +#define do_load_context(fd, pid, cpu) (-1) +#endif /* OPROF_PERFMON2 */ #endif /* OPD_PERFMON_H */ diff -urNp oprofile-0.9.2/daemon/opd_perfmon_22.c oprofile-0.9.2-perfmon2/daemon/opd_perfmon_22.c --- oprofile-0.9.2/daemon/opd_perfmon_22.c 1969-12-31 16:00:00.000000000 -0800 +++ oprofile-0.9.2-perfmon2/daemon/opd_perfmon_22.c 2007-01-22 02:48:40.000000000 -0800 @@ -0,0 +1,684 @@ +/** + * @file opd_perfmon.c + * perfmonctl() handling + * + * @remark Copyright 2003 OProfile authors + * @remark Read the file COPYING + * + * @author John Levon + */ + +#ifdef OPROF_PERFMON2 +/* need this for sched_setaffinity() in */ +#define _GNU_SOURCE + +#include "oprofiled.h" +#include "opd_perfmon.h" +#include "opd_events.h" + +#include "op_cpu_type.h" +#include "op_libiberty.h" +#include "op_hw_config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern op_cpu cpu_type; + +typedef struct { + pfarg_pmc_t pc[OP_MAX_COUNTERS]; + pfarg_pmd_t pd[OP_MAX_COUNTERS]; + uint64_t *avail_pmcs; + unsigned int n_pmcs, n_pmds; + +} pmu_reg_desc_t; + +static int (*write_pmu)(pmu_reg_desc_t *desc); + +static int pmc_is_avail(uint64_t *avail, unsigned int i) +{ + return avail[i>>6] & (1ULL << (i&63)); +} + +/* + * Mapping between OProfile and perfmon2: + * for P6, Opteron, PII, Core Duo: identity + */ +static int get_unavail_counters_p6(u32 *avail_mask) +{ + pfarg_ctx_t ctx; + pfarg_setinfo_t setf; + int nr = -1, i, fd; + + memset(&ctx, 0, sizeof(ctx)); + memset(&setf, 0, sizeof(setf)); + + fd = pfm_create_context(&ctx, NULL, NULL, 0); + if (fd == -1) + return -1; + + /* + * extract list of available PMC/PMD + */ + nr = pfm_getinfo_evtsets(fd, &setf, 1); + if (nr == -1) + goto error; + + /* + * populate OProfile avail counter mask + * + * all PMD are counters, identity mapping + */ + nr = 0; + for(i=0; i < 32; i++) { + if (setf.set_avail_pmds[0] & (1ULL<pc[i].reg_num = event->counter; + desc->pc[i].reg_value = (uint64_t)event->value; + desc->pc[i].reg_value |= (uint64_t)event->um << 8; + + /* set enable bit */ + desc->pc[i].reg_value |= 1ULL << 22; + + if (event->kernel) + desc->pc[i].reg_value |= 1ULL << 17; + if (event->user) + desc->pc[i].reg_value |= 1ULL << 16; + + desc->pd[i].reg_num = event->counter; + desc->pd[i].reg_value = - (uint64_t)event->count; + desc->pd[i].reg_short_reset = - (uint64_t)event->count; + desc->pd[i].reg_long_reset = - (uint64_t)event->count; + desc->pd[i].reg_smpl_eventid = event->counter; + } + if (opd_events[i].name) + return -1; + desc->n_pmcs = desc->n_pmds = i; + return 0; +} + +/* + * Mapping between OProfile and perfmon2: + * for Core 2 Duo: generic counters starts at PMC4, need to setup global control + */ +static int write_pmu_core2(pmu_reg_desc_t *desc) +{ + uint64_t enable_mask = 0; + unsigned int i; + + for (i = 0; i < op_nr_counters && opd_events[i].name; ++i) { + struct opd_event * event = &opd_events[i]; + + /* + * XXX: needs to take into account unavailable PMCs + */ + desc->pc[i].reg_num = 4 + event->counter; + desc->pc[i].reg_value = (uint64_t)event->value; + desc->pc[i].reg_value |= (uint64_t)event->um << 8; + + /* set enable bit */ + desc->pc[i].reg_value |= 1ULL << 22; + + enable_mask |= 1ULL << (desc->pc[i].reg_num - 4); + + if (event->kernel) + desc->pc[i].reg_value |= 1ULL << 17; + + if (event->user) + desc->pc[i].reg_value |= 1ULL << 16; + + desc->pd[i].reg_num = 4 + event->counter; + desc->pd[i].reg_value = - (uint64_t)event->count; + desc->pd[i].reg_short_reset = - (uint64_t)event->count; + desc->pd[i].reg_long_reset = - (uint64_t)event->count; + desc->pd[i].reg_smpl_eventid = event->counter; + } + if (opd_events[i].name) + return -1; + + desc->n_pmds = i; + + if (pmc_is_avail(desc->avail_pmcs, 0)) { + desc->pc[i].reg_num = 0; + desc->pc[i].reg_value = enable_mask; + i++; + } + desc->n_pmcs = i; + return 0; +} + +/* + * Mapping between OProfile and perfmon2: + * for all IA-64 processors: identity + */ +static int write_pmu_ia64(pmu_reg_desc_t *desc) +{ + unsigned int i; + + for (i = 0; i < op_nr_counters && opd_events[i].name; ++i) { + struct opd_event * event = &opd_events[i]; + + /* + * XXX: needs to take into account unavailable PMCs + */ + desc->pc[i].reg_num = event->counter; + desc->pc[i].reg_value = (uint64_t)event->value; + + /* model-specific field, same position so far */ + desc->pc[i].reg_value |= (uint64_t)event->um << 16; + + if (event->kernel) + desc->pc[i].reg_value |= 1ULL; + if (event->user) + desc->pc[i].reg_value |= 1ULL << 3; + + desc->pd[i].reg_num = event->counter; + desc->pd[i].reg_value = - (uint64_t)event->count; + desc->pd[i].reg_short_reset = - (uint64_t)event->count; + desc->pd[i].reg_long_reset = - (uint64_t)event->count; + desc->pd[i].reg_smpl_eventid = event->counter; + } + if (opd_events[i].name) + return -1; + desc->n_pmcs = desc->n_pmds = i; + return 0; +} + +struct p4_counter_binding { + int virt_counter; + unsigned long counter_address; + unsigned long cccr_address; +}; + +#define CTR_BPU_0 (1 << 0) +#define CTR_MS_0 (1 << 1) +#define CTR_FLAME_0 (1 << 2) +#define CTR_IQ_4 (1 << 3) +#define CTR_BPU_2 (1 << 4) +#define CTR_MS_2 (1 << 5) +#define CTR_FLAME_2 (1 << 6) +#define CTR_IQ_5 (1 << 7) + +#define PFM_BPU_ESCR0 0 +#define PFM_IS_ESCR0 1 +#define PFM_MOB_ESCR0 2 +#define PFM_ITLB_ESCR0 3 +#define PFM_PMH_ESCR0 4 +#define PFM_IX_ESCR0 5 +#define PFM_FSB_ESCR0 6 +#define PFM_BSU_ESCR0 7 +#define PFM_MS_ESCR0 8 +#define PFM_TC_ESCR0 9 +#define PFM_TBPU_ESCR0 10 +#define PFM_FLAME_ESCR0 11 +#define PFM_FIRM_ESCR0 12 +#define PFM_SAAT_ESCR0 13 +#define PFM_U2L_ESCR0 14 +#define PFM_DAC_ESCR0 15 +#define PFM_ALF_ESCR0 17 +#define PFM_RAT_ESCR0 18 +#define PFM_SSU_ESCR0 19 +#define PFM_CRU_ESCR0 20 +#define PFM_CRU_ESCR2 21 +#define PFM_CRU_ESCR4 22 +#define PFM_BPU_CCCR0 23 +#define PFM_BPU_CCCR1 24 +#define PFM_MS_CCCR0 25 +#define PFM_MS_CCCR1 26 +#define PFM_FLAME_CCCR0 27 +#define PFM_FLAME_CCCR1 28 +#define PFM_IQ_CCCR0 29 +#define PFM_IQ_CCCR1 30 +#define PFM_IQ_CCCR4 31 +#define PFM_BPU_ESCR1 32 +#define PFM_IS_ESCR1 33 +#define PFM_MOB_ESCR1 34 +#define PFM_ITLB_ESCR1 35 +#define PFM_PMH_ESCR1 36 +#define PFM_IX_ESCR1 37 +#define PFM_FSB_ESCR1 38 +#define PFM_BSU_ESCR1 39 +#define PFM_MS_ESCR1 40 +#define PFM_TC_ESCR1 41 +#define PFM_TBPU_ESCR1 42 +#define PFM_FLAME_ESCR1 43 +#define PFM_FIRM_ESCR1 44 +#define PFM_SAAT_ESCR1 45 +#define PFM_U2L_ESCR1 46 +#define PFM_DAC_ESCR1 47 +#define PFM_ALF_ESCR1 49 +#define PFM_RAT_ESCR1 50 +#define PFM_CRU_ESCR1 51 +#define PFM_CRU_ESCR3 52 +#define PFM_CRU_ESCR5 53 +#define PFM_BPU_CCCR2 54 +#define PFM_BPU_CCCR3 55 +#define PFM_MS_CCCR2 56 +#define PFM_MS_CCCR3 57 +#define PFM_FLAME_CCCR2 58 +#define PFM_FLAME_CCCR3 59 +#define PFM_IQ_CCCR2 60 +#define PFM_IQ_CCCR3 61 +#define PFM_IQ_CCCR5 62 +#define PFM_PEBS_MATRIX_VERT 63 +#define PFM_PEBS_ENABLE 64 +#define PFM_BPU_CTR0 0 +#define PFM_BPU_CTR1 1 +#define PFM_MS_CTR0 2 +#define PFM_MS_CTR1 3 +#define PFM_FLAME_CTR0 4 +#define PFM_FLAME_CTR1 5 +#define PFM_IQ_CTR0 6 +#define PFM_IQ_CTR1 7 +#define PFM_IQ_CTR4 8 +#define PFM_BPU_CTR2 9 +#define PFM_BPU_CTR3 10 +#define PFM_MS_CTR2 11 +#define PFM_MS_CTR3 12 +#define PFM_FLAME_CTR2 13 +#define PFM_FLAME_CTR3 14 +#define PFM_IQ_CTR2 15 +#define PFM_IQ_CTR3 16 +#define PFM_IQ_CTR5 17 + +static struct p4_counter_binding p4_counters [] = { + { CTR_BPU_0, PFM_BPU_CTR0, PFM_BPU_CCCR0 }, + { CTR_MS_0, PFM_MS_CTR0, PFM_MS_CCCR0 }, + { CTR_FLAME_0, PFM_FLAME_CTR0, PFM_FLAME_CCCR0 }, + { CTR_IQ_4, PFM_IQ_CTR4, PFM_IQ_CCCR4 }, + { CTR_BPU_2, PFM_BPU_CTR2, PFM_BPU_CCCR2 }, + { CTR_MS_2, PFM_MS_CTR2, PFM_MS_CCCR2 }, + { CTR_FLAME_2, PFM_FLAME_CTR2, PFM_FLAME_CCCR2 }, + { CTR_IQ_5, PFM_IQ_CTR5, PFM_IQ_CCCR5 } +}; + +struct p4_event_binding { + int escr_select; /* value to put in CCCR */ + int event_select; /* value to put in ESCR */ + struct { + int virt_counter; /* for this counter... */ + int escr_address; /* use this ESCR */ + } bindings[2]; +}; + + +static struct p4_event_binding p4_events[] = { + { /* BRANCH_RETIRED */ + 0x05, 0x06, + { {CTR_IQ_4, PFM_CRU_ESCR2}, + {CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* MISPRED_BRANCH_RETIRED */ + 0x04, 0x03, + { { CTR_IQ_4, PFM_CRU_ESCR0}, + { CTR_IQ_5, PFM_CRU_ESCR1} } + }, + { /* TC_DELIVER_MODE */ + 0x01, 0x01, + { { CTR_MS_0, PFM_TC_ESCR0}, + { CTR_MS_2, PFM_TC_ESCR1} } + }, + { /* BPU_FETCH_REQUEST */ + 0x00, 0x03, + { { CTR_BPU_0, PFM_BPU_ESCR0}, + { CTR_BPU_2, PFM_BPU_ESCR1} } + }, + { /* ITLB_REFERENCE */ + 0x03, 0x18, + { { CTR_BPU_0, PFM_ITLB_ESCR0}, + { CTR_BPU_2, PFM_ITLB_ESCR1} } + }, + { /* MEMORY_CANCEL */ + 0x05, 0x02, + { { CTR_FLAME_0, PFM_DAC_ESCR0}, + { CTR_FLAME_2, PFM_DAC_ESCR1} } + }, + { /* MEMORY_COMPLETE */ + 0x02, 0x08, + { { CTR_FLAME_0, PFM_SAAT_ESCR0}, + { CTR_FLAME_2, PFM_SAAT_ESCR1} } + }, + { /* LOAD_PORT_REPLAY */ + 0x02, 0x04, + { { CTR_FLAME_0, PFM_SAAT_ESCR0}, + { CTR_FLAME_2, PFM_SAAT_ESCR1} } + }, + { /* STORE_PORT_REPLAY */ + 0x02, 0x05, + { { CTR_FLAME_0, PFM_SAAT_ESCR0}, + { CTR_FLAME_2, PFM_SAAT_ESCR1} } + }, + { /* MOB_LOAD_REPLAY */ + 0x02, 0x03, + { { CTR_BPU_0, PFM_MOB_ESCR0}, + { CTR_BPU_2, PFM_MOB_ESCR1} } + }, + { /* PAGE_WALK_TYPE */ + 0x04, 0x01, + { { CTR_BPU_0, PFM_PMH_ESCR0}, + { CTR_BPU_2, PFM_PMH_ESCR1} } + }, + { /* BSQ_CACHE_REFERENCE */ + 0x07, 0x0c, + { { CTR_BPU_0, PFM_BSU_ESCR0}, + { CTR_BPU_2, PFM_BSU_ESCR1} } + }, + { /* IOQ_ALLOCATION */ + 0x06, 0x03, + { { CTR_BPU_0, PFM_FSB_ESCR0}, + { 0, 0 } } + }, + { /* IOQ_ACTIVE_ENTRIES */ + 0x06, 0x1a, + { { CTR_BPU_2, PFM_FSB_ESCR1}, + { 0, 0 } } + }, + { /* FSB_DATA_ACTIVITY */ + 0x06, 0x17, + { { CTR_BPU_0, PFM_FSB_ESCR0}, + { CTR_BPU_2, PFM_FSB_ESCR1} } + }, + { /* BSQ_ALLOCATION */ + 0x07, 0x05, + { { CTR_BPU_0, PFM_BSU_ESCR0}, + { 0, 0 } } + }, + { /* BSQ_ACTIVE_ENTRIES */ + 0x07, 0x06, + { { CTR_BPU_2, PFM_BSU_ESCR1 /* guess */}, + { 0, 0 } } + }, + { /* X87_ASSIST */ + 0x05, 0x03, + { { CTR_IQ_4, PFM_CRU_ESCR2}, + { CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* SSE_INPUT_ASSIST */ + 0x01, 0x34, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* PACKED_SP_UOP */ + 0x01, 0x08, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* PACKED_DP_UOP */ + 0x01, 0x0c, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* SCALAR_SP_UOP */ + 0x01, 0x0a, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* SCALAR_DP_UOP */ + 0x01, 0x0e, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* 64BIT_MMX_UOP */ + 0x01, 0x02, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* 128BIT_MMX_UOP */ + 0x01, 0x1a, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* X87_FP_UOP */ + 0x01, 0x04, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* X87_SIMD_MOVES_UOP */ + 0x01, 0x2e, + { { CTR_FLAME_0, PFM_FIRM_ESCR0}, + { CTR_FLAME_2, PFM_FIRM_ESCR1} } + }, + { /* MACHINE_CLEAR */ + 0x05, 0x02, + { { CTR_IQ_4, PFM_CRU_ESCR2}, + { CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* GLOBAL_POWER_EVENTS */ + 0x06, 0x13 /* older manual says 0x05, newer 0x13 */, + { { CTR_BPU_0, PFM_FSB_ESCR0}, + { CTR_BPU_2, PFM_FSB_ESCR1} } + }, + { /* TC_MS_XFER */ + 0x00, 0x05, + { { CTR_MS_0, PFM_MS_ESCR0}, + { CTR_MS_2, PFM_MS_ESCR1} } + }, + { /* UOP_QUEUE_WRITES */ + 0x00, 0x09, + { { CTR_MS_0, PFM_MS_ESCR0}, + { CTR_MS_2, PFM_MS_ESCR1} } + }, + { /* FRONT_END_EVENT */ + 0x05, 0x08, + { { CTR_IQ_4, PFM_CRU_ESCR2}, + { CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* EXECUTION_EVENT */ + 0x05, 0x0c, + { { CTR_IQ_4, PFM_CRU_ESCR2}, + { CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* REPLAY_EVENT */ + 0x05, 0x09, + { { CTR_IQ_4, PFM_CRU_ESCR2}, + { CTR_IQ_5, PFM_CRU_ESCR3} } + }, + { /* INSTR_RETIRED */ + 0x04, 0x02, + { { CTR_IQ_4, PFM_CRU_ESCR0}, + { CTR_IQ_5, PFM_CRU_ESCR1} } + }, + { /* UOPS_RETIRED */ + 0x04, 0x01, + { { CTR_IQ_4, PFM_CRU_ESCR0}, + { CTR_IQ_5, PFM_CRU_ESCR1} } + }, + { /* UOP_TYPE */ + 0x02, 0x02, + { { CTR_IQ_4, PFM_RAT_ESCR0}, + { CTR_IQ_5, PFM_RAT_ESCR1} } + }, + { /* RETIRED_MISPRED_BRANCH_TYPE */ + 0x02, 0x05, + { { CTR_MS_0, PFM_TBPU_ESCR0}, + { CTR_MS_2, PFM_TBPU_ESCR1} } + }, + { /* RETIRED_BRANCH_TYPE */ + 0x02, 0x04, + { { CTR_MS_0, PFM_TBPU_ESCR0}, + { CTR_MS_2, PFM_TBPU_ESCR1} } + } +}; + +static int write_pmu_p4(pmu_reg_desc_t *desc) +{ + unsigned int i, j; + unsigned long escr, cccr, ctr; + uint64_t value; + + for (j = 0, i = 0; j< op_nr_counters && opd_events[j].name; ++j, i++) { + struct opd_event * event = &opd_events[j]; + + printf("counter=%ld um=0x%lx value=0x%lx\n", event->counter, event->um, event->value); + + ctr = p4_events[event->value -1].bindings[0].virt_counter; + escr = p4_events[event->value -1].bindings[0].escr_address; + cccr = p4_counters[ctr - 1].cccr_address; + ctr = p4_counters[ctr - 1].counter_address; + + printf("escr_sel=0x%x evnt_sel=0x%x\n", p4_events[event->value - 1].escr_select, p4_events[event->value - 1].event_select); + printf("ctr=0x%lx escr=0x%lx cccr=0x%lx\n", ctr, escr, cccr); + + + value = p4_events[event->value -1].event_select << 25; + value |= event->um << 9; + if (event->kernel) + value |= 1ULL << 3; + if (event->user) + value |= 1ULL << 2; + + desc->pc[i].reg_num = escr; + desc->pc[i].reg_value = value; + i++; + + value = p4_events[event->value -1].escr_select << 13; + value |= 1ULL << 12; /* enable bit */ + /* + * XXX: needs to take into account unavailable PMCs + */ + desc->pc[i].reg_num = cccr; + desc->pc[i].reg_value = value; + + desc->pd[j].reg_num = ctr; + desc->pd[j].reg_value = - (uint64_t)event->count; + desc->pd[j].reg_short_reset = - (uint64_t)event->count; + desc->pd[j].reg_long_reset = - (uint64_t)event->count; + desc->pd[j].reg_smpl_eventid = event->counter; + } + + if (opd_events[j].name) + return -1; + + desc->n_pmcs = i; + desc->n_pmds = j; + + return 0; +} + +int do_start_child(int ctx_fd) +{ + return pfm_start(ctx_fd, NULL); +} + +int do_stop_child(int ctx_fd) +{ + return pfm_stop(ctx_fd); +} + +int do_create_context(void) +{ + pfarg_ctx_t ctx; + memset(&ctx, 0, sizeof(ctx)); + ctx.ctx_flags = PFM_FL_SYSTEM_WIDE; + + return pfm_create_context(&ctx, "OProfile", NULL, 0); +} + +int do_write_pmu(int fd) +{ + pmu_reg_desc_t desc; + pfarg_setinfo_t setf; + int err; + + memset(&desc, 0, sizeof(desc)); + memset(&setf, 0, sizeof(setf)); + + /* + * extract list of available PMC + */ + err = pfm_getinfo_evtsets(fd, &setf, 1); + if (err == -1) + return -1; + + desc.avail_pmcs = setf.set_avail_pmcs; + + /* + * assign OProfile counters to Perfmon PMC/PMD + */ + err = write_pmu(&desc); + if (err == -1) + return -1; + + /* + * write PMC registers + */ + err = pfm_write_pmcs(fd, desc.pc, desc.n_pmcs); + if (err == -1) + return -1; + + /* + * write PMD registers + */ + err = pfm_write_pmds(fd, desc.pd, desc.n_pmds); + if (err == -1) + return -1; + return 0; +} + +int do_load_context(int fd, pid_t pid, size_t cpu) +{ + pfarg_load_t load_args; + + memset(&load_args, 0, sizeof(load_args)); + + load_args.load_pid = cpu; + + return pfm_load_context(fd, &load_args); +} + +void do_perfmon_init(void) +{ + switch(cpu_type) { + case CPU_HAMMER: + case CPU_P6_MOBILE: + case CPU_CORE: + case CPU_PPRO ... CPU_ATHLON: + write_pmu = write_pmu_p6; + break; + case CPU_CORE_2: + write_pmu = write_pmu_core2; + break; + case CPU_P4: + case CPU_P4_HT2: + write_pmu = write_pmu_p4; + break; + case CPU_IA64 ... CPU_IA64_2: + write_pmu = write_pmu_ia64; + break; + default: + return; + } +} + +#endif /* OPROF_PERFMON2 */ diff -urNp oprofile-0.9.2/daemon/opd_perfmon_compat.c oprofile-0.9.2-perfmon2/daemon/opd_perfmon_compat.c --- oprofile-0.9.2/daemon/opd_perfmon_compat.c 1969-12-31 16:00:00.000000000 -0800 +++ oprofile-0.9.2-perfmon2/daemon/opd_perfmon_compat.c 2007-01-22 04:31:15.000000000 -0800 @@ -0,0 +1,152 @@ +/** + * @file opd_perfmon_ia64.c + * perfmonctl() handling for perfmon v2.0 on IA-64 only + * perfmon v2.2 or higher is handled by opd_perfmon.c even for IA-64 + * + * @remark Copyright 2003 OProfile authors + * @remark Read the file COPYING + * + * @author John Levon + */ + +#if defined(__ia64__) + +/* need this for sched_setaffinity() in */ +#define _GNU_SOURCE + +#include "oprofiled.h" +#include "opd_perfmon.h" +#include "opd_events.h" + +#include "op_cpu_type.h" +#include "op_libiberty.h" +#include "op_hw_config.h" + +#include +#include +#include +#include +#include +#include +#include + +#ifdef OPROF_PERFMON2 +#include +#include +#include +static pfm_uuid_t uuid = PFM_DEFAULT_SMPL_UUID; +#else +#ifndef HAVE_PERFMONCTL +#ifndef __NR_perfmonctl +#define __NR_perfmonctl 1175 +#endif + +static int perfmonctl(int fd, int cmd, void * arg, int narg) +{ + return syscall(__NR_perfmonctl, fd, cmd, arg, narg); +} +#endif + +static unsigned char uuid[16] = { + 0x77, 0x7a, 0x6e, 0x61, 0x20, 0x65, 0x73, 0x69, + 0x74, 0x6e, 0x72, 0x20, 0x61, 0x65, 0x0a, 0x6c +}; +#endif + + +int do_create_context_compat(void) +{ + pfarg_context_t ctx; + int err; + + memset(&ctx, 0, sizeof(ctx)); + ctx.ctx_flags = PFM_FL_SYSTEM_WIDE; + memcpy(ctx.ctx_smpl_buf_id, uuid, sizeof(uuid)); + + err = perfmonctl(0, PFM_CREATE_CONTEXT, &ctx, 1); + if (err == -1) + return -1; + + return ctx.ctx_fd; +} + +/* + * Mapping OProfile -> Perfmon2 + * 0 -> PMC4, PMD4 + * 1 -> PMC5, PMD5 + * 2 -> PMC6, PMD6 + * 3 -> PMC7, PMD7 + */ +int do_write_pmu_compat(int fd) +{ + int err; + size_t i; + pfarg_reg_t pc[OP_MAX_COUNTERS]; + pfarg_reg_t pd[OP_MAX_COUNTERS]; + + memset(pc, 0, sizeof(pc)); + memset(pd, 0, sizeof(pd)); + +#define PMC_PRIV_MONITOR (1UL << 6) +#define PMC_USER (1UL << 3) +#define PMC_KERNEL (1UL << 0) + + for (i = 0; i < op_nr_counters && opd_events[i].name; ++i) { + struct opd_event * event = &opd_events[i]; + + pc[i].reg_num = event->counter + 4; + + pc[i].reg_value = PMC_PRIV_MONITOR; + (event->user) ? (pc[i].reg_value |= PMC_USER) + : (pc[i].reg_value &= ~PMC_USER); + (event->kernel) ? (pc[i].reg_value |= PMC_KERNEL) + : (pc[i].reg_value &= ~PMC_KERNEL); + pc[i].reg_value &= ~(0xfful << 8); + pc[i].reg_value |= ((event->value & 0xfful) << 8); + pc[i].reg_value &= ~(0xful << 16); + pc[i].reg_value |= ((event->um & 0xful) << 16); + pc[i].reg_smpl_eventid = event->counter; + + pd[i].reg_num = event->counter + 4; + pd[i].reg_value = -event->count; + pd[i].reg_short_reset = -event->count; + pd[i].reg_smpl_eventid = event->counter; + } + + err = perfmonctl(fd, PFM_WRITE_PMCS, pc, op_nr_counters); + if (err == -1) + return -1; + + err = perfmonctl(fd, PFM_WRITE_PMDS, pd, op_nr_counters); + if (err == -1) + return -1; + + return 0; +} + +int do_load_context_compat(int fd, pid_t pid, size_t cpu) +{ + pfarg_load_t load_args; + + memset(&load_args, 0, sizeof(load_args)); + + load_args.load_pid = pid; + + return perfmonctl(fd, PFM_LOAD_CONTEXT, &load_args, 1); +} + +int do_start_child_compat(int ctx_fd) +{ + return perfmonctl(ctx_fd, PFM_START, NULL, 0); +} + +int do_stop_child_compat(int ctx_fd) +{ + return perfmonctl(ctx_fd, PFM_STOP, NULL, 0); +} + +void do_perfmon_init_compat(void) +{ +} + +#endif /* defined(__ia64__) */ diff -urNp oprofile-0.9.2/doc/Makefile.in oprofile-0.9.2-perfmon2/doc/Makefile.in --- oprofile-0.9.2/doc/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/doc/Makefile.in 2007-01-22 04:51:24.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -136,6 +136,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/doc/oprofile.1 oprofile-0.9.2-perfmon2/doc/oprofile.1 --- oprofile-0.9.2/doc/oprofile.1 2006-09-15 11:32:42.000000000 -0700 +++ oprofile-0.9.2-perfmon2/doc/oprofile.1 1969-12-31 16:00:00.000000000 -0800 @@ -1,190 +0,0 @@ -.TH OPROFILE 1 "Fri 15 September 2006" "oprofile 0.9.2" -.UC 4 -.SH NAME -oprofile \- a system-wide profiler -.SH SYNOPSIS -.br -.B opcontrol -[ -.I options -] -.br -.B opreport -[ -.I options -] -[ profile specification ] -.br -.B opannotate -[ -.I options -] -[ profile specification ] -.br -.B oparchive -[ -.I options -] -[ profile specification ] -.br -.B opgprof -[ -.I options -] -[ profile specification ] -.br -.SH DESCRIPTION -OProfile is a profiling system for systems running Linux -2.2, 2.4, and 2.6. Profiling runs transparently in the background and profile -data can be collected at any time. OProfile makes use of the hardware -performance counters provided on Intel, AMD, and other processors, -and uses a timer-interrupt based mechanism on CPUs without counters. -OProfile can profile the whole system in high detail. -.br -For a gentle guide to using OProfile, please read the HTML documentation -listed in SEE ALSO. -.br -.SH OPCONTROL -.B opcontrol -is used for starting and stopping the OProfile daemon, and providing set-up -parameters. -.SH OPREPORT -.B opreport -gives image and symbol-based profile summaries for the whole system or -a subset of binary images. -.SH OPANNOTATE -.B opannotate -can produce annotated source or mixed source and assembly output. -.SH OPARCHIVE -.B oparchive -produces oprofile archive for offline analysis -.SH OPGPROF -.B opgprof -can produce a gprof-format profile for a single binary. - -.SH PROFILE SPECIFICATIONS -All of the post-profiling tools can take profile specifications, -which is some combination of the following parameters. Enclosing -part of a profile specification in curly braces { } can be used -for differential profiles with -.B opreport - -.TP -.BI "archive:"archive -Path to the archive to inspect, as generated by -.B oparchive -.br -.TP -.BI "session:"sessionlist -A comma-separated list of session names to resolve in. Absence of this -tag, unlike all others, means "the current session", equivalent to -specifying "session:current". -.br -.TP -.BI "session-exclude:"sessionlist -A comma-separated list of sessions to exclude. -.br -.TP -.BI "image:"imagelist -A comma-separated list of image names to resolve. Each entry may be relative -path, glob-style name, or full path, e.g. -opreport 'image:/usr/bin/oprofiled,*op*,./oprofpp' -.br -.TP -.BI "image-exclude:"imagelist -Same as image:, but the matching images are excluded. -.br -.TP -.BI "lib-image:"imagelist -Same as image:, but only for images that are for -a particular primary binary image (namely, an application). This only -makes sense to use if you're using --separate. -This includes kernel modules and the kernel when using ---separate=kernel. -.br -.TP -.BI "lib-image-exclude:"imagelist -Same as , but the matching images -are excluded. -.br -.TP -.BI "event:"eventname -The symbolic event name to match on, e.g. event:DATA_MEM_REFS. -.br -.TP -.BI "count:"eventcount -The event count to match on, e.g. event:DATA_MEM_REFS count:30000. -.br -.TP -.BI "unit-mask:"maskvalue -The unit mask value of the event to match on, e.g. unit-mask:1. -.br -.TP -.BI "cpu:"cpulist -Only consider profiles for the given numbered CPU (starting from zero). -This is only useful when using CPU profile separation. -.br -.TP -.BI "tgid:"pidlist -Only consider profiles for the given task groups. Unless some program is -using threads, the task group ID of a process is the same as its process -ID. This option corresponds to the POSIX notion of a thread group. This -is only useful when using per-process profile separation. -.br -.TP -.BI "tid:"tidlist -Only consider profiles for the given threads. When using recent thread -libraries, all threads in a process share the same task group ID, but -have different thread IDs. You can use this option in combination with -tgid: to restrict the results to particular threads within a process. -This is only useful when using per-process profile separation. - -.SH ENVIRONMENT -No special environment variables are recognised by oprofile. - -.SH FILES -.TP -.I $HOME/.oprofile/ -Configuration files -.TP -.I /root/.oprofile/daemonrc -Configuration file for opcontrol -.TP -.I /usr/local/share/oprofile/ -Event description files used by OProfile. -.TP -.I /var/lib/oprofile/oprofiled.log -The user-space daemon logfile. -.TP -.I /var/lib/oprofile/opdev, /var/lib/oprofile/ophashmapdev, /var/lib/oprofile/opnotedev -The device files for communication with the Linux 2.4 kernel module. -.TP -.I /dev/oprofile -The device filesystem for communication with the Linux 2.6 kernel module. -.TP -.I /var/lib/oprofile/samples/ -The location of the generated sample files. - -.SH VERSION -.TP -This man page is current for oprofile-0.9.2. - -.SH SEE ALSO -.BR /usr/local/share/doc/oprofile/, -.BR opcontrol(1), -.BR opreport(1), -.BR opannotate(1), -.BR oparchive(1), -.BR opgprof(1), -.BR gprof(1), -.BR readprofile(1), -.BR "CPU vendor architecture manuals" - -.SH COPYRIGHT -oprofile is Copyright (C) 1998-2004 University of Manchester, UK, John Levon, -and others. -OProfile is released under the GNU General Public License, Version 2, -or (at your option) any later version. -.SH AUTHORS -John Levon is the primary author. See the documentation -for other contributors. diff -urNp oprofile-0.9.2/events/Makefile.in oprofile-0.9.2-perfmon2/events/Makefile.in --- oprofile-0.9.2/events/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/events/Makefile.in 2007-01-22 04:51:24.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -117,6 +117,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/gui/Makefile.in oprofile-0.9.2-perfmon2/gui/Makefile.in --- oprofile-0.9.2/gui/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/gui/Makefile.in 2007-01-22 04:51:24.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(oprof_start_SOURCES) $(nodist_oprof_start_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -157,6 +155,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/gui/ui/Makefile.in oprofile-0.9.2-perfmon2/gui/ui/Makefile.in --- oprofile-0.9.2/gui/ui/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/gui/ui/Makefile.in 2007-01-22 04:51:24.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(nodist_liboprof_start_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -139,6 +137,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libabi/Makefile.in oprofile-0.9.2-perfmon2/libabi/Makefile.in --- oprofile-0.9.2/libabi/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libabi/Makefile.in 2007-01-22 04:51:25.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libabi_a_SOURCES) $(opimport_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -158,6 +156,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libabi/tests/Makefile.in oprofile-0.9.2-perfmon2/libabi/tests/Makefile.in --- oprofile-0.9.2/libabi/tests/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libabi/tests/Makefile.in 2007-01-22 04:51:25.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(abi_test_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -135,6 +133,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libdb/Makefile.in oprofile-0.9.2-perfmon2/libdb/Makefile.in --- oprofile-0.9.2/libdb/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libdb/Makefile.in 2007-01-22 04:51:25.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libodb_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -144,6 +142,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libdb/tests/Makefile.in oprofile-0.9.2-perfmon2/libdb/tests/Makefile.in --- oprofile-0.9.2/libdb/tests/Makefile.in 2006-09-15 11:32:02.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libdb/tests/Makefile.in 2007-01-22 04:51:25.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(db_test_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -132,6 +130,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libop/Makefile.in oprofile-0.9.2-perfmon2/libop/Makefile.in --- oprofile-0.9.2/libop/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libop/Makefile.in 2007-01-22 04:51:25.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libop_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -145,6 +143,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libop/tests/Makefile.in oprofile-0.9.2-perfmon2/libop/tests/Makefile.in --- oprofile-0.9.2/libop/tests/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libop/tests/Makefile.in 2007-01-22 04:51:26.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(alloc_counter_tests_SOURCES) $(cpu_type_tests_SOURCES) $(load_events_files_tests_SOURCES) $(mangle_tests_SOURCES) $(parse_event_tests_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -153,6 +151,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libopt++/Makefile.in oprofile-0.9.2-perfmon2/libopt++/Makefile.in --- oprofile-0.9.2/libopt++/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libopt++/Makefile.in 2007-01-22 04:51:26.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libopt___a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -141,6 +139,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libpp/Makefile.in oprofile-0.9.2-perfmon2/libpp/Makefile.in --- oprofile-0.9.2/libpp/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libpp/Makefile.in 2007-01-22 04:51:26.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libpp_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -149,6 +147,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libregex/Makefile.in oprofile-0.9.2-perfmon2/libregex/Makefile.in --- oprofile-0.9.2/libregex/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libregex/Makefile.in 2007-01-22 04:51:26.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libop_regex_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -160,6 +158,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libregex/tests/Makefile.in oprofile-0.9.2-perfmon2/libregex/tests/Makefile.in --- oprofile-0.9.2/libregex/tests/Makefile.in 2006-09-15 11:32:03.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libregex/tests/Makefile.in 2007-01-22 04:51:26.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(regex_test_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -134,6 +132,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libutil/Makefile.in oprofile-0.9.2-perfmon2/libutil/Makefile.in --- oprofile-0.9.2/libutil/Makefile.in 2006-09-15 11:32:04.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libutil/Makefile.in 2007-01-22 04:51:27.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libutil_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -146,6 +144,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libutil/tests/Makefile.in oprofile-0.9.2-perfmon2/libutil/tests/Makefile.in --- oprofile-0.9.2/libutil/tests/Makefile.in 2006-09-15 11:32:05.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libutil/tests/Makefile.in 2007-01-22 04:51:27.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(file_tests_SOURCES) $(string_tests_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -135,6 +133,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libutil++/Makefile.in oprofile-0.9.2-perfmon2/libutil++/Makefile.in --- oprofile-0.9.2/libutil++/Makefile.in 2006-09-15 11:32:04.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libutil++/Makefile.in 2007-01-22 04:51:27.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(libutil___a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -152,6 +150,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/libutil++/tests/Makefile.in oprofile-0.9.2-perfmon2/libutil++/tests/Makefile.in --- oprofile-0.9.2/libutil++/tests/Makefile.in 2006-09-15 11:32:04.000000000 -0700 +++ oprofile-0.9.2-perfmon2/libutil++/tests/Makefile.in 2007-01-22 04:51:27.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -13,8 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -SOURCES = $(cached_value_tests_SOURCES) $(comma_list_tests_SOURCES) $(file_manip_tests_SOURCES) $(glob_filter_tests_SOURCES) $(path_filter_tests_SOURCES) $(string_filter_tests_SOURCES) $(string_manip_tests_SOURCES) $(utility_tests_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -166,6 +164,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/m4/Makefile.in oprofile-0.9.2-perfmon2/m4/Makefile.in --- oprofile-0.9.2/m4/Makefile.in 2006-09-15 11:32:05.000000000 -0700 +++ oprofile-0.9.2-perfmon2/m4/Makefile.in 2007-01-22 04:51:27.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -119,6 +119,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/pp/Makefile.in oprofile-0.9.2-perfmon2/pp/Makefile.in --- oprofile-0.9.2/pp/Makefile.in 2006-09-15 11:32:05.000000000 -0700 +++ oprofile-0.9.2-perfmon2/pp/Makefile.in 2007-01-22 04:51:28.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,6 @@ @SET_MAKE@ -SOURCES = $(opannotate_SOURCES) $(oparchive_SOURCES) $(opgprof_SOURCES) $(opreport_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -161,6 +159,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/utils/Makefile.in oprofile-0.9.2-perfmon2/utils/Makefile.in --- oprofile-0.9.2/utils/Makefile.in 2006-09-15 11:32:05.000000000 -0700 +++ oprofile-0.9.2-perfmon2/utils/Makefile.in 2007-01-22 04:51:28.000000000 -0800 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(ophelp_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -140,6 +138,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PFM_LIBS = @PFM_LIBS@ POPT_LIBS = @POPT_LIBS@ PTRDIFF_T_TYPE = @PTRDIFF_T_TYPE@ QT_INCLUDES = @QT_INCLUDES@ diff -urNp oprofile-0.9.2/utils/opcontrol oprofile-0.9.2-perfmon2/utils/opcontrol --- oprofile-0.9.2/utils/opcontrol 2006-03-29 13:54:07.000000000 -0800 +++ oprofile-0.9.2-perfmon2/utils/opcontrol 2007-01-05 07:53:14.000000000 -0800 @@ -267,6 +267,14 @@ do_init() OP_COUNTERS=`ls $MOUNT/ | grep "^[0-9]\+\$" | tr "\n" " "` NR_CHOSEN=0 + OP_IMPLEMENTATION_DIR=$MOUNT/implementation + if test -f $OP_IMPLEMENTATION; then + OP_IMPLEMENTATION=`cat $OP_IMPLEMENTATION_DIR` + else + OP_IMPLEMENTATION="unspecified" + fi + + DEFAULT_EVENT=`$OPHELP --get-default-event` IS_TIMER=0 @@ -274,10 +282,19 @@ do_init() if test "$CPUTYPE" = "timer"; then IS_TIMER=1 else - case "$CPUTYPE" in + case $OP_IMPLEMENTATION in + perfmon2) + IS_PERFMON=$KERNEL_SUPPORT + ;; + unspecified) + case "$CPUTYPE" in ia64/*) IS_PERFMON=$KERNEL_SUPPORT ;; + esac + ;; + *) + ;; esac fi }