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

8287647: VM debug support: find node by pattern in name or dump #8988

Closed
wants to merge 14 commits into from

Conversation

eme64
Copy link
Contributor

@eme64 eme64 commented Jun 2, 2022

Goal
Refactor Node::find, allow not just searching for node->_idx, but also matching for node->Name() and even node->dump().

Proposal
Refactor Node::find into visit_nodes, which visits all nodes and calls a callback on them. This callback can be used to filter by idx (find_node_by_idx, Node::find, find_node etc.). It can also be used to match node names (find_node_by_name) and even node dump (find_node_by_dump).

Thus, I present these additional functions:
Node* find_node_by_name(const char* name): find all nodes matching the name pattern.
Node* find_node_by_dump(const char* pattern): find all nodes matching the pattern.
The nodes are sorted by node idx, and then dumped.

Patterns can contain * characters to match any characters (eg. Con*L matches both ConL and ConvI2L)

Usecase
Find all CastII nodes. Find all Loop nodes. Use find_node_by_name.

Find all all CastII nodes that depend on a rangecheck. Use find_node_by_dump("CastII*range check dependency").
Find all Bool nodes that perform a [ne] check. Use find_node_by_dump("Bool*[ne]").
Find all Phi nodes that are tripcount. Use find_node_by_dump("Phi*tripcount").

Find all Load nodes that are associated with line 301 in some file. Use find_node_by_dump("Load*line 301").

You can probably find more usecases yourself ;)


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-8287647: VM debug support: find node by pattern in name or dump

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8988

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 2, 2022

👋 Welcome back epeter! 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
Copy link

openjdk bot commented Jun 2, 2022

@eme64 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 Jun 2, 2022
@eme64 eme64 changed the title 8287647: VM debug support: find node by name or substring in dump text 8287647: VM debug support: find node by pattern in name or dump Jun 2, 2022
@eme64 eme64 marked this pull request as ready for review June 8, 2022 14:47
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 8, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 8, 2022

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk
Copy link

openjdk bot commented Jun 8, 2022

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

8287647: VM debug support: find node by pattern in name or dump

Reviewed-by: kvn, chagedorn, thartmann

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

  • 33f34d5: 8288207: Enhance MalformedURLException in Uri.parseCompat
  • 444a0d9: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • 08400f1: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
  • fe80721: 8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
  • bbaeacb: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
  • 0f58097: 8288134: Super class names don't have envelopes
  • fb29770: 8287186: JDK modules participating in preview
  • 0530f4e: 8288094: cleanup old _MSC_VER handling

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 Jun 8, 2022
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, looks good! These are useful new find methods to have!

src/hotspot/share/opto/node.cpp Outdated Show resolved Hide resolved
src/hotspot/share/opto/node.cpp Outdated Show resolved Hide resolved
src/hotspot/share/opto/node.cpp Outdated Show resolved Hide resolved
src/hotspot/share/opto/node.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@robcasloz robcasloz left a comment

Choose a reason for hiding this comment

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

Thanks for adding this functionality, I tested it and works well!

src/hotspot/share/opto/node.cpp Outdated Show resolved Hide resolved
Copy link
Member

@TobiHartmann TobiHartmann left a comment

Choose a reason for hiding this comment

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

Very nice!

src/hotspot/share/opto/node.cpp Show resolved Hide resolved
Copy link
Contributor

@robcasloz robcasloz left a comment

Choose a reason for hiding this comment

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

Thanks for addressing my suggestion, Emanuel! Please merge the latest changes from master and re-test: after the integration of JDK-8283775, node_idx_cmp is already defined in node.cpp, leading to a build failure when this patch is applied.

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.

Looks good!

@eme64
Copy link
Contributor Author

eme64 commented Jun 15, 2022

Thanks @TobiHartmann @robcasloz @chhagedorn @vnkozlov For the reviews and suggestions for improvement.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 15, 2022

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

  • 33f34d5: 8288207: Enhance MalformedURLException in Uri.parseCompat
  • 444a0d9: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
  • 08400f1: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
  • fe80721: 8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
  • bbaeacb: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
  • 0f58097: 8288134: Super class names don't have envelopes
  • fb29770: 8287186: JDK modules participating in preview
  • 0530f4e: 8288094: cleanup old _MSC_VER handling

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 15, 2022
@openjdk openjdk bot closed this Jun 15, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 15, 2022
@openjdk
Copy link

openjdk bot commented Jun 15, 2022

@eme64 Pushed as commit 2471f8f.

💡 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
5 participants