Shark: JVMTI support for profiling, etc
Andrew Haley
aph at redhat.com
Thu Feb 26 10:37:31 PST 2009
This patch adds support for Shark profiling. Running SPECjvm98 gives you
a profile like this, showing the time spent in Shark-compiled code:
samples % image name app name symbol name
168440 5.0754 no-vmlinux no-vmlinux /no-vmlinux
125195 3.7724 9541.jo java spec.benchmarks._209_db.Database::shell_sort
87596 2.6394 libjvm.so libjvm.so SignatureIterator::iterate_returntype()
80076 2.4128 9541.jo java java.lang.String::compareTo
70082 2.1117 9541.jo java java.util.Vector::elementAt
65929 1.9866 9541.jo java spec.benchmarks._201_compress.Compressor::compress
62324 1.8779 libjvm.so libjvm.so SharedHeap::is_in_permanent(void const*) const
59044 1.7791 libjvm.so libjvm.so CppInterpreter::accessor_entry(methodOopDesc*, long, Thread*)
58508 1.7630 libjvm.so libjvm.so Hashtable::oops_do(OopClosure*)
43226 1.3025 9541.jo java spec.benchmarks._222_mpegaudio.q::l
42005 1.2657 9541.jo java java.util.Vector::elementData
39031 1.1761 9541.jo java spec.benchmarks._205_raytrace.OctNode::Intersect
38677 1.1654 9541.jo java spec.benchmarks._201_compress.Decompressor::decompress
...
I committed this.
Andrew.
2009-02-26 Andrew Haley <aph at redhat.com>
* patches/openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp: New file.
* Makefile.am (ICEDTEA_PATCHES): Add icedtea-jvmtiEnv.patch.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
(SharkFunction::initialize): Use real name, not "func".
Pass "none" to "-debug-only=".
Register generated code for profiling, etc.
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp (class SharkEntry):
Remove #ifndef PRODUCT.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::CreateFunction): Use real name, not "func".
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::CreateFunction): Use real name, not "func".
(MyJITMemoryManager::endFunctionBody): Remove #ifndef PRODUCT.
--- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp.old 2009-02-26 17:18:35.000000000 +0000
+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2009-02-26 17:16:59.000000000 +0000
@@ -2702,6 +2702,9 @@
(*entry_count_ptr) = num_entries;
(*table_ptr) = jvmti_table;
+ if (num_entries == 0)
+ return JVMTI_ERROR_ABSENT_INFORMATION;
+
return JVMTI_ERROR_NONE;
} /* end GetLineNumberTable */
diff -r 90de0ba94422 Makefile.am
--- a/Makefile.am Thu Feb 26 17:34:19 2009 +0000
+++ b/Makefile.am Thu Feb 26 18:32:17 2009 +0000
@@ -541,7 +541,8 @@
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-core-build.patch
+ patches/icedtea-core-build.patch \
+ patches/icedtea-jvmtiEnv.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 90de0ba94422 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Feb 26 17:34:19 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Feb 26 18:29:12 2009 +0000
@@ -97,12 +97,12 @@
module()->getOrInsertFunction("llvm.memory.barrier", type));
}
-Function *SharkBuilder::CreateFunction()
+Function *SharkBuilder::CreateFunction(const char *name)
{
Function *function = Function::Create(
SharkType::entry_point_type(),
GlobalVariable::InternalLinkage,
- "func");
+ name);
module()->getFunctionList().push_back(function);
return function;
}
@@ -180,13 +180,12 @@
void SharkBuilder::MyJITMemoryManager::endFunctionBody
(const llvm::Function *F, unsigned char *FunctionStart,
- unsigned char *FunctionEnd)
+ unsigned char *FunctionEnd)
{
mm->endFunctionBody(F, FunctionStart, FunctionEnd);
-#ifndef PRODUCT
+
SharkEntry *e = sharkEntry[F];
if (e)
e->setBounds(FunctionStart, FunctionEnd);
-#endif // !PRODUCT
}
diff -r 90de0ba94422 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Feb 26 17:34:19 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Feb 26 18:29:12 2009 +0000
@@ -109,7 +109,7 @@
// Function creation
public:
- llvm::Function *CreateFunction();
+ llvm::Function *CreateFunction(const char *name = "func");
// Helpers for accessing structures and arrays
public:
diff -r 90de0ba94422 ports/hotspot/src/share/vm/shark/sharkEntry.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkEntry.hpp Thu Feb 26 17:34:19 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkEntry.hpp Thu Feb 26 18:29:12 2009 +0000
@@ -46,8 +46,6 @@
public:
void print_statistics(const char* name) const PRODUCT_RETURN;
-#ifndef PRODUCT
- private:
address code_start() const
{
return start;
@@ -66,6 +64,4 @@
start = (address)FunctionStart;
limit = (address)FunctionEnd;
}
-
-#endif // !PRODUCT
};
diff -r 90de0ba94422 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Feb 26 17:34:19 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Thu Feb 26 18:29:12 2009 +0000
@@ -37,7 +37,7 @@
masm()->advance(sizeof(SharkEntry));
// Create the function
- _function = builder()->CreateFunction();
+ _function = builder()->CreateFunction(name());
entry->set_llvm_function(function());
#ifndef PRODUCT
// FIXME: there should be a mutex when updating sharkEntry in case
@@ -142,7 +142,7 @@
// target-specific.
Args.push_back("-debug-only=" "x86-emitter");
else
- Args.push_back("-debug-only=");
+ Args.push_back("-debug-only=" "none");
Args.push_back(0); // Null terminator.
cl::ParseCommandLineOptions(Args.size()-1, (char**)&Args[0]);
#endif
@@ -150,6 +150,13 @@
// Compile to native code
void *code = builder()->execution_engine()->getPointerToFunction(function());
+
+ // Register generated code for profiling, etc
+ if (JvmtiExport::should_post_dynamic_code_generated()) {
+ JvmtiExport::post_dynamic_code_generated
+ (name(), entry->code_start(), entry->code_limit());
+ }
+
entry->set_entry_point((ZeroEntry::method_entry_t) code);
if (SharkTraceInstalls)
entry->print_statistics(name());
More information about the distro-pkg-dev
mailing list