Skip to content

Commit cbb54de

Browse files
robcaslozpull[bot]
robcasloz
authored and
pull[bot]
committed
8341619: C2: remove unused StoreCM node
Reviewed-by: chagedorn, thartmann, kvn
1 parent acb0ff7 commit cbb54de

File tree

23 files changed

+12
-388
lines changed

23 files changed

+12
-388
lines changed

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

Lines changed: 0 additions & 30 deletions
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‎

Lines changed: 0 additions & 12 deletions
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‎

Lines changed: 0 additions & 17 deletions
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‎

Lines changed: 0 additions & 35 deletions
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‎

Lines changed: 0 additions & 22 deletions
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‎

Lines changed: 0 additions & 11 deletions
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‎

Lines changed: 0 additions & 26 deletions
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‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 0 additions & 1 deletion
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)

0 commit comments

Comments
 (0)