Skip to content

Commit f9070df

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 e5dfeb1 commit f9070df

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ void TemplateTable::ldc(LdcType type) {
309309
// get type
310310
__ addi(x13, x11, tags_offset);
311311
__ add(x13, x10, x13);
312-
__ membar(MacroAssembler::AnyAny);
313312
__ lbu(x13, Address(x13, 0));
314313
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
315314

@@ -2231,7 +2230,6 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
22312230
Label resolved;
22322231

22332232
__ load_resolved_indy_entry(cache, index);
2234-
__ membar(MacroAssembler::AnyAny);
22352233
__ ld(method, Address(cache, in_bytes(ResolvedIndyEntry::method_offset())));
22362234
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
22372235

@@ -2246,7 +2244,6 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
22462244
__ call_VM(noreg, entry, method);
22472245
// Update registers with resolved info
22482246
__ load_resolved_indy_entry(cache, index);
2249-
__ membar(MacroAssembler::AnyAny);
22502247
__ ld(method, Address(cache, in_bytes(ResolvedIndyEntry::method_offset())));
22512248
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
22522249

@@ -3453,7 +3450,6 @@ void TemplateTable::_new() {
34533450
const int tags_offset = Array<u1>::base_offset_in_bytes();
34543451
__ add(t0, x10, x13);
34553452
__ la(t0, Address(t0, tags_offset));
3456-
__ membar(MacroAssembler::AnyAny);
34573453
__ lbu(t0, t0);
34583454
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
34593455
__ sub(t1, t0, (u1)JVM_CONSTANT_Class);
@@ -3573,7 +3569,6 @@ void TemplateTable::checkcast() {
35733569
// See if bytecode has already been quicked
35743570
__ add(t0, x13, Array<u1>::base_offset_in_bytes());
35753571
__ add(x11, t0, x9);
3576-
__ membar(MacroAssembler::AnyAny);
35773572
__ lbu(x11, x11);
35783573
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
35793574
__ sub(t0, x11, (u1)JVM_CONSTANT_Class);
@@ -3629,7 +3624,6 @@ void TemplateTable::instanceof() {
36293624
// See if bytecode has already been quicked
36303625
__ add(t0, x13, Array<u1>::base_offset_in_bytes());
36313626
__ add(x11, t0, x9);
3632-
__ membar(MacroAssembler::AnyAny);
36333627
__ lbu(x11, x11);
36343628
__ membar(MacroAssembler::LoadLoad | MacroAssembler::LoadStore);
36353629
__ sub(t0, x11, (u1)JVM_CONSTANT_Class);

0 commit comments

Comments
 (0)