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

8320448: Accelerate IndexOf using AVX2 #16753

Closed
wants to merge 85 commits into from
+3,906 −30
Closed

8320448: Accelerate IndexOf using AVX2 #16753

Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
d40a162
sync push
asgibbons Aug 24, 2023
e33721a
Adding string assembly - first cut
asgibbons Aug 30, 2023
356cd64
Removed comments; only generate for AVX2
asgibbons Aug 31, 2023
139151f
Infrastructure hookup
asgibbons Sep 6, 2023
30f1c08
Fix single-character; make Windows compile
asgibbons Sep 7, 2023
4d68677
Fix jmp table; optimize length 1
asgibbons Sep 8, 2023
365c257
Protecting against page faults
asgibbons Sep 12, 2023
58ffe6f
Working version
asgibbons Nov 20, 2023
ce38002
Merge branch 'master' into indexof
asgibbons Nov 21, 2023
3c2df63
Fix merge problem
asgibbons Nov 21, 2023
c01ff14
Windows register preservation fix
asgibbons Nov 21, 2023
6882bac
Stomped on r13 in switch branch calculation
asgibbons Nov 27, 2023
dbe6a35
Subtracting 0x10 twice.
asgibbons Nov 28, 2023
8464376
Comments; added exhaustive-ish test
asgibbons Nov 28, 2023
db3e15f
Merge branch 'openjdk:master' into indexof
asgibbons Nov 28, 2023
60d762b
Fix whitespace
asgibbons Nov 29, 2023
e614b86
Only use optimization when EnableX86ECoreOpts is true
asgibbons Nov 29, 2023
5e03173
Support UU IndexOf
asgibbons Dec 6, 2023
4808834
Fix for JDK-8321599
asgibbons Dec 19, 2023
63db096
Addressing review comments.
asgibbons Dec 21, 2023
600377b
Merge branch 'openjdk:master' into indexof
asgibbons Jan 8, 2024
3e58d0c
Merge branch 'openjdk:master' into indexof
asgibbons Jan 11, 2024
827ca24
Remove gcc lib fn; reduce spacial cases to 10 from 32
asgibbons Feb 14, 2024
e3e9195
Move arrays_equals to MacroAssembler_x86.cpp
asgibbons Feb 14, 2024
8638a5f
Move arrays_equals out of LP_64 block
asgibbons Feb 14, 2024
71ebf9e
Change copy to stack to be only if hs size - needle size > 10
asgibbons Feb 15, 2024
62e4e8b
Fix slowdebug compile issues.
asgibbons Feb 21, 2024
82bcd8b
Addressed some review coments; replaced hard-coded registers with des…
asgibbons Feb 22, 2024
5e8c70b
Working code - baseline for optimization
asgibbons Mar 1, 2024
4a172c3
Handle small haystacks a bit better (?)
asgibbons Mar 2, 2024
215aaad
Small now working. Needs further optimization of small n and small k
asgibbons Mar 3, 2024
4915b6a
Add configurations
asgibbons Mar 3, 2024
86f6125
Try to fix increment issue :-(
asgibbons Mar 3, 2024
a96e460
Cleanup code.
asgibbons Mar 4, 2024
5119c2a
Temp checkin for Vlad review
asgibbons Mar 11, 2024
708b85c
Add ECore test
asgibbons Mar 11, 2024
0b4d552
Passes tests.
asgibbons Mar 14, 2024
3a11584
Works - needs cleanup
asgibbons Mar 16, 2024
2ad023b
Remove header dependency
asgibbons Mar 18, 2024
1f86420
Most cleanup done.
asgibbons Mar 18, 2024
d612302
Merge branch 'openjdk:master' into indexof
asgibbons Mar 18, 2024
16beb4c
Better method for mask creation
asgibbons Mar 19, 2024
c52e2c4
Add JMH. Add 16-byte compares to arrays_equals
asgibbons Mar 19, 2024
fc83a3d
Pre-cleanup code
asgibbons Mar 22, 2024
dd21bcc
Cleaned up, ready for review
asgibbons Mar 23, 2024
e079fc1
Merge branch 'openjdk:master' into indexof
asgibbons Mar 23, 2024
1cd1b50
Remove infinite loop (used for debugging)
asgibbons Mar 25, 2024
8e0ce70
Merge branch 'openjdk:master' into indexof
asgibbons Apr 22, 2024
1d141fd
Move arrays_equals back to c2_MacroAssembler
asgibbons Apr 22, 2024
f52d281
Merge remote-tracking branch 'origin/master' into indexof
asgibbons May 3, 2024
fb4da92
Rearrange; add lambdas for clarity
asgibbons May 4, 2024
9a86197
Addressing lots of comments. Interim commit.
asgibbons May 17, 2024
38868a3
Fixed CI compiles; re-factor UL processing
asgibbons May 22, 2024
f4ca4a5
Added comments; move n-k<32 code up a level
asgibbons May 22, 2024
b6d77fe
Adding exhaustive test
asgibbons May 22, 2024
f002fd5
Added header file
asgibbons May 22, 2024
b0ef5e6
un-helper-ize preload_needle_helper; try fix for macos build
asgibbons May 22, 2024
f4eefe1
Merge branch 'openjdk:master' into indexof
asgibbons May 22, 2024
ed4451d
Revert last change to IndexOf.java
asgibbons May 22, 2024
027daf7
Remove DO_EARLY_BAILOUT
asgibbons May 22, 2024
42af0b5
Check macos build
asgibbons May 23, 2024
40a1e62
Check macos build
asgibbons May 23, 2024
87b1ebe
Check macos build
asgibbons May 23, 2024
23d2c51
Check macos build
asgibbons May 23, 2024
cba6ffb
Fix for IndexOf.java on mac
asgibbons May 23, 2024
2283f2b
Addressing review comments
asgibbons May 23, 2024
c034d3f
Review comments - move stubGen*_string.cpp to c2_stubGen*_string.cpp
asgibbons May 23, 2024
1a71eb1
Missing comma
asgibbons May 24, 2024
5d10a20
mov64 => lea(InternalAddress)
asgibbons May 24, 2024
485d02f
Test clarifications
asgibbons May 24, 2024
69ca8d1
Split into two subtest jobs
asgibbons May 24, 2024
be001e2
Review comments.
asgibbons May 24, 2024
b154fae
Fix test; review comments
asgibbons May 24, 2024
e13c7ea
Review comments; fix reading past end of haystack when (n-k) < 32
asgibbons May 25, 2024
15994a3
Fix tests
asgibbons May 25, 2024
01cb58f
Revert changes to IndexOf.java
asgibbons May 28, 2024
751aace
Review comments
asgibbons May 28, 2024
355325d
Final review comments
asgibbons May 28, 2024
db0ab75
Move assert to where it's actually important.
asgibbons May 28, 2024
ed06edd
Remove duplicate vm.compiler2.enabled
asgibbons May 29, 2024
46b82ec
Add @test block; fix test indentation
asgibbons May 30, 2024
3e150fe
Stupid EOL at end
asgibbons May 30, 2024
57e115d
Review comments
asgibbons May 30, 2024
6eae46e
Fix bug number in tests
asgibbons May 30, 2024
f432320
Fix copyright & a couple of comment typos
asgibbons May 30, 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
4 changes: 3 additions & 1 deletion test/jdk/java/lang/String/IndexOf.java
View file
Original file line number Diff line number Diff line change
@@ -23,12 +23,14 @@

/*
* @test
Copy link
Contributor

Choose a reason for hiding this comment

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

You should add the @bug 8320448 for all runs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

* @bug 8320448
* @summary test String indexOf() intrinsic
* @run main/othervm IndexOf
* @run driver IndexOf
*/

/*
* @test
* @bug 8320448
* @summary test String indexOf() intrinsic
* @requires vm.cpu.features ~= ".*avx2.*"
* @requires vm.compiler2.enabled
5 changes: 3 additions & 2 deletions test/jdk/java/lang/StringBuffer/ECoreIndexOf.java
View file
Original file line number Diff line number Diff line change
@@ -22,14 +22,15 @@
*/

/* @test
* @bug 4162796 4162796
* @bug 4162796 4162796 8320448
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* @bug 4162796 4162796 8320448
* @bug 8320448

Copy link
Contributor

Choose a reason for hiding this comment

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

As I said above: I never add old bug numbers to new tests. But here it is even duplicated ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The file I used as baseline for this test/jdk/java/lang/StringBuffer/IndexOf.java has the bug number listed twice (copy/paste). I'll remove it from here, but leave it in the original unless requested to change it.

* @summary Test indexOf and lastIndexOf
* @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CompileCommand=dontinline,ECoreIndexOf.indexOfKernel ECoreIndexOf
Copy link
Contributor

Choose a reason for hiding this comment

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

I would also add a line without -XX:-TieredCompilation, then C1 can be tested with this too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

* @run main/othervm -Xbatch -XX:CompileCommand=dontinline,ECoreIndexOf.indexOfKernel ECoreIndexOf
* @key randomness
*/

/* @test
* @bug 4162796 4162796
* @bug 4162796 4162796 8320448
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* @bug 4162796 4162796 8320448
* @bug 8320448

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

* @summary Test indexOf and lastIndexOf
* @requires vm.cpu.features ~= ".*avx2.*"
* @requires vm.compiler2.enabled