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

8332442: C2: refactor Mod cases in Compile::final_graph_reshaping_main_switch() #20877

Closed
wants to merge 14 commits into from
+284 −68
Closed

8332442: C2: refactor Mod cases in Compile::final_graph_reshaping_main_switch() #20877

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ffc971e
refactor divmod ops to handle_div_mod_op
tabjy Aug 27, 2024
37592d5
passing tier1 tests
tabjy Aug 27, 2024
757836d
created IR tests
tabjy Aug 29, 2024
a69eaa5
Add test and IRNode for signed int/long divmod
tabjy Sep 3, 2024
6dc9ea9
Merge branch 'master' into refactor-mod-cases
tabjy Sep 5, 2024
6c604d2
remove redundant arguments, test with -XX:-UseDivMod
tabjy Sep 9, 2024
5ee7e7b
include aarch64 in tests, add more configuration combinations
tabjy Sep 10, 2024
57e96e1
Merge branch 'openjdk:master' into refactor-mod-cases
tabjy Sep 10, 2024
3584d10
remove platform restriction
tabjy Sep 10, 2024
1ca06ae
allow one div on platforms without hardware divmod
tabjy Sep 10, 2024
45f065a
improve formatting, nullptr comparison, update test flags, use custom…
tabjy Sep 11, 2024
fe7b82e
Merge branch 'openjdk:master' into refactor-mod-cases
tabjy Sep 11, 2024
ef7882b
format comments, add @bug, avoid zero divisor
tabjy Sep 11, 2024
bfe017d
remove C2 requirement for tests
tabjy Sep 16, 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
16 changes: 8 additions & 8 deletions test/hotspot/jtreg/compiler/c2/TestDivModNodes.java
View file
Original file line number Diff line number Diff line change
@@ -46,8 +46,8 @@ public static void main(String[] args) {
counts = {IRNode.DIV_MOD_I, "1"},
failOn = {IRNode.DIV_I, IRNode.MOD_I})
@IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
counts = {IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
failOn = {IRNode.DIV_I, IRNode.MOD_I})
counts = {IRNode.DIV_I, "1", IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
failOn = {IRNode.MOD_I})
@IR(applyIf = {"UseDivMod", "false"},
counts = {IRNode.DIV_I, "1", IRNode.MOD_I, "1"})
private static void testSignedIntDivMod(int dividend, int divisor) {
@@ -63,8 +63,8 @@ private static void testSignedIntDivMod(int dividend, int divisor) {
counts = {IRNode.DIV_MOD_L, "1"},
failOn = {IRNode.DIV_L, IRNode.MOD_L})
@IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
counts = {IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
failOn = {IRNode.DIV_L, IRNode.MOD_L})
counts = {IRNode.DIV_L, "1", IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
failOn = {IRNode.MOD_L})
@IR(applyIf = {"UseDivMod", "false"},
counts = {IRNode.DIV_L, "1", IRNode.MOD_L, "1"})
private static void testSignedLongDivMod(long dividend, long divisor) {
@@ -80,8 +80,8 @@ private static void testSignedLongDivMod(long dividend, long divisor) {
counts = {IRNode.UDIV_MOD_I, "1"},
failOn = {IRNode.UDIV_I, IRNode.UMOD_I})
@IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
counts = {IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
failOn = {IRNode.UDIV_I, IRNode.UMOD_I})
counts = {IRNode.UDIV_I, "1", IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
failOn = {IRNode.UMOD_I})
@IR(applyIf = {"UseDivMod", "false"},
counts = {IRNode.UDIV_I, "1", IRNode.UMOD_I, "1"})
private static void testUnsignedIntDivMod(int dividend, int divisor) {
@@ -97,8 +97,8 @@ private static void testUnsignedIntDivMod(int dividend, int divisor) {
counts = {IRNode.UDIV_MOD_L, "1"},
failOn = {IRNode.UDIV_L, IRNode.UMOD_L})
@IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
counts = {IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
failOn = {IRNode.UDIV_L, IRNode.MOD_L})
counts = {IRNode.UDIV_L, "1", IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
failOn = {IRNode.MOD_L})
@IR(applyIf = {"UseDivMod", "false"},
counts = {IRNode.UDIV_L, "1", IRNode.UMOD_L, "1"})
private static void testUnsignedLongDivMod(long dividend, long divisor) {