From 8f6d9a729e4f73c25c3dadaf2af01e87b71c2288 Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Fri, 10 Jul 2009 21:08:20 +0000 Subject: Add a --with-oprofile flag to configure, which uses OProfile's agent library to tell it the addresses of JITted functions. For a particular program, this changes the opreport -l output from: samples % image name symbol name 48182 98.9729 anon (tgid:19412 range:0x7f12ccaab000-0x7f12cdaab000) anon (tgid:19412 range:0x7f12ccaab000-0x7f12cdaab000) 11 0.0226 libstdc++.so.6.0.9 /usr/lib/libstdc++.so.6.0.9 to: samples % image name symbol name 24565 60.7308 19814.jo fib_left 15365 37.9861 19814.jo fib_right 22 0.0544 ld-2.7.so do_lookup_x git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75279 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/configure.ac | 37 +++++++ include/llvm/ExecutionEngine/JITEventListener.h | 2 + lib/ExecutionEngine/JIT/CMakeLists.txt | 1 + .../JIT/OProfileJITEventListener.cpp | 109 +++++++++++++++++++++ tools/lli/lli.cpp | 1 + 5 files changed, 150 insertions(+) create mode 100644 lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp diff --git a/autoconf/configure.ac b/autoconf/configure.ac index b3940f08e5..71afc3a999 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -922,6 +922,43 @@ AC_ARG_WITH(udis86, AC_DEFINE_UNQUOTED([USE_UDIS86],$USE_UDIS86, [Define if use udis86 library]) +dnl Allow OProfile support for JIT output. +AC_ARG_WITH(oprofile, + AS_HELP_STRING([--with-oprofile=], + [Tell OProfile >= 0.9.4 how to symbolize JIT output]), + [ + AC_SUBST(USE_OPROFILE, [1]) + case "$withval" in + /usr|yes) llvm_cv_oppath=/usr/lib/oprofile ;; + *) llvm_cv_oppath="${withval}/lib/oprofile" + CPPFLAGS="-I${withval}/include";; + esac + LIBS="$LIBS -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}" + AC_SEARCH_LIBS(op_open_agent, opagent, [], [ + echo "Error! You need to have libopagent around." + exit -1 + ]) + AC_CHECK_HEADER([opagent.h], [], [ + echo "Error! You need to have opagent.h around." + exit -1 + ]) + ], + [ + llvm_cv_old_LIBS="$LIBS" + LIBS="$LIBS -L/usr/lib/oprofile -Wl,-rpath,/usr/lib/oprofile" + dnl If either the library or header aren't present, omit oprofile support. + AC_SEARCH_LIBS(op_open_agent, opagent, + [AC_SUBST(USE_OPROFILE, [1])], + [LIBS="$llvm_cv_old_LIBS" + AC_SUBST(USE_OPROFILE, [0])]) + AC_CHECK_HEADER([opagent.h], [], [ + LIBS="$llvm_cv_old_LIBS" + AC_SUBST(USE_OPROFILE, [0]) + ]) + ]) +AC_DEFINE_UNQUOTED([USE_OPROFILE],$USE_OPROFILE, + [Define if we have the oprofile JIT-support library]) + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 6: Check for header files diff --git a/include/llvm/ExecutionEngine/JITEventListener.h b/include/llvm/ExecutionEngine/JITEventListener.h index dd76f26c87..7d42284078 100644 --- a/include/llvm/ExecutionEngine/JITEventListener.h +++ b/include/llvm/ExecutionEngine/JITEventListener.h @@ -52,7 +52,9 @@ public: virtual void NotifyFreeingMachineCode(const Function &F, void *OldPtr) {} }; +// These return NULL if support isn't available. JITEventListener *createMacOSJITEventListener(); +JITEventListener *createOProfileJITEventListener(); } // end namespace llvm. diff --git a/lib/ExecutionEngine/JIT/CMakeLists.txt b/lib/ExecutionEngine/JIT/CMakeLists.txt index bf915f7c4c..7f15b4cf08 100644 --- a/lib/ExecutionEngine/JIT/CMakeLists.txt +++ b/lib/ExecutionEngine/JIT/CMakeLists.txt @@ -8,5 +8,6 @@ add_llvm_library(LLVMJIT JITEmitter.cpp JITMemoryManager.cpp MacOSJITEventListener.cpp + OProfileJITEventListener.cpp TargetSelect.cpp ) diff --git a/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp new file mode 100644 index 0000000000..1cc45139da --- /dev/null +++ b/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp @@ -0,0 +1,109 @@ +//===-- OProfileJITEventListener.cpp - Tell OProfile about JITted code ----===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file defines a JITEventListener object that calls into OProfile to tell +// it about JITted functions. For now, we only record function names and sizes, +// but eventually we'll also record line number information. +// +// See http://oprofile.sourceforge.net/doc/devel/jit-interface.html for the +// definition of the interface we're using. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "oprofile-jit-event-listener" +#include "llvm/Function.h" +#include "llvm/ExecutionEngine/JITEventListener.h" +#include "llvm/Support/Debug.h" +#include "llvm/System/Errno.h" +#include "llvm/Config/config.h" +#include +using namespace llvm; + +#if defined(USE_OPROFILE) + +#include + +namespace { + +class OProfileJITEventListener : public JITEventListener { + op_agent_t Agent; +public: + OProfileJITEventListener(); + ~OProfileJITEventListener(); + + virtual void NotifyFunctionEmitted(const Function &F, + void *FnStart, size_t FnSize, + const EmittedFunctionDetails &Details); + virtual void NotifyFreeingMachineCode(const Function &F, void *OldPtr); +}; + +OProfileJITEventListener::OProfileJITEventListener() + : Agent(op_open_agent()) { + if (Agent == NULL) { + const std::string err_str = sys::StrError(); + DOUT << "Failed to connect to OProfile agent: " << err_str << "\n"; + } else { + DOUT << "Connected to OProfile agent.\n"; + } +} + +OProfileJITEventListener::~OProfileJITEventListener() { + if (Agent != NULL) { + if (op_close_agent(Agent) == -1) { + const std::string err_str = sys::StrError(); + DOUT << "Failed to disconnect from OProfile agent: " << err_str << "\n"; + } else { + DOUT << "Disconnected from OProfile agent.\n"; + } + } +} + +// Adds the just-emitted function to the symbol table. +void OProfileJITEventListener::NotifyFunctionEmitted( + const Function &F, void *FnStart, size_t FnSize, + const EmittedFunctionDetails &) { + const char *const FnName = F.getNameStart(); + assert(FnName != 0 && FnStart != 0 && "Bad symbol to add"); + if (op_write_native_code(Agent, FnName, + reinterpret_cast(FnStart), + FnStart, FnSize) == -1) { + DOUT << "Failed to tell OProfile about native function " << FnName + << " at [" << FnStart << "-" << ((char*)FnStart + FnSize) << "]\n"; + } +} + +// Removes the to-be-deleted function from the symbol table. +void OProfileJITEventListener::NotifyFreeingMachineCode( + const Function &F, void *FnStart) { + assert(FnStart && "Invalid function pointer"); + if (op_unload_native_code(Agent, reinterpret_cast(FnStart)) == -1) { + DOUT << "Failed to tell OProfile about unload of native function " + << F.getName() << " at " << FnStart << "\n"; + } +} + +} // anonymous namespace. + +namespace llvm { +JITEventListener *createOProfileJITEventListener() { + return new OProfileJITEventListener; +} +} + +#else // !defined(USE_OPROFILE) + +namespace llvm { +// By defining this to return NULL, we can let clients call it unconditionally, +// even if they haven't configured with the OProfile libraries. +JITEventListener *createOProfileJITEventListener() { + return NULL; +} +} // namespace llvm + +#endif // defined(USE_OPROFILE) diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 40b858e9d1..adf6c1c970 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -156,6 +156,7 @@ int main(int argc, char **argv, char * const *envp) { } EE->RegisterJITEventListener(createMacOSJITEventListener()); + EE->RegisterJITEventListener(createOProfileJITEventListener()); if (NoLazyCompilation) EE->DisableLazyCompilation(); -- cgit v1.2.3