Skip to content

Commit 1604255

Browse files
robcaslozrobcasloz
committedOct 10, 2024
8341619: C2: remove unused StoreCM node
Reviewed-by: chagedorn, thartmann, kvn
1 parent e7c5bf4 commit 1604255

23 files changed

+12
-388
lines changed
 

‎src/hotspot/cpu/aarch64/aarch64.ad

-30
Original file line numberDiff line numberDiff line change
@@ -6892,36 +6892,6 @@ instruct loadConD(vRegD dst, immD con) %{
68926892

68936893
// Store Instructions
68946894

6895-
// Store CMS card-mark Immediate
6896-
instruct storeimmCM0(immI0 zero, memory1 mem)
6897-
%{
6898-
match(Set mem (StoreCM mem zero));
6899-
6900-
ins_cost(INSN_COST);
6901-
format %{ "storestore (elided)\n\t"
6902-
"strb zr, $mem\t# byte" %}
6903-
6904-
ins_encode(aarch64_enc_strb0(mem));
6905-
6906-
ins_pipe(istore_mem);
6907-
%}
6908-
6909-
// Store CMS card-mark Immediate with intervening StoreStore
6910-
// needed when using CMS with no conditional card marking
6911-
instruct storeimmCM0_ordered(immI0 zero, memory1 mem)
6912-
%{
6913-
match(Set mem (StoreCM mem zero));
6914-
6915-
ins_cost(INSN_COST * 2);
6916-
format %{ "storestore\n\t"
6917-
"dmb ishst"
6918-
"\n\tstrb zr, $mem\t# byte" %}
6919-
6920-
ins_encode(aarch64_enc_strb0_ordered(mem));
6921-
6922-
ins_pipe(istore_mem);
6923-
%}
6924-
69256895
// Store Byte
69266896
instruct storeB(iRegIorL2I src, memory1 mem)
69276897
%{

‎src/hotspot/cpu/arm/arm.ad

-12
Original file line numberDiff line numberDiff line change
@@ -4226,18 +4226,6 @@ instruct storeB(memoryB mem, store_RegI src) %{
42264226
ins_pipe(istore_mem_reg);
42274227
%}
42284228

4229-
instruct storeCM(memoryB mem, store_RegI src) %{
4230-
match(Set mem (StoreCM mem src));
4231-
ins_cost(MEMORY_REF_COST);
4232-
4233-
size(4);
4234-
format %{ "STRB $src,$mem\t! CMS card-mark byte" %}
4235-
ins_encode %{
4236-
__ strb($src$$Register, $mem$$Address);
4237-
%}
4238-
ins_pipe(istore_mem_reg);
4239-
%}
4240-
42414229
// Store Char/Short
42424230

42434231

‎src/hotspot/cpu/ppc/ppc.ad

-17
Original file line numberDiff line numberDiff line change
@@ -6482,23 +6482,6 @@ instruct storeD(memory mem, regD src) %{
64826482
ins_pipe(pipe_class_memory);
64836483
%}
64846484

6485-
//----------Store Instructions With Zeros--------------------------------------
6486-
6487-
instruct storeCM(memory mem, immI_0 zero) %{
6488-
match(Set mem (StoreCM mem zero));
6489-
ins_cost(MEMORY_REF_COST);
6490-
6491-
format %{ "STB #0, $mem \t// CMS card-mark byte store" %}
6492-
size(8);
6493-
ins_encode %{
6494-
__ li(R0, 0);
6495-
// No release barrier: Oops are allowed to get visible after marking.
6496-
guarantee($mem$$base$$Register != R1_SP, "use frame_slots_bias");
6497-
__ stb(R0, $mem$$disp, $mem$$base$$Register);
6498-
%}
6499-
ins_pipe(pipe_class_memory);
6500-
%}
6501-
65026485
// Convert oop pointer into compressed form.
65036486

65046487
// Nodes for postalloc expand.

‎src/hotspot/cpu/riscv/riscv.ad

-35
Original file line numberDiff line numberDiff line change
@@ -5039,41 +5039,6 @@ instruct loadConD0(fRegD dst, immD0 con) %{
50395039
ins_pipe(fp_load_constant_d);
50405040
%}
50415041

5042-
// Store Instructions
5043-
// Store CMS card-mark Immediate
5044-
instruct storeimmCM0(immI0 zero, memory mem)
5045-
%{
5046-
match(Set mem (StoreCM mem zero));
5047-
5048-
ins_cost(STORE_COST);
5049-
format %{ "storestore (elided)\n\t"
5050-
"sb zr, $mem\t# byte, #@storeimmCM0" %}
5051-
5052-
ins_encode %{
5053-
__ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
5054-
%}
5055-
5056-
ins_pipe(istore_mem);
5057-
%}
5058-
5059-
// Store CMS card-mark Immediate with intervening StoreStore
5060-
// needed when using CMS with no conditional card marking
5061-
instruct storeimmCM0_ordered(immI0 zero, memory mem)
5062-
%{
5063-
match(Set mem (StoreCM mem zero));
5064-
5065-
ins_cost(ALU_COST + STORE_COST);
5066-
format %{ "membar(StoreStore)\n\t"
5067-
"sb zr, $mem\t# byte, #@storeimmCM0_ordered" %}
5068-
5069-
ins_encode %{
5070-
__ membar(MacroAssembler::LoadStore | MacroAssembler::StoreStore);
5071-
__ sb(zr, Address(as_Register($mem$$base), $mem$$disp));
5072-
%}
5073-
5074-
ins_pipe(istore_mem);
5075-
%}
5076-
50775042
// Store Byte
50785043
instruct storeB(iRegIorL2I src, memory mem)
50795044
%{

‎src/hotspot/cpu/s390/s390.ad

-22
Original file line numberDiff line numberDiff line change
@@ -4226,28 +4226,6 @@ instruct storeB(memory mem, iRegI src) %{
42264226
ins_pipe(pipe_class_dummy);
42274227
%}
42284228

4229-
instruct storeCM(memory mem, immI_0 src) %{
4230-
match(Set mem (StoreCM mem src));
4231-
ins_cost(MEMORY_REF_COST);
4232-
// TODO: s390 port size(VARIABLE_SIZE);
4233-
format %{ "STC(Y) $src,$mem\t # CMS card-mark byte (must be 0!)" %}
4234-
ins_encode %{
4235-
guarantee($mem$$index$$Register != Z_R0, "content will not be used.");
4236-
if ($mem$$index$$Register != noreg) {
4237-
// Can't use clear_mem --> load const zero and store character.
4238-
__ load_const_optimized(Z_R0_scratch, (long)0);
4239-
if (Immediate::is_uimm12($mem$$disp)) {
4240-
__ z_stc(Z_R0_scratch, $mem$$Address);
4241-
} else {
4242-
__ z_stcy(Z_R0_scratch, $mem$$Address);
4243-
}
4244-
} else {
4245-
__ clear_mem(Address($mem$$Address), 1);
4246-
}
4247-
%}
4248-
ins_pipe(pipe_class_dummy);
4249-
%}
4250-
42514229
// CHAR/SHORT
42524230

42534231
// Store Char/Short

‎src/hotspot/cpu/x86/x86_32.ad

-11
Original file line numberDiff line numberDiff line change
@@ -6322,17 +6322,6 @@ instruct storeImmB(memory mem, immI8 src) %{
63226322
ins_pipe( ialu_mem_imm );
63236323
%}
63246324

6325-
// Store CMS card-mark Immediate
6326-
instruct storeImmCM(memory mem, immI8 src) %{
6327-
match(Set mem (StoreCM mem src));
6328-
6329-
ins_cost(150);
6330-
format %{ "MOV8 $mem,$src\t! CMS card-mark imm0" %}
6331-
opcode(0xC6); /* C6 /0 */
6332-
ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con8or32(src), ClearInstMark);
6333-
ins_pipe( ialu_mem_imm );
6334-
%}
6335-
63366325
// Store Double
63376326
instruct storeDPR( memory mem, regDPR1 src) %{
63386327
predicate(UseSSE<=1);

‎src/hotspot/cpu/x86/x86_64.ad

-26
Original file line numberDiff line numberDiff line change
@@ -5298,32 +5298,6 @@ instruct storeImmB(memory mem, immI8 src)
52985298
ins_pipe(ialu_mem_imm);
52995299
%}
53005300

5301-
// Store CMS card-mark Immediate
5302-
instruct storeImmCM0_reg(memory mem, immI_0 zero)
5303-
%{
5304-
predicate(UseCompressedOops && (CompressedOops::base() == nullptr));
5305-
match(Set mem (StoreCM mem zero));
5306-
5307-
ins_cost(125); // XXX
5308-
format %{ "movb $mem, R12\t# CMS card-mark byte 0 (R12_heapbase==0)" %}
5309-
ins_encode %{
5310-
__ movb($mem$$Address, r12);
5311-
%}
5312-
ins_pipe(ialu_mem_reg);
5313-
%}
5314-
5315-
instruct storeImmCM0(memory mem, immI_0 src)
5316-
%{
5317-
match(Set mem (StoreCM mem src));
5318-
5319-
ins_cost(150); // XXX
5320-
format %{ "movb $mem, $src\t# CMS card-mark byte 0" %}
5321-
ins_encode %{
5322-
__ movb($mem$$Address, $src$$constant);
5323-
%}
5324-
ins_pipe(ialu_mem_imm);
5325-
%}
5326-
53275301
// Store Float
53285302
instruct storeF(memory mem, regF src)
53295303
%{

‎src/hotspot/share/adlc/forms.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ Form::DataType Form::is_load_from_memory(const char *opType) const {
276276

277277
Form::DataType Form::is_store_to_memory(const char *opType) const {
278278
if( strcmp(opType,"StoreB")==0) return Form::idealB;
279-
if( strcmp(opType,"StoreCM")==0) return Form::idealB;
280279
if( strcmp(opType,"StoreC")==0) return Form::idealC;
281280
if( strcmp(opType,"StoreD")==0) return Form::idealD;
282281
if( strcmp(opType,"StoreF")==0) return Form::idealF;

‎src/hotspot/share/adlc/formssel.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -3654,7 +3654,6 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const {
36543654
#if INCLUDE_SHENANDOAHGC
36553655
"ShenandoahCompareAndSwapN", "ShenandoahCompareAndSwapP", "ShenandoahWeakCompareAndSwapP", "ShenandoahWeakCompareAndSwapN", "ShenandoahCompareAndExchangeP", "ShenandoahCompareAndExchangeN",
36563656
#endif
3657-
"StoreCM",
36583657
"GetAndSetB", "GetAndSetS", "GetAndAddI", "GetAndSetI", "GetAndSetP",
36593658
"GetAndAddB", "GetAndAddS", "GetAndAddL", "GetAndSetL", "GetAndSetN",
36603659
"ClearArray"

‎src/hotspot/share/opto/classes.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ macro(Start)
341341
macro(StartOSR)
342342
macro(StoreB)
343343
macro(StoreC)
344-
macro(StoreCM)
345344
macro(StoreD)
346345
macro(StoreF)
347346
macro(StoreI)

‎src/hotspot/share/opto/compile.cpp

-58
Original file line numberDiff line numberDiff line change
@@ -3061,52 +3061,6 @@ struct Final_Reshape_Counts : public StackObj {
30613061
int get_inner_loop_count() const { return _inner_loop_count; }
30623062
};
30633063

3064-
// Eliminate trivially redundant StoreCMs and accumulate their
3065-
// precedence edges.
3066-
void Compile::eliminate_redundant_card_marks(Node* n) {
3067-
assert(n->Opcode() == Op_StoreCM, "expected StoreCM");
3068-
if (n->in(MemNode::Address)->outcnt() > 1) {
3069-
// There are multiple users of the same address so it might be
3070-
// possible to eliminate some of the StoreCMs
3071-
Node* mem = n->in(MemNode::Memory);
3072-
Node* adr = n->in(MemNode::Address);
3073-
Node* val = n->in(MemNode::ValueIn);
3074-
Node* prev = n;
3075-
bool done = false;
3076-
// Walk the chain of StoreCMs eliminating ones that match. As
3077-
// long as it's a chain of single users then the optimization is
3078-
// safe. Eliminating partially redundant StoreCMs would require
3079-
// cloning copies down the other paths.
3080-
while (mem->Opcode() == Op_StoreCM && mem->outcnt() == 1 && !done) {
3081-
if (adr == mem->in(MemNode::Address) &&
3082-
val == mem->in(MemNode::ValueIn)) {
3083-
// redundant StoreCM
3084-
if (mem->req() > MemNode::OopStore) {
3085-
// Hasn't been processed by this code yet.
3086-
n->add_prec(mem->in(MemNode::OopStore));
3087-
} else {
3088-
// Already converted to precedence edge
3089-
for (uint i = mem->req(); i < mem->len(); i++) {
3090-
// Accumulate any precedence edges
3091-
if (mem->in(i) != nullptr) {
3092-
n->add_prec(mem->in(i));
3093-
}
3094-
}
3095-
// Everything above this point has been processed.
3096-
done = true;
3097-
}
3098-
// Eliminate the previous StoreCM
3099-
prev->set_req(MemNode::Memory, mem->in(MemNode::Memory));
3100-
assert(mem->outcnt() == 0, "should be dead");
3101-
mem->disconnect_inputs(this);
3102-
} else {
3103-
prev = mem;
3104-
}
3105-
mem = prev->in(MemNode::Memory);
3106-
}
3107-
}
3108-
}
3109-
31103064
//------------------------------final_graph_reshaping_impl----------------------
31113065
// Implement items 1-5 from final_graph_reshaping below.
31123066
void Compile::final_graph_reshaping_impl(Node *n, Final_Reshape_Counts& frc, Unique_Node_List& dead_nodes) {
@@ -3276,18 +3230,6 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
32763230
}
32773231
break;
32783232
}
3279-
3280-
case Op_StoreCM:
3281-
{
3282-
// Convert OopStore dependence into precedence edge
3283-
Node* prec = n->in(MemNode::OopStore);
3284-
n->del_req(MemNode::OopStore);
3285-
n->add_prec(prec);
3286-
eliminate_redundant_card_marks(n);
3287-
}
3288-
3289-
// fall through
3290-
32913233
case Op_StoreB:
32923234
case Op_StoreC:
32933235
case Op_StoreI:

‎src/hotspot/share/opto/compile.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,6 @@ class Compile : public Phase {
12441244
void final_graph_reshaping_impl(Node *n, Final_Reshape_Counts& frc, Unique_Node_List& dead_nodes);
12451245
void final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& frc, uint nop, Unique_Node_List& dead_nodes);
12461246
void final_graph_reshaping_walk(Node_Stack& nstack, Node* root, Final_Reshape_Counts& frc, Unique_Node_List& dead_nodes);
1247-
void eliminate_redundant_card_marks(Node* n);
12481247
void handle_div_mod_op(Node* n, BasicType bt, bool is_unsigned);
12491248

12501249
// Logic cone optimization.

‎src/hotspot/share/opto/escape.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -4009,10 +4009,6 @@ void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phi
40094009
--i;
40104010
#ifdef ASSERT
40114011
} else if (use->is_Mem()) {
4012-
if (use->Opcode() == Op_StoreCM && use->in(MemNode::OopStore) == n) {
4013-
// Don't move related cardmark.
4014-
continue;
4015-
}
40164012
// Memory nodes should have new memory input.
40174013
tp = igvn->type(use->in(MemNode::Address))->isa_ptr();
40184014
assert(tp != nullptr, "ptr type");
@@ -4564,7 +4560,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
45644560
// They overwrite memory edge corresponding to destination array,
45654561
memnode_worklist.append_if_missing(use);
45664562
} else if (!(op == Op_CmpP || op == Op_Conv2B ||
4567-
op == Op_CastP2X || op == Op_StoreCM ||
4563+
op == Op_CastP2X ||
45684564
op == Op_FastLock || op == Op_AryEq ||
45694565
op == Op_StrComp || op == Op_CountPositives ||
45704566
op == Op_StrCompressedCopy || op == Op_StrInflatedCopy ||
@@ -4703,9 +4699,6 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
47034699
if (use->is_Phi() || use->is_ClearArray()) {
47044700
memnode_worklist.append_if_missing(use);
47054701
} else if (use->is_Mem() && use->in(MemNode::Memory) == n) {
4706-
if (use->Opcode() == Op_StoreCM) { // Ignore cardmark stores
4707-
continue;
4708-
}
47094702
memnode_worklist.append_if_missing(use);
47104703
} else if (use->is_MemBar() || use->is_CallLeaf()) {
47114704
if (use->in(TypeFunc::Memory) == n) { // Ignore precedent edge

‎src/hotspot/share/opto/gcm.cpp

+6-12
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,13 @@ void PhaseCFG::schedule_pinned_nodes(VectorSet &visited) {
216216
for (uint i = node->len()-1; i >= node->req(); i--) {
217217
Node* m = node->in(i);
218218
if (m == nullptr) continue;
219-
220-
// Only process precedence edges that are CFG nodes. Safepoints and control projections can be in the middle of a block
221-
if (is_CFG(m)) {
222-
node->rm_prec(i);
223-
if (n == nullptr) {
224-
n = m;
225-
} else {
226-
assert(is_dominator(n, m) || is_dominator(m, n), "one must dominate the other");
227-
n = is_dominator(n, m) ? m : n;
228-
}
219+
assert(is_CFG(m), "must be a CFG node");
220+
node->rm_prec(i);
221+
if (n == nullptr) {
222+
n = m;
229223
} else {
230-
assert(node->is_Mach(), "sanity");
231-
assert(node->as_Mach()->ideal_Opcode() == Op_StoreCM, "must be StoreCM node");
224+
assert(is_dominator(n, m) || is_dominator(m, n), "one must dominate the other");
225+
n = is_dominator(n, m) ? m : n;
232226
}
233227
}
234228
if (n != nullptr) {

‎src/hotspot/share/opto/idealKit.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -381,26 +381,6 @@ Node* IdealKit::store(Node* ctl, Node* adr, Node *val, BasicType bt,
381381
return st;
382382
}
383383

384-
// Card mark store. Must be ordered so that it will come after the store of
385-
// the oop.
386-
Node* IdealKit::storeCM(Node* ctl, Node* adr, Node *val, Node* oop_store, int oop_adr_idx,
387-
BasicType bt,
388-
int adr_idx) {
389-
assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
390-
const TypePtr* adr_type = nullptr;
391-
debug_only(adr_type = C->get_adr_type(adr_idx));
392-
Node *mem = memory(adr_idx);
393-
394-
// Add required edge to oop_store, optimizer does not support precedence edges.
395-
// Convert required edge to precedence edge before allocation.
396-
Node* st = new StoreCMNode(ctl, mem, adr, adr_type, val, oop_store, oop_adr_idx);
397-
398-
st = transform(st);
399-
set_memory(st, adr_idx);
400-
401-
return st;
402-
}
403-
404384
//---------------------------- do_memory_merge --------------------------------
405385
// The memory from one merging cvstate needs to be merged with the memory for another
406386
// join cvstate. If the join cvstate doesn't have a merged memory yet then we

0 commit comments

Comments
 (0)
Please sign in to comment.