stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8343122: RISC-V: C2: Small improvement for real runtime callouts

Browse Source 
Reviewed-by: rehn, fjiang
This commit is contained in:
Fei Yang 2024-11-01 00:55:11 +00:00
parent 803612ee93
commit cbda758010
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hotspot/cpu/riscv/riscv.ad
View File

@ -1259,13 +1259,13 @@ int MachCallRuntimeNode::ret_addr_offset() {
// jal(addr) // jal(addr)
// or with far branches // or with far branches
// jal(trampoline_stub) // jal(trampoline_stub)
// for real runtime callouts it will be 11 instructions // for real runtime callouts it will be 9 instructions
// see riscv_enc_java_to_runtime // see riscv_enc_java_to_runtime
// la(t0, retaddr) -> auipc + addi // la(t0, retaddr) -> auipc + addi
// la(t1, RuntimeAddress(addr)) -> lui + addi + slli + addi + slli + addi
// addi(sp, sp, -2 * wordSize) -> addi // addi(sp, sp, -2 * wordSize) -> addi
// sd(t1, Address(sp, wordSize)) -> sd // sd(t0, Address(sp, wordSize)) -> sd
// jalr(t1) -> jalr // movptr(t1, addr, offset, t0) -> lui + lui + slli + add
// jalr(t1, offset) -> jalr
CodeBlob *cb = CodeCache::find_blob(_entry_point); CodeBlob *cb = CodeCache::find_blob(_entry_point);
if (cb != nullptr) { if (cb != nullptr) {
if (UseTrampolines) { if (UseTrampolines) {
@ -1273,7 +1273,7 @@ int MachCallRuntimeNode::ret_addr_offset() {
} }
return 3 * NativeInstruction::instruction_size; return 3 * NativeInstruction::instruction_size;
} else { } else {
return 11 * NativeInstruction::instruction_size; return 9 * NativeInstruction::instruction_size;
} }
} }
@ -2505,11 +2505,13 @@ encode %{
} else { } else {
Label retaddr; Label retaddr;
__ la(t0, retaddr); __ la(t0, retaddr);
__ la(t1, RuntimeAddress(entry));
// Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc() // Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc()
__ addi(sp, sp, -2 * wordSize); __ addi(sp, sp, -2 * wordSize);
__ sd(t0, Address(sp, wordSize)); __ sd(t0, Address(sp, wordSize));
__ jalr(t1); int32_t offset = 0;
// No relocation needed
__ movptr(t1, entry, offset, t0); // lui + lui + slli + add
__ jalr(t1, offset);
__ bind(retaddr); __ bind(retaddr);
__ post_call_nop(); __ post_call_nop();
__ addi(sp, sp, 2 * wordSize); __ addi(sp, sp, 2 * wordSize);