stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8173195: [BACKOUT] 8087341: C2 doesn't optimize redundant memory operations with G1

Browse Source 
Backing out 8087341 due to 8172850. Will be re-implemented with 8173196.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2017-01-25 07:03:26 +01:00
parent ac41b68c15
commit 0917fde85d
3 changed files with 647 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1160
hotspot/src/cpu/aarch64/vm/aarch64.ad
View File

File diff suppressed because it is too large Load Diff

18
hotspot/src/share/vm/opto/graphKit.cpp
View File

@ -3152,19 +3152,6 @@ Node* GraphKit::insert_mem_bar_volatile(int opcode, int alias_idx, Node* precede
return membar;
}
void GraphKit::insert_store_load_for_barrier() {
Node* mem = reset_memory();
MemBarNode* mb = MemBarNode::make(C, Op_MemBarVolatile, Compile::AliasIdxBot);
mb->init_req(TypeFunc::Control, control());
mb->init_req(TypeFunc::Memory, mem);
Node* membar = _gvn.transform(mb);
set_control(_gvn.transform(new ProjNode(membar, TypeFunc::Control)));
Node* newmem = _gvn.transform(new ProjNode(membar, TypeFunc::Memory));
set_all_memory(mem);
set_memory(newmem, Compile::AliasIdxRaw);
}
//------------------------------shared_lock------------------------------------
// Emit locking code.
FastLockNode* GraphKit::shared_lock(Node* obj) {
@ -3854,7 +3841,7 @@ void GraphKit::write_barrier_post(Node* oop_store,
BasicType bt = T_BYTE;
if (UseConcMarkSweepGC && UseCondCardMark) {
insert_store_load_for_barrier();
insert_mem_bar(Op_MemBarVolatile); // StoreLoad barrier
__ sync_kit(this);
}
@ -4294,7 +4281,8 @@ void GraphKit::g1_write_barrier_post(Node* oop_store,
__ if_then(card_val, BoolTest::ne, young_card); {
sync_kit(ideal);
insert_store_load_for_barrier();
// Use Op_MemBarVolatile to achieve the effect of a StoreLoad barrier.
insert_mem_bar(Op_MemBarVolatile, oop_store);
__ sync_kit(this);
Node* card_val_reload = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);

1
hotspot/src/share/vm/opto/graphKit.hpp
View File

@ -837,7 +837,6 @@ class GraphKit : public Phase {
int next_monitor();
Node* insert_mem_bar(int opcode, Node* precedent = NULL);
Node* insert_mem_bar_volatile(int opcode, int alias_idx, Node* precedent = NULL);
void insert_store_load_for_barrier();
// Optional 'precedent' is appended as an extra edge, to force ordering.
FastLockNode* shared_lock(Node* obj);
void shared_unlock(Node* box, Node* obj);