Skip to content

8241503: C2: Share MacroAssembler between mach nodes during code emission #16484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

8241503: C2: Share MacroAssembler between mach nodes during code emission #16484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
06a50bf
Reuse same C2_MacroAssembler object to emit instructions.
JohnTortugo Sep 30, 2023
b56c98d
Catch up with changes on master
JohnTortugo Nov 21, 2023
89a6dff
Some inst_mark fixes; Catch up with master.
JohnTortugo Nov 29, 2023
b239b24
Catch up with master branch.
JohnTortugo Nov 29, 2023
afe48fe
Fix merge
JohnTortugo Nov 29, 2023
d950806
Fix build, copyright dates, m4 files.
JohnTortugo Dec 5, 2023
1669279
Merge with origin/master
JohnTortugo Dec 14, 2023
23e64ce
Catch up with origin/master
JohnTortugo Jan 4, 2024
bea8c5a
Catching up with origin/master
JohnTortugo Jan 24, 2024
aa80c80
Catching up with changes in master
JohnTortugo Mar 22, 2024
e763b08
Fix AArch64 build & improve comment about InstructionMark
JohnTortugo Mar 22, 2024
b4d73c9
Merge remote-tracking branch 'origin/master' into reuse-macroasm
JohnTortugo Mar 26, 2024
693c7ef
Fix ARM32 AD file
JohnTortugo Apr 9, 2024
44e63ee
Remove unused operands in arm.ad
JohnTortugo Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/hotspot/cpu/ppc/ppc.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3383,6 +3383,7 @@ encode %{

// The stub for call to interpreter.
address stub = CompiledStaticCall::emit_to_interp_stub(masm);
__ clear_inst_mark();
if (stub == nullptr) {
ciEnv::current()->record_failure("CodeCache is full");
return;
Expand Down Expand Up @@ -14541,6 +14542,7 @@ instruct RethrowException() %{
ins_encode %{
__ set_inst_mark();
__ b64_patchable((address)OptoRuntime::rethrow_stub(), relocInfo::runtime_call_type);
__ clear_inst_mark();
%}
ins_pipe(pipe_class_call);
%}
Expand Down
4 changes: 0 additions & 4 deletions src/hotspot/cpu/riscv/riscv.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2430,7 +2430,6 @@ encode %{
%}

enc_class riscv_enc_divuw(iRegI dst, iRegI src1, iRegI src2) %{
C2_MacroAssembler _masm(&cbuf);
Register dst_reg = as_Register($dst$$reg);
Register src1_reg = as_Register($src1$$reg);
Register src2_reg = as_Register($src2$$reg);
Expand All @@ -2445,7 +2444,6 @@ encode %{
%}

enc_class riscv_enc_divu(iRegI dst, iRegI src1, iRegI src2) %{
C2_MacroAssembler _masm(&cbuf);
Register dst_reg = as_Register($dst$$reg);
Register src1_reg = as_Register($src1$$reg);
Register src2_reg = as_Register($src2$$reg);
Expand All @@ -2460,7 +2458,6 @@ encode %{
%}

enc_class riscv_enc_moduw(iRegI dst, iRegI src1, iRegI src2) %{
C2_MacroAssembler _masm(&cbuf);
Register dst_reg = as_Register($dst$$reg);
Register src1_reg = as_Register($src1$$reg);
Register src2_reg = as_Register($src2$$reg);
Expand All @@ -2475,7 +2472,6 @@ encode %{
%}

enc_class riscv_enc_modu(iRegI dst, iRegI src1, iRegI src2) %{
C2_MacroAssembler _masm(&cbuf);
Register dst_reg = as_Register($dst$$reg);
Register src1_reg = as_Register($src1$$reg);
Register src2_reg = as_Register($src2$$reg);
Expand Down
5 changes: 5 additions & 0 deletions src/hotspot/cpu/s390/s390.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,10 +2113,13 @@ encode %{
if (_method) { // Emit stub for static call.
address stub = CompiledStaticCall::emit_to_interp_stub(masm);
if (stub == nullptr) {
__ clear_inst_mark();
ciEnv::current()->record_failure("CodeCache is full");
return;
}
}

__ clear_inst_mark();
%}

// Java dynamic call
Expand All @@ -2143,6 +2146,7 @@ encode %{
unsigned int ret_off = __ offset();
assert(__ offset() - start_off == 6, "bad prelude len: %d", __ offset() - start_off);
ret_off += emit_call_reloc(masm, $meth$$method, relocInfo::none, ra_);
__ clear_inst_mark();
assert(_method, "lazy_constant may be wrong when _method==null");
} else {
assert(!UseInlineCaches, "expect vtable calls only if not using ICs");
Expand Down Expand Up @@ -9677,6 +9681,7 @@ instruct RethrowException() %{
__ set_inst_mark();
__ load_const_optimized(Z_R1_scratch, (address)OptoRuntime::rethrow_stub());
__ z_br(Z_R1_scratch);
__ clear_inst_mark();
%}
ins_pipe(pipe_class_dummy);
%}
Expand Down