8263591: Two C2 compiler phases with the name "after matching"

[TobiHartmann]

JDK-8223347 added a PHASE_AFTER_MATCHING which is equivalent to PHASE_MATCHING but only printed at level 3 and before node verification:

jdk/src/hotspot/share/opto/compile.cpp

Lines 2757 to 2769 in 20297a1

	print_method(PHASE_AFTER_MATCHING, 3);
	}
	// In debug mode can dump m._nodes.dump() for mapping of ideal to machine
	// nodes. Mapping is only valid at the root of each matched subtree.
	NOT_PRODUCT( verify_graph_edges(); )
	// If you have too many nodes, or if matching has failed, bail out
	check_node_count(0, "out of nodes matching instructions");
	if (failing()) {
	return;
	}
	print_method(PHASE_MATCHING, 2);

I don't think there is any benefit in having both and therefore removed it together with some other dead code (idx is always 0).

Thanks,
Tobias

---

Progress

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

Issue

• JDK-8263591: Two C2 compiler phases with the name "after matching"

Reviewers

• Nils Eliasson (@neliasso - Reviewer) ⚠️ Review applies to 1b887fb
• Christian Hagedorn (@chhagedorn - Reviewer)

Download

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

[bridgekeeper]

👋 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]

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

[mlbridge]

Webrevs

• 02: Full - Incremental (df8cb7a)
• 01: Full - Incremental (1b887fb)
• 00: Full (5f2d398)

[neliasso]

idx is always 0 from the current source, but I use it a lot when developing. I usually add a print_method for every transformation of something, and adding the idx so it is quick to pinpoint in IGV.

[TobiHartmann]

Thanks for the review, Nils. Makes sense, I've updated the PR accordingly.

[neliasso]

Looks good!

[openjdk]

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

8263591: Two C2 compiler phases with the name "after matching"

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.

[TobiHartmann]

Thanks again, Nils!

[chhagedorn]

Looks good.

[TobiHartmann]

I forgot to remove PHASE_AFTER_MATCHING from the enum as well. Updated the PR.

Thanks for the review, Christian!

[TobiHartmann]

/integrate

[openjdk]

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

• 3caea47: 8262739: String inflation C2 intrinsic prevents insertion of anti-dependencies
• 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
• ... and 207 more: https://git.openjdk.java.net/jdk/compare/a31a23d5e72c4618b5b67e854ef4909110a1b5b4...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3516c26.

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