8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 #22582

TheRealMDoerr · 2024-12-05T16:57:24Z

Change lir_sqrt, lir_abs, lir_neg, lir_f2hf, lir_hf2f to use LIR_Op1. Extend LIR_Op1 to support one temp register operand. Also see JBS issue.

Remove lir_tan and lir_log10 which are unused (dead and incomplete code). They should have been removed with or after ad79a5a and the corresponding changes on other platforms.

The removal of the unnecessary float constant loads improves performance:
make run-test TEST="micro:Fp16ConversionBenchmark" MICRO="VM_OPTIONS=-XX:TieredStopAtLevel=1"

Power 10 without patch:

Benchmark                                     (size)   Mode  Cnt      Score    Error   Units
Fp16ConversionBenchmark.floatToFloat16          2048  thrpt   15    247.064 ±  0.189  ops/ms

Power 10 with patch:

Benchmark                                     (size)   Mode  Cnt      Score    Error   Units
Fp16ConversionBenchmark.floatToFloat16          2048  thrpt   15    308.372 ±  0.432  ops/ms

x64 machine without patch:

Benchmark                                     (size)   Mode  Cnt      Score    Error   Units
Fp16ConversionBenchmark.floatToFloat16          2048  thrpt   15     384.565 ±    3.758  ops/ms

x64 machine with patch:

Benchmark                                     (size)   Mode  Cnt      Score    Error   Units
Fp16ConversionBenchmark.floatToFloat16          2048  thrpt   15     406.121 ±    3.228  ops/ms

Testing: tier1-4 on x64 (Windows, linux, MacOS), aarch64 (linux, MacOS), ppc64 (linux, AIX)

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 (Enhancement - P4)

Reviewers

Richard Reingruber (@reinrich - Reviewer)
Goetz Lindenmaier (@GoeLin - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22582/head:pull/22582
$ git checkout pull/22582

Update a local copy of the PR:
$ git checkout pull/22582
$ git pull https://git.openjdk.org/jdk.git pull/22582/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22582

View PR using the GUI difftool:
$ git pr show -t 22582

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22582.diff

Using Webrev

Link to Webrev Comment

…LIR_Op1

bridgekeeper · 2024-12-05T16:58:34Z

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-12-05T16:58:42Z

@TheRealMDoerr This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1

Reviewed-by: rrich, goetz

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 82 new commits pushed to the master branch:

2382a2d: 8345661: Simplify page size alignment in code heap reservation
076bfa6: 8345656: Move os alignment functions out of ReservedSpace
2826838: 8345658: WB_NMTCommitMemory redundantly records an NMT tag
c9ec271: 8345800: Update copyright year to 2024 for serviceability in files where it was missed
8e0f929: 8345805: Update copyright year to 2024 for other files where it was missed
f88c1c6: 8345773: Class-File API debug printing capability
e88e793: 8343148: C2: Refactor uses of "PhaseValue::con() + PhaseIdealLoop::set_ctrl()" into separate method
1e9204f: 8345273: Fix -Wzero-as-null-pointer-constant warnings in s390 code
c40140e: 8334581: Remove no-arg constructor BasicSliderUI()
8de0622: 8345767: javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java fails in ubuntu22.04
... and 72 more: https://git.openjdk.org/jdk/compare/b42d79eb6a6d497dc63718c2854609bebca4498c...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-12-05T16:59:23Z

@TheRealMDoerr The following label will be automatically applied to this pull request:

hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-12-05T17:01:47Z

Webrevs

01: Full - Incremental (5ff93516)
00: Full (1213839c)

TheRealMDoerr · 2024-12-05T17:17:18Z

src/hotspot/share/c1/c1_LIR.cpp

@@ -483,6 +489,7 @@ void LIR_OpVisitState::visit(LIR_Op* op) {

      assert(op1->_info != nullptr, "");  do_info(op1->_info);
      if (op1->_opr->is_valid())       do_temp(op1->_opr); // safepoints on SPARC need temporary register
+      assert(op1->_tmp->is_illegal(), "not used");


I think safepoints should ideally be implemented as LIR_Op0. SPARC support is removed. We could file a new RFE for that.

Well, a grep showed there are more leftovers of sparc and solaris in hotspot, but not a matter of this change.

reinrich

Nice cleanup 👍
A few files need copyright update // especially c1_LinearScan_x86.hpp ;)
Cheers, Richard.

TheRealMDoerr · 2024-12-05T21:24:58Z

Thanks for the review! Copyright headers are updated.

reinrich · 2024-12-06T08:33:38Z

You might even see an effect in the Fp16ConversionBenchmark if you stop compilation at tier 1.

TheRealMDoerr · 2024-12-06T11:47:29Z

You might even see an effect in the Fp16ConversionBenchmark if you stop compilation at tier 1.

Yes. Added benchmark results to the description.

GoeLin

LGTM

TheRealMDoerr · 2024-12-11T12:49:38Z

Thanks for the review!
/integrate

openjdk · 2024-12-11T12:50:27Z

Going to push as commit a21d21f.
Since your change was applied there have been 82 commits pushed to the master branch:

2382a2d: 8345661: Simplify page size alignment in code heap reservation
076bfa6: 8345656: Move os alignment functions out of ReservedSpace
2826838: 8345658: WB_NMTCommitMemory redundantly records an NMT tag
c9ec271: 8345800: Update copyright year to 2024 for serviceability in files where it was missed
8e0f929: 8345805: Update copyright year to 2024 for other files where it was missed
f88c1c6: 8345773: Class-File API debug printing capability
e88e793: 8343148: C2: Refactor uses of "PhaseValue::con() + PhaseIdealLoop::set_ctrl()" into separate method
1e9204f: 8345273: Fix -Wzero-as-null-pointer-constant warnings in s390 code
c40140e: 8334581: Remove no-arg constructor BasicSliderUI()
8de0622: 8345767: javax/swing/JSplitPane/4164779/JSplitPaneKeyboardNavigationTest.java fails in ubuntu22.04
... and 72 more: https://git.openjdk.org/jdk/compare/b42d79eb6a6d497dc63718c2854609bebca4498c...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-12-11T12:50:39Z

@TheRealMDoerr Pushed as commit a21d21f.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

dholmes-ora · 2024-12-11T20:25:41Z

We have a large number of failures in our tier 2 (so far) CI after this was integrated, all with issues in the JIT.

There is a crash in LIR_Assembler::negate

# assert(regs[i] != regs[j]) failed: regs[0] and regs[1] are both: xmm2

There are FP failures of different kinds

assertEquals expected: 1.401298464324817E-45 but was: 1.727233711018889E-77

RuntimeException: pow(+Infinity, 0.5), expected: Infinity, actual: Infinity

Sorry but this change will be backed out.

8345609: [C1] LIR Operations with one input should be implemented as …

1213839

…LIR_Op1

openjdk bot added the rfr Pull request is ready for review label Dec 5, 2024

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Dec 5, 2024

TheRealMDoerr commented Dec 5, 2024

View reviewed changes

reinrich approved these changes Dec 5, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 5, 2024

Update Copyright headers.

5ff9351

openjdk bot removed the ready Pull request is ready to be integrated label Dec 5, 2024

reinrich approved these changes Dec 5, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 5, 2024

GoeLin approved these changes Dec 11, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Dec 11, 2024

openjdk bot closed this Dec 11, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 11, 2024

TheRealMDoerr deleted the 8345609_C1_LIR_Op1 branch December 11, 2024 12:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 #22582

8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 #22582

TheRealMDoerr commented Dec 5, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Dec 5, 2024

openjdk bot commented Dec 5, 2024 •

edited

Loading

openjdk bot commented Dec 5, 2024

mlbridge bot commented Dec 5, 2024 •

edited

Loading

TheRealMDoerr Dec 5, 2024

GoeLin Dec 11, 2024

reinrich left a comment

TheRealMDoerr commented Dec 5, 2024

reinrich commented Dec 6, 2024

TheRealMDoerr commented Dec 6, 2024

GoeLin left a comment

TheRealMDoerr commented Dec 11, 2024

openjdk bot commented Dec 11, 2024

openjdk bot commented Dec 11, 2024

dholmes-ora commented Dec 11, 2024 •

edited

Loading

8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 #22582

8345609: [C1] LIR Operations with one input should be implemented as LIR_Op1 #22582

Conversation

TheRealMDoerr commented Dec 5, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Dec 5, 2024

openjdk bot commented Dec 5, 2024 • edited Loading

openjdk bot commented Dec 5, 2024

mlbridge bot commented Dec 5, 2024 • edited Loading

Webrevs

TheRealMDoerr Dec 5, 2024

Choose a reason for hiding this comment

GoeLin Dec 11, 2024

Choose a reason for hiding this comment

reinrich left a comment

Choose a reason for hiding this comment

TheRealMDoerr commented Dec 5, 2024

reinrich commented Dec 6, 2024

TheRealMDoerr commented Dec 6, 2024

GoeLin left a comment

Choose a reason for hiding this comment

TheRealMDoerr commented Dec 11, 2024

openjdk bot commented Dec 11, 2024

openjdk bot commented Dec 11, 2024

dholmes-ora commented Dec 11, 2024 • edited Loading

TheRealMDoerr commented Dec 5, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Dec 5, 2024 •

edited

Loading

mlbridge bot commented Dec 5, 2024 •

edited

Loading

dholmes-ora commented Dec 11, 2024 •

edited

Loading