Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8303154: Investigate and improve instruction cache flushing during co…
…mpilation

Reviewed-by: thartmann, kvn
  • Loading branch information
dafedafe authored and TobiHartmann committed Mar 16, 2023
1 parent eefbaa2 commit b7945bc
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
Expand Up @@ -791,7 +791,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm

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

__ flush();
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
}

Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/arm/sharedRuntime_arm.cpp
Expand Up @@ -645,7 +645,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
address c2i_entry = __ pc();
gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);

__ flush();
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
}

Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
Expand Up @@ -681,7 +681,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm

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

__ flush();
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
}

Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
Expand Up @@ -968,7 +968,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm

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

__ flush();
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
}

Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
Expand Up @@ -1041,7 +1041,6 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm

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

__ flush();
return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry, c2i_no_clinit_check_entry);
}

Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/c1/c1_Compilation.cpp
Expand Up @@ -313,9 +313,6 @@ void Compilation::emit_code_epilog(LIR_Assembler* assembler) {
// Emit the handler to remove the activation from the stack and
// dispatch to the caller.
offsets()->set_value(CodeOffsets::UnwindHandler, assembler->emit_unwind_handler());

// done
masm()->flush();
}


Expand Down
3 changes: 0 additions & 3 deletions src/hotspot/share/code/codeCache.cpp
Expand Up @@ -628,9 +628,6 @@ void CodeCache::commit(CodeBlob* cb) {
if (cb->is_adapter_blob()) {
heap->set_adapter_count(heap->adapter_count() + 1);
}

// flush the hardware I-cache
ICache::invalidate_range(cb->content_begin(), cb->content_size());
}

bool CodeCache::contains(void *p) {
Expand Down

3 comments on commit b7945bc

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on b7945bc Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on b7945bc Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-b7945bc9 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b7945bc9 from the openjdk/jdk repository.

The commit being backported was authored by Damon Fenacci on 16 Mar 2023 and was reviewed by Tobias Hartmann and Vladimir Kozlov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-b7945bc9:GoeLin-backport-b7945bc9
$ git checkout GoeLin-backport-b7945bc9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-b7945bc9

Please sign in to comment.