RFR: 8327109: Refactor data graph cloning used in create_new_if_for_predicate() into separate class [v3]

Christian Hagedorn chagedorn at openjdk.org
Mon Mar 4 09:24:06 UTC 2024


> In the review process of https://github.com/openjdk/jdk/pull/16877, we identified an existing issue in `create_bool_from_template_assertion_predicate()` which is also still present in the refactoring of https://github.com/openjdk/jdk/pull/16877: In rare cases, we could endlessly re-process nodes in the DFS walk since a visited set is missing. This needs to be addressed.
> 
> #### Redo refactoring of `create_bool_from_template_assertion_predicate()`
> On top of that bug, the refactored version of https://github.com/openjdk/jdk/pull/16877 is still quite complicated to understand since it tries to do multiple steps simultaneously. We've decided to redo the refactoring and better separate the steps to simplify the algorithm. By doing so, we also want to fix the existing bug. This work is split into three separate RFEs (JDK-8327109, JDK-8327110, and JDK-8327111).
> 
> #### Share data graph cloning code - start from existing code 
> This first PR starts with the existing code found in `clone_nodes_with_same_ctrl()` which is called by `create_new_if_for_predicate()`. `clone_nodes_with_same_ctrl()` already does the data graph cloning in 3 separate steps which can be used as foundation:
> 
> 1. Collect data nodes to clone by using a node filter
> 2. Clone the collected nodes (their data and control inputs still point to the old nodes)
> 3. Fix the cloned data node inputs pointing to the old nodes to the cloned inputs by using an old->new mapping. In this pass, also fix the control inputs of any pinned data node from the old uncommon projection to the new one.
> 
> #### Shared data graph cloning class
> Some of these steps above are shared with the data graph cloning done in `create_bool_from_template_assertion_predicate()` (refactored in JDK-8327110 and JDK-8327111). We therefore extract them in this patch such that we can reuse it in the refactoring for `create_bool_from_template_assertion_predicate()` later. We create a new `DataNodeGraph` class which does the following (to be shared) cloning of a data graph:
> 
> 1. Take a collection of data nodes (the collection step is different in `clone_nodes_with_same_ctrl()` compared to `create_bool_from_template_assertion_predicate()` and thus cannot be shared) and clone them. [Same as step 2 above]
>  2. Fix the cloned data node inputs pointing to the old nodes to the cloned inputs by using an old->new mapping. [Same as first part of step 3 above but drop the second part of rewiring control inputs which is specific to `clone_nodes_with_same_ctrl()`]
> 
> `...

Christian Hagedorn has updated the pull request incrementally with one additional commit since the last revision:

  Remove dead declaration

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/18080/files
  - new: https://git.openjdk.org/jdk/pull/18080/files/a569132e..79b8b270

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=18080&range=02
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=18080&range=01-02

  Stats: 1 line in 1 file changed: 0 ins; 1 del; 0 mod
  Patch: https://git.openjdk.org/jdk/pull/18080.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/18080/head:pull/18080

PR: https://git.openjdk.org/jdk/pull/18080


More information about the hotspot-compiler-dev mailing list