changeset in /hg/icedtea: Shark merge.
Andrew John Hughes
ahughes at redhat.com
Wed May 20 11:26:41 PDT 2009
changeset 550ad0a98afb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=550ad0a98afb
description:
Shark merge.
2009-03-23 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp:
(SharkFunction::_deferred_zero_checks): New field.
(SharkFunction::deferred_zero_checks): New method.
(SharkFunction::add_deferred_zero_check): Likewise.
(SharkFunction::do_deferred_zero_checks): Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp:
(SharkFunction::DeferredZeroCheck): New class.
(SharkFunction::add_deferred_zero_check): New method.
(SharkFunction::do_deferred_zero_checks): Likewise.
(SharkFunction::initialize): Do deferred zero checks
after parsing blocks.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
(SharkBlock::zero_check_value): New method.
(SharkBlock::do_deferred_zero_check): Likewise.
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
(SharkBlock::do_zero_check): Defer ambiguous zero checks.
(SharkBlock::zero_check_value): New method.
(SharkBlock::do_deferred_zero_check): Likewise.
(SharkTopLevelBlock::handle_exception): Don't copy state.
(SharkTopLevelBlock::do_if): Likewise.
(SharkTopLevelBlock::do_switch): Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp
(SharkPHIValue): New class.
(SharkValue::is_phi): New method.
(SharkValue::as_phi): Likewise.
(SharkValue::create_phi): Likewise.
(SharkValue::merge): Likewise.
(SharkNormalValue::merge): Likewise.
(SharkAddressValue::merge): Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.cpp
(SharkPHIState::SharkPHIState): Create SharkPHIValues.
(SharkState::merge): Defer to SharkValue::merge.
diffstat:
8 files changed, 400 insertions(+), 117 deletions(-)
ChangeLog | 38 +++
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 78 ++++++
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 37 ++-
ports/hotspot/src/share/vm/shark/sharkState.cpp | 57 +---
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 57 +++-
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 12 -
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 65 +++++
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 173 +++++++++++----
diffs (truncated from 756 to 500 lines):
diff -r 8cf23c220172 -r 550ad0a98afb ChangeLog
--- a/ChangeLog Tue May 19 02:32:56 2009 +0100
+++ b/ChangeLog Tue May 19 15:55:38 2009 +0100
@@ -1,3 +1,41 @@ 2009-05-19 Andrew John Hughes <ahughes
+2009-03-23 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp:
+ (SharkFunction::_deferred_zero_checks): New field.
+ (SharkFunction::deferred_zero_checks): New method.
+ (SharkFunction::add_deferred_zero_check): Likewise.
+ (SharkFunction::do_deferred_zero_checks): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp:
+ (SharkFunction::DeferredZeroCheck): New class.
+ (SharkFunction::add_deferred_zero_check): New method.
+ (SharkFunction::do_deferred_zero_checks): Likewise.
+ (SharkFunction::initialize): Do deferred zero checks
+ after parsing blocks.
+
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+ (SharkBlock::zero_check_value): New method.
+ (SharkBlock::do_deferred_zero_check): Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+ (SharkBlock::do_zero_check): Defer ambiguous zero checks.
+ (SharkBlock::zero_check_value): New method.
+ (SharkBlock::do_deferred_zero_check): Likewise.
+ (SharkTopLevelBlock::handle_exception): Don't copy state.
+ (SharkTopLevelBlock::do_if): Likewise.
+ (SharkTopLevelBlock::do_switch): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp
+ (SharkPHIValue): New class.
+ (SharkValue::is_phi): New method.
+ (SharkValue::as_phi): Likewise.
+ (SharkValue::create_phi): Likewise.
+ (SharkValue::merge): Likewise.
+ (SharkNormalValue::merge): Likewise.
+ (SharkAddressValue::merge): Likewise.
+
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp
+ (SharkPHIState::SharkPHIState): Create SharkPHIValues.
+ (SharkState::merge): Defer to SharkValue::merge.
+
2009-05-19 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp Tue May 19 15:55:38 2009 +0100
@@ -123,6 +123,7 @@ void SharkFunction::initialize()
block(i)->emit_IR();
}
+ do_deferred_zero_checks();
// Dump the bitcode, if requested
if (SharkPrintBitcodeOf != NULL) {
@@ -307,3 +308,80 @@ SharkMonitor* SharkFunction::monitor(Val
this,
builder()->CreateGEP(monitors_slots(), indexes, indexes + 2));
}
+
+class DeferredZeroCheck : public ResourceObj {
+ public:
+ DeferredZeroCheck(SharkTopLevelBlock* block, SharkValue* value)
+ : _block(block),
+ _value(value),
+ _bci(block->bci()),
+ _state(block->current_state()->copy()),
+ _check_block(builder()->GetInsertBlock()),
+ _continue_block(function()->CreateBlock("not_zero"))
+ {
+ builder()->SetInsertPoint(continue_block());
+ }
+
+ private:
+ SharkTopLevelBlock* _block;
+ SharkValue* _value;
+ int _bci;
+ SharkState* _state;
+ BasicBlock* _check_block;
+ BasicBlock* _continue_block;
+
+ public:
+ SharkTopLevelBlock* block() const
+ {
+ return _block;
+ }
+ SharkValue* value() const
+ {
+ return _value;
+ }
+ int bci() const
+ {
+ return _bci;
+ }
+ SharkState* state() const
+ {
+ return _state;
+ }
+ BasicBlock* check_block() const
+ {
+ return _check_block;
+ }
+ BasicBlock* continue_block() const
+ {
+ return _continue_block;
+ }
+
+ public:
+ SharkBuilder* builder() const
+ {
+ return block()->builder();
+ }
+ SharkFunction* function() const
+ {
+ return block()->function();
+ }
+
+ public:
+ void process() const
+ {
+ builder()->SetInsertPoint(check_block());
+ block()->do_deferred_zero_check(value(), bci(), state(), continue_block());
+ }
+};
+
+void SharkFunction::add_deferred_zero_check(SharkTopLevelBlock* block,
+ SharkValue* value)
+{
+ deferred_zero_checks()->append(new DeferredZeroCheck(block, value));
+}
+
+void SharkFunction::do_deferred_zero_checks()
+{
+ for (int i = 0; i < deferred_zero_checks()->length(); i++)
+ deferred_zero_checks()->at(i)->process();
+}
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkFunction.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp Tue May 19 15:55:38 2009 +0100
@@ -23,8 +23,10 @@
*
*/
+class SharkMonitor;
class SharkTopLevelBlock;
-class SharkMonitor;
+
+class DeferredZeroCheck;
class SharkFunction : public StackObj {
public:
@@ -44,16 +46,17 @@ class SharkFunction : public StackObj {
void initialize();
private:
- SharkCompiler* _compiler;
- const char* _name;
- ciTypeFlow* _flow;
- ciBytecodeStream* _iter;
- MacroAssembler* _masm;
- llvm::Function* _function;
- SharkTopLevelBlock** _blocks;
- llvm::Value* _base_pc;
- llvm::Value* _thread;
- int _monitor_count;
+ SharkCompiler* _compiler;
+ const char* _name;
+ ciTypeFlow* _flow;
+ ciBytecodeStream* _iter;
+ MacroAssembler* _masm;
+ llvm::Function* _function;
+ SharkTopLevelBlock** _blocks;
+ llvm::Value* _base_pc;
+ llvm::Value* _thread;
+ int _monitor_count;
+ GrowableArray<DeferredZeroCheck*> _deferred_zero_checks;
public:
SharkCompiler* compiler() const
@@ -95,6 +98,10 @@ class SharkFunction : public StackObj {
int monitor_count() const
{
return _monitor_count;
+ }
+ GrowableArray<DeferredZeroCheck*>* deferred_zero_checks()
+ {
+ return &_deferred_zero_checks;
}
public:
@@ -333,4 +340,12 @@ class SharkFunction : public StackObj {
builder()->CreateStore(LLVMValue::null(), addr);
return result;
}
+
+ // Deferred zero checks
+ public:
+ void add_deferred_zero_check(SharkTopLevelBlock* block,
+ SharkValue* value);
+
+ private:
+ void do_deferred_zero_checks();
};
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkState.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp Tue May 19 15:55:38 2009 +0100
@@ -130,14 +130,11 @@ void SharkState::merge(SharkState* other
BasicBlock* other_block,
BasicBlock* this_block)
{
- PHINode *phi;
- char name[18];
-
// Method
Value *this_method = this->method();
Value *other_method = other->method();
if (this_method != other_method) {
- phi = builder()->CreatePHI(SharkType::methodOop_type(), "method");
+ PHINode *phi = builder()->CreatePHI(SharkType::methodOop_type(), "method");
phi->addIncoming(this_method, this_block);
phi->addIncoming(other_method, other_block);
set_method(phi);
@@ -149,20 +146,12 @@ void SharkState::merge(SharkState* other
SharkValue *this_value = this->local(i);
SharkValue *other_value = other->local(i);
assert((this_value == NULL) == (other_value == NULL), "should be");
- if (this_value == other_value)
- continue;
-
- ciType *this_type = this_value->type();
- assert(this_type == other_value->type(), "should be");
-
- bool this_checked = this_value->zero_checked();
- assert(this_checked == other_value->zero_checked(), "should be");
-
- snprintf(name, sizeof(name), "local_%d_", i);
- phi = builder()->CreatePHI(SharkType::to_stackType(this_type), name);
- phi->addIncoming(this_value->generic_value(), this_block);
- phi->addIncoming(other_value->generic_value(), other_block);
- set_local(i, SharkValue::create_generic(this_type, phi, this_checked));
+ if (this_value != NULL) {
+ char name[18];
+ snprintf(name, sizeof(name), "local_%d_", i);
+ set_local(i, this_value->merge(
+ builder(), other_value, other_block, this_block, name));
+ }
}
// Expression stack
@@ -171,20 +160,12 @@ void SharkState::merge(SharkState* other
SharkValue *this_value = this->stack(i);
SharkValue *other_value = other->stack(i);
assert((this_value == NULL) == (other_value == NULL), "should be");
- if (this_value == other_value)
- continue;
-
- ciType *this_type = this_value->type();
- assert(this_type == other_value->type(), "should be");
-
- bool this_checked = this_value->zero_checked();
- assert(this_checked == other_value->zero_checked(), "should be");
-
- snprintf(name, sizeof(name), "stack_%d_", i);
- phi = builder()->CreatePHI(SharkType::to_stackType(this_type), name);
- phi->addIncoming(this_value->generic_value(), this_block);
- phi->addIncoming(other_value->generic_value(), other_block);
- set_stack(i, SharkValue::create_generic(this_type, phi, this_checked));
+ if (this_value != NULL) {
+ char name[18];
+ snprintf(name, sizeof(name), "stack_%d_", i);
+ set_stack(i, this_value->merge(
+ builder(), other_value, other_block, this_block, name));
+ }
}
}
@@ -315,10 +296,8 @@ SharkPHIState::SharkPHIState(SharkTopLev
case T_OBJECT:
case T_ARRAY:
snprintf(name, sizeof(name), "local_%d_", i);
- value = SharkValue::create_generic(
- type,
- builder()->CreatePHI(SharkType::to_stackType(type), name),
- false);
+ value = SharkValue::create_phi(
+ type, builder()->CreatePHI(SharkType::to_stackType(type), name));
break;
case T_ADDRESS:
@@ -355,10 +334,8 @@ SharkPHIState::SharkPHIState(SharkTopLev
case T_OBJECT:
case T_ARRAY:
snprintf(name, sizeof(name), "stack_%d_", i);
- value = SharkValue::create_generic(
- type,
- builder()->CreatePHI(SharkType::to_stackType(type), name),
- false);
+ value = SharkValue::create_phi(
+ type, builder()->CreatePHI(SharkType::to_stackType(type), name));
break;
case T_ADDRESS:
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp Tue May 19 15:55:38 2009 +0100
@@ -250,8 +250,40 @@ SharkTopLevelBlock* SharkTopLevelBlock::
void SharkTopLevelBlock::do_zero_check(SharkValue *value)
{
- BasicBlock *zero = function()->CreateBlock("zero");
- BasicBlock *not_zero = function()->CreateBlock("not_zero");
+ if (value->is_phi() && value->as_phi()->all_incomers_zero_checked()) {
+ function()->add_deferred_zero_check(this, value);
+ }
+ else {
+ BasicBlock *continue_block = function()->CreateBlock("not_zero");
+ SharkState *saved_state = current_state();
+ set_current_state(saved_state->copy());
+ zero_check_value(value, continue_block);
+ builder()->SetInsertPoint(continue_block);
+ set_current_state(saved_state);
+ }
+
+ value->set_zero_checked(true);
+}
+
+void SharkTopLevelBlock::do_deferred_zero_check(SharkValue* value,
+ int bci,
+ SharkState* saved_state,
+ BasicBlock* continue_block)
+{
+ if (value->as_phi()->all_incomers_zero_checked()) {
+ builder()->CreateBr(continue_block);
+ }
+ else {
+ iter()->force_bci(start());
+ set_current_state(saved_state);
+ zero_check_value(value, continue_block);
+ }
+}
+
+void SharkTopLevelBlock::zero_check_value(SharkValue* value,
+ BasicBlock* continue_block)
+{
+ BasicBlock *zero_block = builder()->CreateBlock(continue_block, "zero");
Value *a, *b;
switch (value->basic_type()) {
@@ -276,10 +308,10 @@ void SharkTopLevelBlock::do_zero_check(S
ShouldNotReachHere();
}
- builder()->CreateCondBr(builder()->CreateICmpNE(a, b), not_zero, zero);
-
- builder()->SetInsertPoint(zero);
- SharkState *saved_state = current_state()->copy();
+ builder()->CreateCondBr(
+ builder()->CreateICmpNE(a, b), continue_block, zero_block);
+
+ builder()->SetInsertPoint(zero_block);
if (value->is_jobject()) {
call_vm_nocheck(
SharkRuntime::throw_NullPointerException(),
@@ -290,11 +322,6 @@ void SharkTopLevelBlock::do_zero_check(S
builder()->CreateUnimplemented(__FILE__, __LINE__);
}
handle_exception(function()->CreateGetPendingException());
- set_current_state(saved_state);
-
- builder()->SetInsertPoint(not_zero);
-
- value->set_zero_checked(true);
}
void SharkTopLevelBlock::check_bounds(SharkValue* array, SharkValue* index)
@@ -402,7 +429,7 @@ void SharkTopLevelBlock::handle_exceptio
LLVMValue::jint_constant(i),
handler->entry_block());
- handler->add_incoming(current_state()->copy());
+ handler->add_incoming(current_state());
}
builder()->SetInsertPoint(no_handler);
@@ -776,8 +803,6 @@ void SharkTopLevelBlock::do_ret()
// All propagation of state from one block to the next (via
// dest->add_incoming) is handled by the next three methods
// (do_branch, do_if and do_switch) and by handle_exception.
-// Where control flow forks, each successor must have its
-// own copy of the state.
void SharkTopLevelBlock::do_branch(int successor_index)
{
@@ -808,7 +833,7 @@ void SharkTopLevelBlock::do_if(ICmpInst:
if_taken->entry_block(), not_taken->entry_block());
if_taken->add_incoming(current_state());
- not_taken->add_incoming(current_state()->copy());
+ not_taken->add_incoming(current_state());
}
void SharkTopLevelBlock::do_switch()
@@ -827,7 +852,7 @@ void SharkTopLevelBlock::do_switch()
switchinst->addCase(
LLVMValue::jint_constant(switch_key(i)),
dest_block->entry_block());
- dest_block->add_incoming(current_state()->copy());
+ dest_block->add_incoming(current_state());
}
}
}
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp Tue May 19 15:55:38 2009 +0100
@@ -185,10 +185,20 @@ class SharkTopLevelBlock : public SharkB
// Helpers
private:
- void do_zero_check(SharkValue* value);
llvm::Value* lookup_for_ldc();
llvm::Value* lookup_for_field_access();
void do_branch(int successor_index);
+
+ // Zero checks
+ private:
+ void do_zero_check(SharkValue* value);
+ void zero_check_value(SharkValue* value, llvm::BasicBlock* continue_block);
+
+ public:
+ void do_deferred_zero_check(SharkValue* value,
+ int bci,
+ SharkState* saved_state,
+ llvm::BasicBlock* continue_block);
// VM calls
private:
diff -r 8cf23c220172 -r 550ad0a98afb ports/hotspot/src/share/vm/shark/sharkValue.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp Tue May 19 02:32:56 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp Tue May 19 15:55:38 2009 +0100
@@ -34,9 +34,32 @@ SharkValue* SharkNormalValue::clone() co
{
return SharkValue::create_generic(type(), generic_value(), zero_checked());
}
+SharkValue* SharkPHIValue::clone() const
+{
+ return SharkValue::create_phi(type(), (PHINode *) generic_value(), this);
+}
SharkValue* SharkAddressValue::clone() const
{
return SharkValue::address_constant(address_value());
+}
+
+// Casting
+
+bool SharkValue::is_phi() const
+{
+ return false;
+}
+bool SharkPHIValue::is_phi() const
+{
+ return true;
+}
+SharkPHIValue* SharkValue::as_phi()
+{
+ ShouldNotCallThis();
+}
+SharkPHIValue* SharkPHIValue::as_phi()
+{
+ return this;
}
// Comparison
@@ -225,19 +248,51 @@ Value* SharkNormalValue::intptr_value(Sh
return builder->CreatePtrToInt(jobject_value(), SharkType::intptr_type());
}
-// Phi-style stuff
-
-void SharkNormalValue::addIncoming(SharkValue *value, BasicBlock* block)
-{
- assert(llvm::isa<llvm::PHINode>(generic_value()), "should be");
+// Phi-style stuff for SharkPHIState::add_incoming
+
+void SharkValue::addIncoming(SharkValue *value, BasicBlock* block)
+{
+ ShouldNotCallThis();
+}
+void SharkPHIValue::addIncoming(SharkValue *value, BasicBlock* block)
+{
+ assert(!is_clone(), "shouldn't be");
((llvm::PHINode *) generic_value())->addIncoming(
value->generic_value(), block);
+ if (!value->zero_checked())
+ _all_incomers_zero_checked = false;
}
void SharkAddressValue::addIncoming(SharkValue *value, BasicBlock* block)
{
assert(this->equal_to(value), "should be");
}
More information about the distro-pkg-dev
mailing list