[llvm-commits] [llvm] r75279 - in /llvm/trunk: autoconf/configure.ac include/llvm/ExecutionEngine/JITEventListener.h lib/ExecutionEngine/JIT/CMakeLists.txt lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp tools/lli/lli.cpp
Jeffrey Yasskin
jyasskin at google.com
Fri Jul 10 14:08:20 PDT 2009
Author: jyasskin
Date: Fri Jul 10 16:08:20 2009
New Revision: 75279
URL: http://llvm.org/viewvc/llvm-project?rev=75279&view=rev
Log:
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
Added:
llvm/trunk/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
Modified:
llvm/trunk/autoconf/configure.ac
llvm/trunk/include/llvm/ExecutionEngine/JITEventListener.h
llvm/trunk/lib/ExecutionEngine/JIT/CMakeLists.txt
llvm/trunk/tools/lli/lli.cpp
Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=75279&r1=75278&r2=75279&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Fri Jul 10 16:08:20 2009
@@ -922,6 +922,43 @@
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=<prefix>],
+ [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
Modified: llvm/trunk/include/llvm/ExecutionEngine/JITEventListener.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/JITEventListener.h?rev=75279&r1=75278&r2=75279&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/JITEventListener.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/JITEventListener.h Fri Jul 10 16:08:20 2009
@@ -52,7 +52,9 @@
virtual void NotifyFreeingMachineCode(const Function &F, void *OldPtr) {}
};
+// These return NULL if support isn't available.
JITEventListener *createMacOSJITEventListener();
+JITEventListener *createOProfileJITEventListener();
} // end namespace llvm.
Modified: llvm/trunk/lib/ExecutionEngine/JIT/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/CMakeLists.txt?rev=75279&r1=75278&r2=75279&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/CMakeLists.txt (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/CMakeLists.txt Fri Jul 10 16:08:20 2009
@@ -8,5 +8,6 @@
JITEmitter.cpp
JITMemoryManager.cpp
MacOSJITEventListener.cpp
+ OProfileJITEventListener.cpp
TargetSelect.cpp
)
Added: llvm/trunk/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp?rev=75279&view=auto
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp (added)
+++ llvm/trunk/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp Fri Jul 10 16:08:20 2009
@@ -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 <stddef.h>
+using namespace llvm;
+
+#if defined(USE_OPROFILE)
+
+#include <opagent.h>
+
+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<uint64_t>(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<uint64_t>(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)
Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=75279&r1=75278&r2=75279&view=diff
==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Fri Jul 10 16:08:20 2009
@@ -156,6 +156,7 @@
}
EE->RegisterJITEventListener(createMacOSJITEventListener());
+ EE->RegisterJITEventListener(createOProfileJITEventListener());
if (NoLazyCompilation)
EE->DisableLazyCompilation();
More information about the llvm-commits
mailing list