From f7c9fef9147ee3c6168469ec04d2946a34505d63 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 24 Sep 2025 13:37:16 +0000 Subject: [PATCH] 8352069: Renamings after JEP 522: G1 GC: Improve Throughput by Reducing Synchronization Reviewed-by: iwalulya, ayang --- .../gc/g1/g1BarrierSetAssembler_aarch64.cpp | 22 ++++++++-------- .../arm/gc/g1/g1BarrierSetAssembler_arm.cpp | 22 ++++++++-------- .../ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp | 22 ++++++++-------- .../gc/g1/g1BarrierSetAssembler_riscv.cpp | 22 ++++++++-------- .../s390/gc/g1/g1BarrierSetAssembler_s390.cpp | 26 +++++++++---------- .../x86/gc/g1/g1BarrierSetAssembler_x86.cpp | 18 ++++++------- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp index 9950feb7470..974527f30e9 100644 --- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp @@ -232,14 +232,14 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register thread, - const Register tmp1, - const Register tmp2, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register thread, + const Register tmp1, + const Register tmp2, + Label& done, + bool new_val_may_be_null) { assert(thread == rthread, "must be"); assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg, rscratch1); @@ -273,7 +273,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, false /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, false /* new_val_may_be_null */); __ bind(done); } @@ -335,7 +335,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, Register tmp2, bool new_val_may_be_null) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); __ bind(done); } @@ -441,7 +441,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); masm->bind(done); } diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp index 71f8931eb5f..74a9f273a43 100644 --- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp @@ -198,14 +198,14 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, __ bind(done); } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register thread, - const Register tmp1, - const Register tmp2, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register thread, + const Register tmp1, + const Register tmp2, + Label& done, + bool new_val_may_be_null) { assert(thread == Rthread, "must be"); assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg); @@ -245,7 +245,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Register tmp2, Register tmp3) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, Rthread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, Rthread, tmp1, tmp2, done, true /* new_val_may_be_null */); __ bind(done); } @@ -307,7 +307,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, Register tmp3, bool new_val_may_be_null) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); __ bind(done); } @@ -408,7 +408,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); masm->bind(done); } diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp index 262bb1eae89..65bfd683abd 100644 --- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp +++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp @@ -229,14 +229,14 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, Decorator __ bind(filtered); } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register thread, - const Register tmp1, - const Register tmp2, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register thread, + const Register tmp1, + const Register tmp2, + Label& done, + bool new_val_may_be_null) { assert_different_registers(store_addr, new_val, tmp1, R0); assert_different_registers(store_addr, tmp1, tmp2, R0); @@ -273,7 +273,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato bool not_null = (decorators & IS_NOT_NULL) != 0; Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, R16_thread, tmp1, tmp2, done, !not_null); + generate_post_barrier(masm, store_addr, new_val, R16_thread, tmp1, tmp2, done, !not_null); __ bind(done); } @@ -450,7 +450,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, new_val_decoded = __ decode_heap_oop_not_null(tmp2, new_val); } - generate_post_barrier_fast_path(masm, store_addr, new_val_decoded, R16_thread, tmp1, tmp2, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val_decoded, R16_thread, tmp1, tmp2, done, new_val_may_be_null); __ bind(done); } @@ -498,7 +498,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); masm->bind(done); } diff --git a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp index 9c3bd93f8a6..64e9cbe1f47 100644 --- a/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp +++ b/src/hotspot/cpu/riscv/gc/g1/g1BarrierSetAssembler_riscv.cpp @@ -228,14 +228,14 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register thread, - const Register tmp1, - const Register tmp2, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register thread, + const Register tmp1, + const Register tmp2, + Label& done, + bool new_val_may_be_null) { assert(thread == xthread, "must be"); assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg); // Does store cross heap regions? @@ -271,7 +271,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); __ bind(done); } @@ -333,7 +333,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, Register tmp2, bool new_val_may_be_null) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); __ bind(done); } @@ -438,7 +438,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); masm->bind(done); } diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp index 3e176309c27..e4fe690663a 100644 --- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp +++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp @@ -204,16 +204,16 @@ void G1BarrierSetAssembler::generate_c2_pre_barrier_stub(MacroAssembler* masm, BLOCK_COMMENT("} generate_c2_pre_barrier_stub"); } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register thread, - const Register tmp1, - const Register tmp2, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register thread, + const Register tmp1, + const Register tmp2, + Label& done, + bool new_val_may_be_null) { - __ block_comment("generate_post_barrier_fast_path {"); + __ block_comment("generate_post_barrier {"); assert(thread == Z_thread, "must be"); assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg); @@ -252,7 +252,7 @@ static void generate_post_barrier_fast_path(MacroAssembler* masm, static_assert(G1CardTable::dirty_card_val() == 0, "must be to use z_mvi"); __ z_mvi(0, tmp1, G1CardTable::dirty_card_val()); // *(card address) := dirty_card_val - __ block_comment("} generate_post_barrier_fast_path"); + __ block_comment("} generate_post_barrier"); } void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, @@ -264,7 +264,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, bool new_val_may_be_null) { BLOCK_COMMENT("g1_write_barrier_post_c2 {"); Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, new_val_may_be_null); __ bind(done); BLOCK_COMMENT("} g1_write_barrier_post_c2"); } @@ -418,7 +418,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Decorato bool not_null = (decorators & IS_NOT_NULL) != 0; Label done; - generate_post_barrier_fast_path(masm, Rstore_addr, Rnew_val, Z_thread, Rtmp1, Rtmp2, done, !not_null); + generate_post_barrier(masm, Rstore_addr, Rnew_val, Z_thread, Rtmp1, Rtmp2, done, !not_null); __ bind(done); BLOCK_COMMENT("} g1_write_barrier_post"); @@ -500,7 +500,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, thread, tmp1, tmp2, done, true /* new_val_may_be_null */); masm->bind(done); } diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp index 31f27e140e0..a846289d91b 100644 --- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp @@ -268,12 +268,12 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm, __ bind(done); } -static void generate_post_barrier_fast_path(MacroAssembler* masm, - const Register store_addr, - const Register new_val, - const Register tmp1, - Label& done, - bool new_val_may_be_null) { +static void generate_post_barrier(MacroAssembler* masm, + const Register store_addr, + const Register new_val, + const Register tmp1, + Label& done, + bool new_val_may_be_null) { assert_different_registers(store_addr, new_val, tmp1, noreg); @@ -310,7 +310,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post(MacroAssembler* masm, Register new_val, Register tmp) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, tmp, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, tmp, done, true /* new_val_may_be_null */); __ bind(done); } @@ -375,7 +375,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm, Register tmp, bool new_val_may_be_null) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, tmp, done, new_val_may_be_null); + generate_post_barrier(masm, store_addr, new_val, tmp, done, new_val_may_be_null); __ bind(done); } @@ -466,7 +466,7 @@ void G1BarrierSetAssembler::g1_write_barrier_post_c1(MacroAssembler* masm, Register tmp1, Register tmp2 /* unused on x86 */) { Label done; - generate_post_barrier_fast_path(masm, store_addr, new_val, tmp1, done, true /* new_val_may_be_null */); + generate_post_barrier(masm, store_addr, new_val, tmp1, done, true /* new_val_may_be_null */); masm->bind(done); }