Skip to content
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

8282204: Use lea instructions for arithmetic operations on x86_64 #7560

Closed
wants to merge 12 commits into from
+282 −26
Closed

8282204: Use lea instructions for arithmetic operations on x86_64 #7560

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d1a5bbb
Use lea
merykitty Feb 21, 2022
bcaeb3d
decoder, format
merykitty Feb 22, 2022
b09260b
add predicate
merykitty Feb 23, 2022
6d2680b
add benchmark
merykitty Feb 24, 2022
41fd480
address reviews
merykitty Feb 25, 2022
a866de7
reviews
merykitty Feb 28, 2022
31f2326
remove irrelevent changes
merykitty Mar 1, 2022
7d9b1e2
address reviews
merykitty Mar 3, 2022
d171e82
remove 0x67 prefix
merykitty Mar 4, 2022
69a1afc
remove unreached rules
merykitty Mar 4, 2022
669dea5
reviews
merykitty Mar 12, 2022
e0fd81f
Merge branch 'master' into leaIns
merykitty Mar 12, 2022
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
54 changes: 12 additions & 42 deletions src/hotspot/cpu/x86/x86_64.ad
View file
Original file line number Diff line number Diff line change
@@ -7508,36 +7508,21 @@ instruct leaI_rReg_immI2_immI(rRegI dst, rRegI index, immI2 scale, immI disp)
ins_pipe(ialu_reg_reg);
%}

instruct leaI_rReg_rReg_immI(rRegI dst, rRegI src1, rRegI src2, immI disp)
instruct leaI_rReg_rReg_immI(rRegI dst, rRegI base, rRegI index, immI disp)
%{
predicate(VM_Version::supports_fast_3op_lea());
match(Set dst (AddI (AddI src1 src2) disp));
match(Set dst (AddI (AddI base index) disp));

format %{ "addr32 leal $dst, [$src1 + $src2 + $disp]\t# int" %}
format %{ "addr32 leal $dst, [$base + $index + $disp]\t# int" %}
ins_encode %{
__ leal($dst$$Register, Address($src1$$Register, $src2$$Register, Address::times_1, $disp$$constant));
__ leal($dst$$Register, Address($base$$Register, $index$$Register, Address::times_1, $disp$$constant));
%}
ins_pipe(ialu_reg_reg);
%}

instruct leaI_rReg_rReg_immI2(rRegI dst, rRegI base, rRegI index, immI2 scale)
instruct leaI_rReg_rReg_immI2(rRegI dst, no_rbp_r13_RegI base, rRegI index, immI2 scale)
%{
predicate(VM_Version::supports_fast_3op_lea());
match(Set dst (AddI base (LShiftI index scale)));
match(Set dst (AddI (LShiftI index scale) base));

format %{ "addr32 leal $dst, [$base + $index << $scale]\t# int" %}
ins_encode %{
Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
__ leal($dst$$Register, Address($base$$Register, $index$$Register, scale));
%}
ins_pipe(ialu_reg_reg);
%}

instruct leaI_rReg_rReg_immI2_no_disp(rRegI dst, no_rbp_r13_RegI base, rRegI index, immI2 scale)
%{
predicate(VM_Version::supports_fast_2op_lea() &&
!VM_Version::supports_fast_3op_lea());
predicate(VM_Version::supports_fast_2op_lea());
match(Set dst (AddI base (LShiftI index scale)));
match(Set dst (AddI (LShiftI index scale) base));
Copy link

Choose a reason for hiding this comment

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

I think the commutativity is automatically handled by adlc.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes you are right, I have removed the unnecessaries.


@@ -7695,36 +7680,21 @@ instruct leaL_rReg_immI2_immL32(rRegL dst, rRegL index, immI2 scale, immL32 disp
ins_pipe(ialu_reg_reg);
%}

instruct leaL_rReg_rReg_immL32(rRegL dst, rRegL src1, rRegL src2, immL32 disp)
instruct leaL_rReg_rReg_immL32(rRegL dst, rRegL base, rRegL index, immL32 disp)
%{
predicate(VM_Version::supports_fast_3op_lea());
match(Set dst (AddL (AddL src1 src2) disp));
match(Set dst (AddL (AddL base index) disp));

format %{ "leaq $dst, [$src1 + $src2 + $disp]\t# long" %}
format %{ "leaq $dst, [$base + $index + $disp]\t# long" %}
ins_encode %{
__ leaq($dst$$Register, Address($src1$$Register, $src2$$Register, Address::times_1, $disp$$constant));
__ leaq($dst$$Register, Address($base$$Register, $index$$Register, Address::times_1, $disp$$constant));
%}
ins_pipe(ialu_reg_reg);
%}

instruct leaL_rReg_rReg_immI2(rRegL dst, rRegL base, rRegL index, immI2 scale)
instruct leaL_rReg_rReg_immI2(rRegL dst, no_rbp_r13_RegL base, rRegL index, immI2 scale)
%{
predicate(VM_Version::supports_fast_3op_lea());
match(Set dst (AddL base (LShiftL index scale)));
match(Set dst (AddL (LShiftL index scale) base));

format %{ "leaq $dst, [$base + $index << $scale]\t# long" %}
ins_encode %{
Address::ScaleFactor scale = static_cast<Address::ScaleFactor>($scale$$constant);
__ leaq($dst$$Register, Address($base$$Register, $index$$Register, scale));
%}
ins_pipe(ialu_reg_reg);
%}

instruct leaL_rReg_rReg_immI2_no_disp(rRegL dst, no_rbp_r13_RegL base, rRegL index, immI2 scale)
%{
predicate(VM_Version::supports_fast_2op_lea() &&
!VM_Version::supports_fast_3op_lea());
predicate(VM_Version::supports_fast_2op_lea());
match(Set dst (AddL base (LShiftL index scale)));
match(Set dst (AddL (LShiftL index scale) base));

2 changes: 1 addition & 1 deletion test/micro/org/openjdk/bench/vm/compiler/LeaInstruction.java
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@

@BenchmarkMode(Mode.AverageTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS)
@Fork(value = 2, jvmArgsAppend = {"-XX:LoopUnrollLimit=1"})
@Fork(value = 1, jvmArgsAppend = {"-XX:LoopUnrollLimit=1"})
@State(Scope.Thread)
public class LeaInstruction {
static final int ITERATION = 1000;