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.

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

8262739: String inflation C2 intrinsic prevents insertion of anti-dependencies #3025

Closed
wants to merge 2 commits into from

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Mar 16, 2021

The string inflation intrinsic StrInflatedCopyNode which converts the String internal byte[] to char[] has bottom_type Type::MEMORY:

StrIntrinsicNode(control, arymem, s1, s2, c, none) {};
virtual int Opcode() const;
virtual const Type* bottom_type() const { return Type::MEMORY; }

Memory users (i.e. loads) should therefore be checked for nearby anti-dependent stores:

bool Node::needs_anti_dependence_check() const {
if (req() < 2 || (_flags & Flag_needs_anti_dependence_check) == 0) {
return false;
}
return in(1)->bottom_type()->has_memory();

However, since InstructForm::captures_bottom_type returns false for StrInflatedCopyNode, after matching, the corresponding MachNode version will have bottom_type Type::BOTTOM and no anti-dependency analysis will be performed for its users. Scheduling then incorrectly orders loads from the char array with anti-dependent stores to the same array, leading to incorrect results.

StrCompressedCopyNode does not need this because it has TypeInt::INT as bottom_type (the memory output is handled via a SCMemProjNode):

StrIntrinsicNode(control, arymem, s1, s2, c, none) {};
virtual int Opcode() const;
virtual const Type* bottom_type() const { return TypeInt::INT; }

Thanks,
Tobias


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8262739: String inflation C2 intrinsic prevents insertion of anti-dependencies

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/3025/head:pull/3025
$ git checkout pull/3025

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2021

👋 Welcome back thartmann! 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 openjdk bot added the rfr Pull request is ready for review label Mar 16, 2021
@openjdk
Copy link

openjdk bot commented Mar 16, 2021

@TobiHartmann 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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Mar 16, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2021

Webrevs

Copy link

@neliasso neliasso left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Mar 16, 2021

@TobiHartmann 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:

8262739: String inflation C2 intrinsic prevents insertion of anti-dependencies

Reviewed-by: neliasso, chagedorn

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 4 new commits pushed to the master branch:

  • 4517d72: 8263612: Unused variables in C1 runtime
  • 83a9a02: 8263509: LdapSchemaParser.readNextTag checks array length incorrectly
  • 9c50b8e: 8263587: C2: JVMS not cloned when needs_clone_jvms() is true
  • 68deb24: 8080272: Refactor I/O stream copying to use InputStream.transferTo/readAllBytes and Files.copy

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 openjdk bot added the ready Pull request is ready to be integrated label Mar 16, 2021
@TobiHartmann
Copy link
Member Author

Thanks for the review, Nils!

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Otherwise, the fix looks good!

@@ -778,6 +778,7 @@ bool InstructForm::captures_bottom_type(FormDict &globals) const {
!strcmp(_matrule->_rChild->_opType,"RotateLeft") ||
!strcmp(_matrule->_rChild->_opType,"RotateRight") ||
#if INCLUDE_SHENANDOAHGC
!strcmp(_matrule->_rChild->_opType,"StrInflatedCopy") ||
Copy link
Member

@chhagedorn chhagedorn Mar 16, 2021

Choose a reason for hiding this comment

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

Should not be inside #if INCLUDE_SHENANDOAHGC.

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, good catch, thank you! (That happens when doing last-minute re-ordering ...). Fixed.

@TobiHartmann
Copy link
Member Author

Thanks for the review, Christian!

@TobiHartmann
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this Mar 29, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 29, 2021
@openjdk
Copy link

openjdk bot commented Mar 29, 2021

@TobiHartmann Since your change was applied there have been 216 commits pushed to the master branch:

  • 19a6ac4: 8264142: Remove TRAPS/THREAD parameters for verifier related functions
  • aefc156: 8264179: [TESTBUG] Some compiler tests fail when running without C2
  • 30b4b17: 8264334: Use the blessed modifier order in jdk.jpackage
  • 8ee9a05: 8259623: JfrTypeSet::_subsystem_callback is left dangling after use
  • 1f54ed0: 8264096: slowdebug jvm crashes when StrInflatedCopy match rule is not supported
  • 447e0df: 8263769: simplify PhaseMacroExpand::extract_call_projections()
  • 99b4bab: 8263188: JSSE should fail fast if there isn't supported signature algorithm
  • 6678b01: 8264328: Broken license in javax/swing/JComboBox/8072767/bug8072767.java
  • 2fa6a3c: 8264006: Fix AOT library loading on CPUs with 256-byte dcache line
  • c986457: 8264329: Z cannot be 1 for Diffie-Hellman key agreement
  • ... and 206 more: https://git.openjdk.java.net/jdk/compare/a31a23d5e72c4618b5b67e854ef4909110a1b5b4...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3caea47.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants