Mercurial > hg > graal-jvmci-8
changeset 16475:6ce37ad3ea47
simplify MemoryPhiNodes and GuardPhiNodes with single values
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Fri, 11 Jul 2014 13:40:01 +0200 |
parents | 000a1a014bd4 |
children | d8d90184ec66 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java |
diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Fri Jul 11 02:57:34 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardPhiNode.java Fri Jul 11 13:40:01 2014 +0200 @@ -26,6 +26,9 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodes.extended.*; +/** + * Guard {@link PhiNode}s merge guard dependencies at control flow merges. + */ @NodeInfo(nameTemplate = "GuardPhi({i#values})", allowedUsageTypes = {InputType.Guard}) public class GuardPhiNode extends PhiNode implements GuardingNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java Fri Jul 11 02:57:34 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java Fri Jul 11 13:40:01 2014 +0200 @@ -28,7 +28,7 @@ import com.oracle.graal.nodes.extended.*; /** - * The {@code PhiNode} represents the merging of dataflow in the memory graph. + * Memory {@code PhiNode}s merge memory dependencies at control flow merges. */ @NodeInfo(nameTemplate = "MemoryPhi({i#values}) {p#locationIdentity/s}", allowedUsageTypes = {InputType.Memory}) public class MemoryPhiNode extends PhiNode implements MemoryNode {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Jul 11 02:57:34 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PhiNode.java Fri Jul 11 13:40:01 2014 +0200 @@ -27,7 +27,13 @@ import com.oracle.graal.graph.spi.*; import com.oracle.graal.nodes.calc.*; -public abstract class PhiNode extends FloatingNode { +/** + * {@code PhiNode}s represent the merging of edges at a control flow merges ({@link MergeNode} or + * {@link LoopBeginNode}). For a {@link MergeNode}, the order of the values corresponds to the order + * of the ends. For {@link LoopBeginNode}s, the first value corresponds to the loop's predecessor, + * while the rest of the values correspond to the {@link LoopEndNode}s. + */ +public abstract class PhiNode extends FloatingNode implements Simplifiable { @Input(InputType.Association) private MergeNode merge;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Fri Jul 11 02:57:34 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValuePhiNode.java Fri Jul 11 13:40:01 2014 +0200 @@ -28,8 +28,7 @@ import com.oracle.graal.nodes.type.*; /** - * The {@code PhiNode} represents the merging of dataflow in the graph. It refers to a merge and a - * variable. + * Value {@link PhiNode}s merge data flow values at control flow merges. */ @NodeInfo(nameTemplate = "ValuePhi({i#values})") public class ValuePhiNode extends PhiNode implements Simplifiable {