Changeset 675716e for src/Common

Timestamp:

Mar 1, 2019, 3:10:09 PM (6 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

1cb7fab2

Parents:

8e70823

Message:

Instrumented PassVisitor? to print average/max depth

Location:

src/Common

Files:

• PassVisitor.cc (added)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (10 diffs)
• Stats/Base.h (modified) (1 diff)
• Stats/Counter.cc (modified) (1 diff)
• Stats/Counter.h (modified) (1 diff)
• module.mk (modified) (1 diff)

src/Common/PassVisitor.h

@@ -5 +5 @@
 #include <stack>
 
+#include "Common/Stats.h"
 #include "Common/utility.h"
 
@@ -426 +427 @@
 };
 
+#include "Common/Stats.h"
+
+extern struct PassVisitorStats {
+        size_t depth = 0;
+        Stats::Counters::MaxCounter<double> * max = nullptr;
+        Stats::Counters::AverageCounter<double> * avg = nullptr;
+} pass_visitor_stats;
+
 #include "SynTree/TypeSubstitution.h"
 #include "PassVisitor.impl.h"

src/Common/PassVisitor.impl.h

@@ -67 +67 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
+
+
                 // splice in new declarations after previous decl
                 if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
@@ -83 +88 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -94 +100 @@
         SemanticErrorException errors;
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
@@ -109 +118 @@
                 if ( !empty( beforeDecls ) ) { decls.splice( i, *beforeDecls ); }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -126 +136 @@
         if ( ! visitor.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -135 +149 @@
                 }
         }
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -153 +168 @@
         if ( ! mutator.get_visit_children() ) return;
         SemanticErrorException errors;
+
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
@@ -163 +182 @@
                 } // try
         } // for
+        pass_visitor_stats.depth--;
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -185 +205 @@
         DeclList_t* afterDecls  = get_afterDecls();
 
+        pass_visitor_stats.depth++;
+        pass_visitor_stats.max->push(pass_visitor_stats.depth);
+        pass_visitor_stats.avg->push(pass_visitor_stats.depth);
         for ( std::list< Statement* >::iterator i = statements.begin(); i != statements.end(); ++i ) {
 
@@ -202 +225 @@
                 if ( !empty( beforeStmts ) ) { statements.splice( i, *beforeStmts ); }
         }
+        pass_visitor_stats.depth--;
 
         if ( !empty( afterDecls ) ) { splice( std::back_inserter( statements ), afterDecls); }

src/Common/Stats/Base.h

@@ +1 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2019 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// Heap.h --
+//
+// Author           : Thierry Delisle
+// Created On       : Fri Mar 03 14:53:53 2019
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
 #pragma once
 

src/Common/Stats/Counter.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Counter.cc --
 //
 // Author           : Thierry Delisle

src/Common/Stats/Counter.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Heap.h --
+// Counter.h --
 //
 // Author           : Thierry Delisle

src/Common/module.mk

@@ -17 +17 @@
 SRC_COMMON = \
       Common/Assert.cc \
+      Common/Eval.cc \
+      Common/PassVisitor.cc \
+      Common/SemanticError.cc \
       Common/Stats/Heap.cc \
       Common/Stats/Counter.cc \
-      Common/Eval.cc \
-      Common/SemanticError.cc \
       Common/UniqueName.cc