Migrate SimpleLanguage to instrumentation API

Author: chumer

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java

@@ -42,6 +42,8 @@
 
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -56,6 +58,7 @@
  */
 @TypeSystemReference(SLTypes.class)
 @NodeInfo(description = "The abstract base node for all expressions")
+@Instrumentable(tags = {InstrumentationTag.EXPRESSION}, factory = SLExpressionNodeWrapper.class)
 public abstract class SLExpressionNode extends SLStatementNode {
 
     public SLExpressionNode(SourceSection src) {

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java

@@ -43,6 +43,8 @@
 import java.io.File;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -53,12 +55,17 @@
  * local variables.
  */
 @NodeInfo(language = "Simple Language", description = "The abstract base node for all statements")
+@Instrumentable(tags = InstrumentationTag.STATEMENT, factory = SLStatementNodeWrapper.class)
 public abstract class SLStatementNode extends Node {
 
     public SLStatementNode(SourceSection src) {
         super(src);
     }
 
+    protected SLStatementNode(SLStatementNode delegate) {
+        super(delegate.getSourceSection());
+    }
+
     /**
      * Execute this node as as statement, where no return value is necessary.
      */
@@ -100,4 +107,5 @@ public static String formatSourceSection(Node node) {
             return String.format("%s:%d%s", sourceName, startLine, estimated ? "~" : "");
         }
     }
+
 }

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLReadPropertyNode.java

@@ -44,6 +44,8 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -62,6 +64,7 @@
  */
 @NodeInfo(shortName = ".")
 @NodeChild(value = "receiver", type = SLExpressionNode.class)
+@Instrumentable(tags = {InstrumentationTag.READ, InstrumentationTag.EXPRESSION})
 public abstract class SLReadPropertyNode extends SLExpressionNode {
 
     @Child private SLReadPropertyCacheNode cacheNode;

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/access/SLWritePropertyNode.java

@@ -45,6 +45,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -63,6 +65,7 @@
  */
 @NodeInfo(shortName = ".=")
 @NodeChildren({@NodeChild(value = "receiver", type = SLExpressionNode.class), @NodeChild(value = "value", type = SLExpressionNode.class)})
+@Instrumentable(tags = {InstrumentationTag.WRITE, InstrumentationTag.EXPRESSION})
 public abstract class SLWritePropertyNode extends SLExpressionNode {
 
     @Child protected SLExpressionNode receiverNode;

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/call/SLInvokeNode.java

@@ -45,6 +45,8 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.interop.ForeignAccess;
 import com.oracle.truffle.api.interop.Message;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -65,6 +67,7 @@
  */
 @NodeInfo(shortName = "invoke")
 @NodeChildren({@NodeChild(value = "functionNode", type = SLExpressionNode.class)})
+@Instrumentable(tags = {InstrumentationTag.CALL, InstrumentationTag.EXPRESSION})
 public abstract class SLInvokeNode extends SLExpressionNode {
     @Children private final SLExpressionNode[] argumentNodes;
     @Child private SLDispatchNode dispatchNode;

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLBlockNode.java

@@ -42,6 +42,8 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -51,6 +53,7 @@
  * A statement node that just executes a list of other statements.
  */
 @NodeInfo(shortName = "block", description = "The node implementing a source code block")
+@Instrumentable(tags = {InstrumentationTag.BLOCK})
 public final class SLBlockNode extends SLStatementNode {
 
     /**

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLFunctionBodyNode.java

@@ -41,6 +41,8 @@
 package com.oracle.truffle.sl.nodes.controlflow;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -57,6 +59,7 @@
  * {@link SLNull#SINGLETON default null value}.
  */
 @NodeInfo(shortName = "body")
+@Instrumentable(tags = {InstrumentationTag.ROOT, InstrumentationTag.BLOCK})
 public final class SLFunctionBodyNode extends SLExpressionNode {
 
     /** The body of the function. */

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/controlflow/SLWhileNode.java

@@ -42,13 +42,16 @@
 
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.sl.nodes.SLExpressionNode;
 import com.oracle.truffle.sl.nodes.SLStatementNode;
 
 @NodeInfo(shortName = "while", description = "The node implementing a while loop")
+@Instrumentable(tags = {InstrumentationTag.LOOP})
 public final class SLWhileNode extends SLStatementNode {
 
     @Child private LoopNode loopNode;

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadArgumentNode.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.truffle.sl.nodes.local;
 
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
@@ -54,6 +56,7 @@
  * specialized and can, e.g., be accessed without unboxing, all arguments are loaded into local
  * variables {@link SLNodeFactory#addFormalParameter in the method prologue}.
  */
+@Instrumentable(tags = {InstrumentationTag.READ, InstrumentationTag.EXPRESSION})
 public class SLReadArgumentNode extends SLExpressionNode {
 
     /** The argument number, i.e., the index into the array of arguments. */

truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/local/SLReadLocalVariableNode.java

@@ -45,6 +45,8 @@
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.Instrumentable;
+import com.oracle.truffle.api.instrumentation.InstrumentationTag;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.sl.nodes.SLExpressionNode;
 
@@ -56,6 +58,7 @@
  * which causes not rewriting. The rewriting code is generated by the Truffle DSL.
  */
 @NodeField(name = "slot", type = FrameSlot.class)
+@Instrumentable(tags = {InstrumentationTag.READ, InstrumentationTag.EXPRESSION})
 public abstract class SLReadLocalVariableNode extends SLExpressionNode {
 
     public SLReadLocalVariableNode(SourceSection src) {