Skip to content

Commit 9b15f9f

Browse files
zifeihanRealFYang
authored andcommitted
8341146: RISC-V: Unnecessary fences used for load-acquire in template interpreter
Reviewed-by: fjiang, fyang Backport-of: a4ca6267e17815153f8fa119db19b97b1da2bd84
1 parent fb8d7fc commit 9b15f9f

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

src/hotspot/cpu/riscv/interp_masm_riscv.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register
265265
la(bytecode, Address(cache,
266266
ConstantPoolCache::base_offset() +
267267
ConstantPoolCacheEntry::indices_offset()));
268-
membar(MacroAssembler::AnyAny);
269268
lwu(bytecode, bytecode);
270269
membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
271270
const int shift_count = (1 + byte_no) * BitsPerByte;

src/hotspot/cpu/riscv/templateTable_riscv.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ void TemplateTable::ldc(bool wide)
317317
// get type
318318
__ addi(x13, x11, tags_offset);
319319
__ add(x13, x10, x13);
320-
__ membar(MacroAssembler::AnyAny);
321320
__ lbu(x13, Address(x13, 0));
322321
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
323322

@@ -3491,7 +3490,6 @@ void TemplateTable::_new() {
34913490
const int tags_offset = Array<u1>::base_offset_in_bytes();
34923491
__ add(t0, x10, x13);
34933492
__ la(t0, Address(t0, tags_offset));
3494-
__ membar(MacroAssembler::AnyAny);
34953493
__ lbu(t0, t0);
34963494
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
34973495
__ sub(t1, t0, (u1)JVM_CONSTANT_Class);
@@ -3638,7 +3636,6 @@ void TemplateTable::checkcast()
36383636
// See if bytecode has already been quicked
36393637
__ add(t0, x13, Array<u1>::base_offset_in_bytes());
36403638
__ add(x11, t0, x9);
3641-
__ membar(MacroAssembler::AnyAny);
36423639
__ lbu(x11, x11);
36433640
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
36443641
__ sub(t0, x11, (u1)JVM_CONSTANT_Class);
@@ -3694,7 +3691,6 @@ void TemplateTable::instanceof() {
36943691
// See if bytecode has already been quicked
36953692
__ add(t0, x13, Array<u1>::base_offset_in_bytes());
36963693
__ add(x11, t0, x9);
3697-
__ membar(MacroAssembler::AnyAny);
36983694
__ lbu(x11, x11);
36993695
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
37003696
__ sub(t0, x11, (u1)JVM_CONSTANT_Class);

0 commit comments

Comments
 (0)