Mercurial > hg > truffle

changeset 12420:c1910f6400d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove truffle.printer
author Matthias Grimmer <grimmer@ssw.jku.at>
date Tue, 15 Oct 2013 17:41:30 +0200
parents 5b1a2e8e82d6
children d837abecd503
files graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java mx/projects
diffstat 4 files changed, 2 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java	Tue Oct 15 13:03:54 2013 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/PartialEvaluationTest.java	Tue Oct 15 17:41:30 2013 +0200
@@ -22,8 +22,6 @@
  */
 package com.oracle.graal.truffle.test;
 
-import static com.oracle.graal.truffle.TruffleCompilerOptions.*;
-
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -44,7 +42,6 @@
 import com.oracle.graal.phases.util.*;
 import com.oracle.graal.printer.*;
 import com.oracle.graal.truffle.*;
-import com.oracle.graal.truffle.printer.*;
 import com.oracle.graal.virtual.phases.ea.*;
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
@@ -136,10 +133,6 @@
                 new DeadCodeEliminationPhase().apply(resultGraph);
                 new PartialEscapePhase(true, canonicalizer).apply(resultGraph, context);
 
-                if (TruffleInlinePrinter.getValue()) {
-                    InlinePrinterProcessor.printTree();
-                }
-
                 return resultGraph;
             }
 
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Tue Oct 15 13:03:54 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Tue Oct 15 17:41:30 2013 +0200
@@ -55,8 +55,6 @@
 import com.oracle.graal.truffle.nodes.frame.*;
 import com.oracle.graal.truffle.nodes.frame.NewFrameNode.VirtualOnlyInstanceNode;
 import com.oracle.graal.truffle.phases.*;
-import com.oracle.graal.truffle.printer.*;
-import com.oracle.graal.truffle.printer.method.*;
 import com.oracle.graal.virtual.phases.ea.*;
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
@@ -107,10 +105,6 @@
 
         final StructuredGraph graph = new StructuredGraph(executeHelperMethod);
 
-        if (TruffleInlinePrinter.getValue()) {
-            InlinePrinterProcessor.initialize();
-        }
-
         Debug.scope("createGraph", graph, new Runnable() {
 
             @Override
@@ -140,11 +134,6 @@
 
                 new VerifyFrameDoesNotEscapePhase().apply(graph, false);
 
-                if (TruffleInlinePrinter.getValue()) {
-                    InlinePrinterProcessor.printTree();
-                    InlinePrinterProcessor.reset();
-                }
-
                 if (TraceTruffleCompilationDetails.getValue() && constantReceivers != null) {
                     DebugHistogram histogram = Debug.createHistogram("Expanded Truffle Nodes");
                     for (Constant c : constantReceivers) {
@@ -196,9 +185,6 @@
             for (MethodCallTargetNode methodCallTargetNode : graph.getNodes(MethodCallTargetNode.class)) {
                 InvokeKind kind = methodCallTargetNode.invokeKind();
                 if (kind == InvokeKind.Static || (kind == InvokeKind.Special && (methodCallTargetNode.receiver().isConstant() || methodCallTargetNode.receiver() instanceof NewFrameNode))) {
-                    if (TruffleInlinePrinter.getValue()) {
-                        InlinePrinterProcessor.addInlining(MethodHolder.getNewTruffleExecuteMethod(methodCallTargetNode));
-                    }
                     if (TraceTruffleCompilationDetails.getValue() && kind == InvokeKind.Special) {
                         ConstantNode constantNode = (ConstantNode) methodCallTargetNode.arguments().first();
                         constantReceivers.add(constantNode.asConstant());
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Tue Oct 15 13:03:54 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Tue Oct 15 17:41:30 2013 +0200
@@ -79,8 +79,6 @@
     @Option(help = "")
     public static final OptionValue<Boolean> TraceTruffleCacheDetails = new OptionValue<>(false);
     @Option(help = "")
-    public static final OptionValue<Boolean> TruffleInlinePrinter = new OptionValue<>(false);
-    @Option(help = "")
     public static final OptionValue<Boolean> TraceTruffleCompilationExceptions = new OptionValue<>(true);
     @Option(help = "")
     public static final OptionValue<Boolean> TruffleCompilationExceptionsAreFatal = new OptionValue<>(true);
--- a/mx/projects	Tue Oct 15 13:03:54 2013 +0200
+++ b/mx/projects	Tue Oct 15 17:41:30 2013 +0200
@@ -28,7 +28,7 @@
 library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.2.jar
 
 distribution@GRAAL@path=graal.jar
-distribution@GRAAL@dependencies=com.oracle.graal.hotspot.amd64,com.oracle.graal.hotspot.ptx,com.oracle.graal.truffle,com.oracle.graal.truffle.printer,com.oracle.graal.hotspot.sparc,com.oracle.graal.hotspot,com.oracle.graal.compiler.hsail
+distribution@GRAAL@dependencies=com.oracle.graal.hotspot.amd64,com.oracle.graal.hotspot.ptx,com.oracle.graal.truffle,com.oracle.graal.hotspot.sparc,com.oracle.graal.hotspot,com.oracle.graal.compiler.hsail
 
 # graal.api.runtime
 project@com.oracle.graal.api.runtime@subDir=graal
@@ -613,7 +613,7 @@
 # graal.truffle
 project@com.oracle.graal.truffle@subDir=graal
 project@com.oracle.graal.truffle@sourceDirs=src
-project@com.oracle.graal.truffle@dependencies=com.oracle.truffle.api,com.oracle.graal.truffle.printer,com.oracle.graal.hotspot
+project@com.oracle.graal.truffle@dependencies=com.oracle.truffle.api,com.oracle.graal.hotspot
 project@com.oracle.graal.truffle@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.truffle@javaCompliance=1.7
 project@com.oracle.graal.truffle@workingSets=Graal,Truffle
@@ -626,12 +626,4 @@
 project@com.oracle.graal.truffle.test@javaCompliance=1.7
 project@com.oracle.graal.truffle.test@workingSets=Graal,Truffle,Test
 
-# graal.truffle.printer
-project@com.oracle.graal.truffle.printer@subDir=graal
-project@com.oracle.graal.truffle.printer@sourceDirs=src
-project@com.oracle.graal.truffle.printer@dependencies=com.oracle.graal.nodes
-project@com.oracle.graal.truffle.printer@checkstyle=com.oracle.graal.graph
-project@com.oracle.graal.truffle.printer@javaCompliance=1.7
-project@com.oracle.graal.truffle.printer@workingSets=Graal,Truffle
 
-