Mercurial > hg > truffle

changeset 3517:dd26b98b9723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reduce number of nodes that implement GVN (because FloatingNode class implements it already)
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 08 Aug 2011 23:45:59 +0200
parents 9b59afa78775
children 0ffcce571d09
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BooleanNode.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/MathIntrinsic.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ReadNode.java graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/CurrentThread.java graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java
diffstat 12 files changed, 15 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ArrayLength.java	Mon Aug 08 23:45:59 2011 +0200
@@ -33,10 +33,10 @@
 /**
  * The {@code ArrayLength} instruction gets the length of an array.
  */
-public final class ArrayLength extends FloatingNode implements Node.GlobalValueNumberable {
+public final class ArrayLength extends FloatingNode {
     private static final ArrayLengthCanonicalizerOp CANONICALIZER = new ArrayLengthCanonicalizerOp();
 
-    @Input    private Value array;
+    @Input private Value array;
 
     public Value array() {
         return array;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Binary.java	Mon Aug 08 23:45:59 2011 +0200
@@ -29,7 +29,7 @@
 /**
  * The {@code Op2} class is the base of arithmetic and logic operations with two inputs.
  */
-public abstract class Binary extends FloatingNode implements Node.GlobalValueNumberable {
+public abstract class Binary extends FloatingNode {
 
     @Input private Value x;
     @Input private Value y;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BooleanNode.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/BooleanNode.java	Mon Aug 08 23:45:59 2011 +0200
@@ -26,7 +26,7 @@
 import com.sun.cri.ci.*;
 
 
-public abstract class BooleanNode extends FloatingNode implements Node.GlobalValueNumberable {
+public abstract class BooleanNode extends FloatingNode {
 
     public BooleanNode(CiKind kind, Graph graph) {
         super(kind, graph);
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Convert.java	Mon Aug 08 23:45:59 2011 +0200
@@ -30,7 +30,7 @@
 /**
  * The {@code Convert} class represents a conversion between primitive types.
  */
-public final class Convert extends FloatingNode implements Node.GlobalValueNumberable {
+public final class Convert extends FloatingNode {
     @Input private Value value;
 
     @Data public final int opcode;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/CreateVectorNode.java	Mon Aug 08 23:45:59 2011 +0200
@@ -32,7 +32,7 @@
 import com.sun.cri.ci.*;
 
 
-public final class CreateVectorNode extends AbstractVectorNode implements Node.GlobalValueNumberable {
+public final class CreateVectorNode extends AbstractVectorNode {
     @Input private Value length;
 
     public Value length() {
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/GuardNode.java	Mon Aug 08 23:45:59 2011 +0200
@@ -30,7 +30,7 @@
 import com.sun.cri.ci.*;
 
 
-public final class GuardNode extends FloatingNode implements Node.GlobalValueNumberable {
+public final class GuardNode extends FloatingNode {
     @Input private FixedNode anchor;
     @Input private BooleanNode node;
 
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/LoopCounter.java	Mon Aug 08 23:45:59 2011 +0200
@@ -28,12 +28,9 @@
 
 
 public final class LoopCounter extends FloatingNode {
-
-    @Input    private Value init;
-
-    @Input    private Value stride;
-
-    @Input    private LoopBegin loopBegin;
+    @Input private Value init;
+    @Input private Value stride;
+    @Input private LoopBegin loopBegin;
 
     public Value init() {
         return init;
@@ -78,7 +75,5 @@
     @Override
     public void print(LogStream out) {
         out.print("loopcounter [").print(init()).print(",+").print(stride()).print("]");
-
     }
-
 }
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/MathIntrinsic.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/MathIntrinsic.java	Mon Aug 08 23:45:59 2011 +0200
@@ -23,9 +23,8 @@
 package com.oracle.max.graal.compiler.ir;
 
 import com.oracle.max.graal.graph.*;
-import com.oracle.max.graal.graph.Node.*;
 
-public class MathIntrinsic extends FloatingNode implements GlobalValueNumberable {
+public class MathIntrinsic extends FloatingNode {
 
     @Input private Value x;
     @Data private final Operation operation;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/Negate.java	Mon Aug 08 23:45:59 2011 +0200
@@ -31,7 +31,7 @@
 /**
  * The {@code NegateOp} instruction negates its operand.
  */
-public final class Negate extends FloatingNode implements Node.GlobalValueNumberable {
+public final class Negate extends FloatingNode {
     private static final NegateCanonicalizerOp CANONICALIZER = new NegateCanonicalizerOp();
 
     @Input    private Value x;
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ReadNode.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/ReadNode.java	Mon Aug 08 23:45:59 2011 +0200
@@ -27,7 +27,7 @@
 import com.sun.cri.ci.*;
 
 
-public final class ReadNode extends AccessNode implements Node.GlobalValueNumberable {
+public final class ReadNode extends AccessNode implements Node.ValueNumberable {
 
     public ReadNode(CiKind kind, Value object, LocationNode location, Graph graph) {
         super(kind, object, location, graph);
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/CurrentThread.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/CurrentThread.java	Mon Aug 08 23:45:59 2011 +0200
@@ -30,7 +30,7 @@
 import com.sun.cri.ci.*;
 
 
-public final class CurrentThread extends FloatingNode implements Node.GlobalValueNumberable {
+public final class CurrentThread extends FloatingNode {
 
     private int threadObjectOffset;
 
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java	Mon Aug 08 23:27:54 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/nodes/FPConversionNode.java	Mon Aug 08 23:45:59 2011 +0200
@@ -31,7 +31,7 @@
 import com.sun.cri.ci.*;
 
 
-public final class FPConversionNode extends FloatingNode implements Node.GlobalValueNumberable {
+public final class FPConversionNode extends FloatingNode {
     @Input private Value value;
 
     public Value value() {