/hg/icedtea6: 2009-08-28 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Fri Aug 28 06:24:30 PDT 2009
changeset 188db4af2dc5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=188db4af2dc5
author: Gary Benson <gbenson at redhat.com>
date: Fri Aug 28 09:18:57 2009 -0400
2009-08-28 Gary Benson <gbenson at redhat.com>
* patches/icedtea-cc-interp-backedge.patch: Various fixes
to backedge counting and OSR migration code.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
(BytecodeInterpreter::osr_buf): New accessor.
(BytecodeInterpreter::osr_entry): Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
(CppInterpreter::main_loop): Handle do_osr messages.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
(Interpreter::invoke_osr): New method.
* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
(ZeroEntry::osr_entry_t): New type. (ZeroEntry::invoke_osr):
New method.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
(SharkBuilder::osr_migration_end): New method.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::osr_migration_end): Likewise.
* ports/hotspot/src/share/vm/shark/sharkType.hpp
(SharkType::_osr_entry_point_type): New field.
(SharkType::osr_entry_point_type): New method.
* ports/hotspot/src/share/vm/shark/sharkType.cpp
(SharkType::_osr_entry_point_type): New field.
(SharkType::initialize): Initialize the above.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
(SharkCacher::process_local_slot): Made virtual.
(SharkNormalEntryCacher): New class. (SharkOSREntryCacher):
Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
(SharkOSREntryCacher::CreateAddressOfOSRBufEntry): New method.
(SharkOSREntryCacher::process_monitor): Likewise.
(SharkOSREntryCacher::process_local_slot): Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.hpp
(SharkEntryState): Renamed as... (SharkNormalEntryState):
...this. (SharkOSREntryState::SharkOSREntryState): New
class.
* ports/hotspot/src/share/vm/shark/sharkState.cpp
(SharkEntryState::SharkEntryState): Renamed as...
(SharkNormalEntryState::SharkNormalEntryState): ...this.
(SharkOSREntryState::SharkOSREntryState): New method.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
(SharkFunction::is_osr): New method.
(SharkFunction::entry_point_type): Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
(SharkFunction::initialize): Handle OSR typeflows.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
(SharkCompiler::supports_osr): Return true instead of false.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::compile_method): Remove method-isn't-OSR
assertion, and add code to generate OSR typeflows.
diffstat:
18 files changed, 339 insertions(+), 27 deletions(-)
ChangeLog | 61 ++++++++++++
patches/icedtea-cc-interp-backedge.patch | 19 +++
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 8 +
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 13 ++
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 8 +
ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 7 +
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 5
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 1
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 48 +++++++++
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 45 ++++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 7 -
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 2
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 44 +++++---
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 14 ++
ports/hotspot/src/share/vm/shark/sharkState.cpp | 47 ++++++++-
ports/hotspot/src/share/vm/shark/sharkState.hpp | 20 ++-
ports/hotspot/src/share/vm/shark/sharkType.cpp | 12 ++
ports/hotspot/src/share/vm/shark/sharkType.hpp | 5
diffs (truncated from 621 to 500 lines):
diff -r ba0c7c6c4896 -r 188db4af2dc5 ChangeLog
--- a/ChangeLog Fri Aug 28 11:01:49 2009 +0100
+++ b/ChangeLog Fri Aug 28 09:18:57 2009 -0400
@@ -1,3 +1,64 @@ 2009-08-28 Gary Benson <gbenson at redhat
+2009-08-28 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-cc-interp-backedge.patch: Various fixes
+ to backedge counting and OSR migration code.
+
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
+ (BytecodeInterpreter::osr_buf): New accessor.
+ (BytecodeInterpreter::osr_entry): Likewise.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+ (CppInterpreter::main_loop): Handle do_osr messages.
+
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
+ (Interpreter::invoke_osr): New method.
+
+ * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
+ (ZeroEntry::osr_entry_t): New type.
+ (ZeroEntry::invoke_osr): New method.
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+ (SharkBuilder::osr_migration_end): New method.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (SharkBuilder::osr_migration_end): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp
+ (SharkType::_osr_entry_point_type): New field.
+ (SharkType::osr_entry_point_type): New method.
+ * ports/hotspot/src/share/vm/shark/sharkType.cpp
+ (SharkType::_osr_entry_point_type): New field.
+ (SharkType::initialize): Initialize the above.
+
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+ (SharkCacher::process_local_slot): Made virtual.
+ (SharkNormalEntryCacher): New class.
+ (SharkOSREntryCacher): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+ (SharkOSREntryCacher::CreateAddressOfOSRBufEntry): New method.
+ (SharkOSREntryCacher::process_monitor): Likewise.
+ (SharkOSREntryCacher::process_local_slot): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp
+ (SharkEntryState): Renamed as...
+ (SharkNormalEntryState): ...this.
+ (SharkOSREntryState::SharkOSREntryState): New class.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp
+ (SharkEntryState::SharkEntryState): Renamed as...
+ (SharkNormalEntryState::SharkNormalEntryState): ...this.
+ (SharkOSREntryState::SharkOSREntryState): New method.
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+ (SharkFunction::is_osr): New method.
+ (SharkFunction::entry_point_type): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+ (SharkFunction::initialize): Handle OSR typeflows.
+
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+ (SharkCompiler::supports_osr): Return true instead of false.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+ (SharkCompiler::compile_method): Remove method-isn't-OSR
+ assertion, and add code to generate OSR typeflows.
+
2009-08-28 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkState.cpp
diff -r ba0c7c6c4896 -r 188db4af2dc5 patches/icedtea-cc-interp-backedge.patch
--- a/patches/icedtea-cc-interp-backedge.patch Fri Aug 28 11:01:49 2009 +0100
+++ b/patches/icedtea-cc-interp-backedge.patch Fri Aug 28 09:18:57 2009 -0400
@@ -1,7 +1,24 @@ diff -r e0f4330c215b openjdk/hotspot/src
diff -r e0f4330c215b openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 16:46:08 2009 +0000
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 17:12:20 2009 +0000
-@@ -296,9 +296,6 @@
+@@ -281,7 +281,7 @@
+
+ #define DO_BACKEDGE_CHECKS(skip, branch_pc) \
+ if ((skip) <= 0) { \
+- if (UseCompiler && UseLoopCounter) { \
++ if (UseLoopCounter) { \
+ bool do_OSR = UseOnStackReplacement; \
+ BACKEDGE_COUNT->increment(); \
+ if (do_OSR) do_OSR = BACKEDGE_COUNT->reached_InvocationLimit(); \
+@@ -289,16 +289,12 @@
+ nmethod* osr_nmethod; \
+ OSR_REQUEST(osr_nmethod, branch_pc); \
+ if (osr_nmethod != NULL && osr_nmethod->osr_entry_bci() != InvalidOSREntryBci) { \
+- intptr_t* buf; \
+- CALL_VM(buf=SharedRuntime::OSR_migration_begin(THREAD), handle_exception); \
++ intptr_t* buf = SharedRuntime::OSR_migration_begin(THREAD); \
+ istate->set_msg(do_osr); \
+ istate->set_osr_buf((address)buf); \
istate->set_osr_entry(osr_nmethod->osr_entry()); \
return; \
} \
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -95,6 +95,14 @@
{
return _result._to_call._callee_entry_point;
}
+ inline address osr_buf()
+ {
+ return _result._osr._osr_buf;
+ }
+ inline address osr_entry()
+ {
+ return _result._osr._osr_entry;
+ }
public:
const char *name_of_field_at_address(address addr);
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -156,6 +156,19 @@ void CppInterpreter::main_loop(int recur
assert(HAS_PENDING_EXCEPTION, "should do");
break;
}
+ else if (istate->msg() == BytecodeInterpreter::do_osr) {
+ // Unwind the current frame
+ thread->pop_zero_frame();
+
+ // Remove any extension of the previous frame
+ int extra_locals = method->max_locals() - method->size_of_parameters();
+ stack->set_sp(stack->sp() + extra_locals);
+
+ // Jump into the OSR method
+ Interpreter::invoke_osr(
+ method, istate->osr_entry(), istate->osr_buf(), THREAD);
+ return;
+ }
else {
ShouldNotReachHere();
}
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -32,6 +32,10 @@ class ZeroEntry {
public:
typedef void (*method_entry_t)(methodOop method, intptr_t base_pc, TRAPS);
+ typedef void (*osr_entry_t)(methodOop method,
+ address osr_buf,
+ intptr_t base_pc,
+ TRAPS);
private:
method_entry_t _entry_point;
@@ -51,6 +55,10 @@ class ZeroEntry {
{
entry_point()(method, (intptr_t) this, THREAD);
}
+ void invoke_osr(methodOop method, address osr_buf, TRAPS) const
+ {
+ ((osr_entry_t) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
+ }
public:
static ByteSize entry_point_offset()
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -27,6 +27,13 @@
static void invoke_method(methodOop method, address entry_point, TRAPS)
{
((ZeroEntry *) entry_point)->invoke(method, THREAD);
+ }
+ static void invoke_osr(methodOop method,
+ address entry_point,
+ address osr_buf,
+ TRAPS)
+ {
+ ((ZeroEntry *) entry_point)->invoke_osr(method, osr_buf, THREAD);
}
public:
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -360,6 +360,11 @@ Value* SharkBuilder::unsafe_field_offset
return make_function((address) Unsafe_field_offset_to_byte_offset, "l", "l");
}
+Value* SharkBuilder::osr_migration_end()
+{
+ return make_function((address) SharedRuntime::OSR_migration_end, "C", "v");
+}
+
// Uncommon trap
Value* SharkBuilder::uncommon_trap()
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -128,6 +128,7 @@ class SharkBuilder : public llvm::IRBuil
llvm::Value* exp();
llvm::Value* fabs();
llvm::Value* unsafe_field_offset_to_byte_offset();
+ llvm::Value* osr_migration_end();
// Intrinsics and external functions, part 3: Uncommon trap.
// This is a special case in that it is invoked like a non-VM
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -185,6 +185,27 @@ void SharkCacher::process_stack_slot(int
}
}
+void SharkOSREntryCacher::process_monitor(int index,
+ int box_offset,
+ int obj_offset)
+{
+ if (max_monitors() > 1)
+ Unimplemented(); // XXX which order will they be in?
+
+ // Copy the monitor from the OSR buffer to the frame
+ int src_offset = max_locals() + index * 2;
+ builder()->CreateStore(
+ builder()->CreateLoad(
+ CreateAddressOfOSRBufEntry(src_offset, SharkType::intptr_type())),
+ function()->CreateAddressOfFrameEntry(
+ box_offset, SharkType::intptr_type()));
+ builder()->CreateStore(
+ builder()->CreateLoad(
+ CreateAddressOfOSRBufEntry(src_offset + 1, SharkType::oop_type())),
+ function()->CreateAddressOfFrameEntry(
+ obj_offset, SharkType::oop_type()));
+}
+
void SharkCacher::process_oop_tmp_slot(Value** value, int offset)
{
// Cache the temporary oop
@@ -221,6 +242,33 @@ void SharkCacher::process_local_slot(int
}
}
+Value* SharkOSREntryCacher::CreateAddressOfOSRBufEntry(int offset,
+ const Type* type)
+{
+ Value *result = builder()->CreateStructGEP(osr_buf(), offset);
+ if (type != SharkType::intptr_type())
+ result = builder()->CreateBitCast(result, PointerType::getUnqual(type));
+ return result;
+}
+
+void SharkOSREntryCacher::process_local_slot(int index,
+ SharkValue** addr,
+ int offset)
+{
+ SharkValue *value = *addr;
+
+ // Read the value from the OSR buffer if necessary
+ if (local_slot_needs_read(index, value)) {
+ *addr = SharkValue::create_generic(
+ value->type(),
+ builder()->CreateLoad(
+ CreateAddressOfOSRBufEntry(
+ adjusted_offset(value, max_locals() - 1 - index),
+ SharkType::to_stackType(value->basic_type()))),
+ value->zero_checked());
+ }
+}
+
void SharkDecacher::write_value_to_frame(const Type* type,
Value* value,
int offset)
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -34,6 +34,8 @@
// - SharkJavaCallCacher
// - SharkVMCallCacher
// - SharkFunctionEntryCacher
+// - SharkNormalEntryCacher
+// - SharkOSREntryCacher
class SharkCacherDecacher : public SharkStateScanner {
protected:
@@ -329,7 +331,7 @@ class SharkCacher : public SharkCacherDe
void process_oop_tmp_slot(llvm::Value** value, int offset);
virtual void process_method_slot(llvm::Value** value, int offset);
- void process_local_slot(int index, SharkValue** value, int offset);
+ virtual void process_local_slot(int index, SharkValue** value, int offset);
// Stack slot helper
protected:
@@ -410,8 +412,47 @@ class SharkFunctionEntryCacher : public
// Local slot helper
protected:
- virtual bool local_slot_needs_read(int index, SharkValue* value)
+ bool local_slot_needs_read(int index, SharkValue* value)
{
return value != NULL;
}
};
+
+class SharkNormalEntryCacher : public SharkFunctionEntryCacher {
+ public:
+ SharkNormalEntryCacher(SharkFunction* function, llvm::Value* method)
+ : SharkFunctionEntryCacher(function, method) {}
+};
+
+class SharkOSREntryCacher : public SharkFunctionEntryCacher {
+ public:
+ SharkOSREntryCacher(SharkFunction* function,
+ llvm::Value* method,
+ llvm::Value* osr_buf)
+ : SharkFunctionEntryCacher(function, method),
+ _osr_buf(
+ builder()->CreateBitCast(
+ osr_buf,
+ llvm::PointerType::getUnqual(
+ llvm::ArrayType::get(
+ SharkType::intptr_type(),
+ max_locals() + max_monitors() * 2)))) {}
+
+ private:
+ llvm::Value* _osr_buf;
+
+ private:
+ llvm::Value* osr_buf() const
+ {
+ return _osr_buf;
+ }
+
+ // Callbacks
+ protected:
+ void process_monitor(int index, int box_offset, int obj_offset);
+ void process_local_slot(int index, SharkValue** value, int offset);
+
+ // Helper
+ private:
+ llvm::Value* CreateAddressOfOSRBufEntry(int offset, const llvm::Type* type);
+};
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -90,7 +90,6 @@ void SharkCompiler::compile_method(ciEnv
void SharkCompiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci)
{
assert(is_initialized(), "should be");
- assert(entry_bci == InvocationEntryBci, "OSR is not supported");
ResourceMark rm;
const char *name = methodname(target);
@@ -117,7 +116,11 @@ void SharkCompiler::compile_method(ciEnv
}
// Do the typeflow analysis
- ciTypeFlow *flow = target->get_flow_analysis();
+ ciTypeFlow *flow;
+ if (entry_bci == InvocationEntryBci)
+ flow = target->get_flow_analysis();
+ else
+ flow = target->get_osr_flow_analysis(entry_bci);
if (env->failing())
return;
if (SharkPrintTypeflowOf != NULL) {
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -33,7 +33,7 @@ class SharkCompiler : public AbstractCom
// Missing feature tests
bool supports_native() { return false; }
- bool supports_osr() { return false; }
+ bool supports_osr() { return true; }
// Customization
bool needs_adapters() { return false; }
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -32,7 +32,7 @@ void SharkFunction::initialize(const cha
{
// Create the function
_function = Function::Create(
- SharkType::entry_point_type(),
+ entry_point_type(),
GlobalVariable::InternalLinkage,
name);
@@ -40,6 +40,11 @@ void SharkFunction::initialize(const cha
Function::arg_iterator ai = function()->arg_begin();
Argument *method = ai++;
method->setName("method");
+ Argument *osr_buf = NULL;
+ if (is_osr()) {
+ osr_buf = ai++;
+ osr_buf->setName("osr_buf");
+ }
Argument *base_pc = ai++;
base_pc->setName("base_pc");
code_buffer()->set_base_pc(base_pc);
@@ -62,8 +67,8 @@ void SharkFunction::initialize(const cha
// Walk the tree from the start block to determine which
// blocks are entered and which blocks require phis
- SharkTopLevelBlock *start_block = block(0);
- assert(start_block->start() == 0, "blocks out of order");
+ SharkTopLevelBlock *start_block = block(flow()->start_block_num());
+ assert(start_block->start() == flow()->start_bci(), "blocks out of order");
start_block->enter();
// Initialize all entered blocks
@@ -84,17 +89,28 @@ void SharkFunction::initialize(const cha
SharkType::methodOop_type(),
"method_slot")));
- // Lock if necessary
- SharkState *entry_state = new SharkEntryState(start_block, method);
- if (is_synchronized()) {
- SharkTopLevelBlock *locker =
- new SharkTopLevelBlock(this, start_block->ciblock());
- locker->add_incoming(entry_state);
-
- set_block_insertion_point(start_block->entry_block());
- locker->acquire_method_lock();
-
- entry_state = locker->current_state();
+ // Create the entry state
+ SharkState *entry_state;
+ if (is_osr()) {
+ entry_state = new SharkOSREntryState(start_block, method, osr_buf);
+
+ // Free the OSR buffer
+ builder()->CreateCall(builder()->osr_migration_end(), osr_buf);
+ }
+ else {
+ entry_state = new SharkNormalEntryState(start_block, method);
+
+ // Lock if necessary
+ if (is_synchronized()) {
+ SharkTopLevelBlock *locker =
+ new SharkTopLevelBlock(this, start_block->ciblock());
+ locker->add_incoming(entry_state);
+
+ set_block_insertion_point(start_block->entry_block());
+ locker->acquire_method_lock();
+
+ entry_state = locker->current_state();
+ }
}
// Transition into the method proper
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkFunction.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Fri Aug 28 09:18:57 2009 -0400
@@ -71,6 +71,20 @@ class SharkFunction : public SharkTarget
GrowableArray<DeferredZeroCheck*>* deferred_zero_checks()
{
return &_deferred_zero_checks;
+ }
+
+ // On-stack replacement
+ private:
+ bool is_osr() const
+ {
+ return flow()->is_osr_flow();
+ }
+ const llvm::FunctionType* entry_point_type() const
+ {
+ if (is_osr())
+ return SharkType::osr_entry_point_type();
+ else
+ return SharkType::entry_point_type();
}
// Block management
diff -r ba0c7c6c4896 -r 188db4af2dc5 ports/hotspot/src/share/vm/shark/sharkState.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Fri Aug 28 11:01:49 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Fri Aug 28 09:18:57 2009 -0400
@@ -193,7 +193,8 @@ void SharkState::replace_all(SharkValue*
}
}
-SharkEntryState::SharkEntryState(SharkTopLevelBlock* block, Value* method)
+SharkNormalEntryState::SharkNormalEntryState(SharkTopLevelBlock* block,
+ Value* method)
: SharkState(block)
{
assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack");
@@ -232,7 +233,49 @@ SharkEntryState::SharkEntryState(SharkTo
}
set_local(i, value);
}
- SharkFunctionEntryCacher(block->function(), method).scan(this);
+ SharkNormalEntryCacher(block->function(), method).scan(this);
+}
+
+SharkOSREntryState::SharkOSREntryState(SharkTopLevelBlock* block,
+ Value* method,
+ Value* osr_buf)
More information about the distro-pkg-dev
mailing list