Skip to content

Commit 1248b15

Browse files
committed
8303154: Investigate and improve instruction cache flushing during compilation
Backport-of: b7945bc9e5db5761f17a9e56246424fbcab21627
1 parent 4eeb1c9 commit 1248b15

File tree

7 files changed

+0
-11
lines changed

7 files changed

+0
-11
lines changed

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
771771

772772
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
773773

774-
__ flush();
775774
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
776775
}
777776

src/hotspot/cpu/arm/sharedRuntime_arm.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
644644
address c2i_entry = __ pc();
645645
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
646646

647-
__ flush();
648647
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
649648
}
650649

src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
666666

667667
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
668668

669-
__ flush();
670669
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
671670
}
672671

src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
998998

999999
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
10001000

1001-
__ flush();
10021001
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
10031002
}
10041003

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
10321032

10331033
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
10341034

1035-
__ flush();
10361035
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
10371036
}
10381037

src/hotspot/share/c1/c1_Compilation.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,6 @@ void Compilation::emit_code_epilog(LIR_Assembler* assembler) {
314314
// Emit the handler to remove the activation from the stack and
315315
// dispatch to the caller.
316316
offsets()->set_value(CodeOffsets::UnwindHandler, assembler->emit_unwind_handler());
317-
318-
// done
319-
masm()->flush();
320317
}
321318

322319

src/hotspot/share/code/codeCache.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,6 @@ void CodeCache::commit(CodeBlob* cb) {
609609
if (cb->is_adapter_blob()) {
610610
heap->set_adapter_count(heap->adapter_count() + 1);
611611
}
612-
613-
// flush the hardware I-cache
614-
ICache::invalidate_range(cb->content_begin(), cb->content_size());
615612
}
616613

617614
bool CodeCache::contains(void *p) {

0 commit comments

Comments
 (0)