Changeset 4f97937

Timestamp:

Mar 4, 2019, 3:52:46 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:

79eaeb7

Parents:

1bb9a9a

Message:

First draft at timing results, left is better printing and more data

Location:

src

Files:

• Common/Stats/Base.h (modified) (4 diffs)
• Common/Stats/Stats.cc (modified) (1 diff)
• Common/Stats/Time.cc (added)
• Common/Stats/Time.h (modified) (1 diff)
• Common/module.mk (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• main.cc (modified) (1 diff)

src/Common/Stats/Base.h

@@ -16 +16 @@
 #pragma once
 
+#include <cstdint>
+#include <iostream>
+
 namespace Stats {
         namespace Base {
@@ -28 +31 @@
 
                 template<typename func_t>
-                void ForAll(TreeTop & range, size_t level, func_t func, bool destroy = false);
+                void ForAll(TreeTop & range, std::size_t level, func_t func, bool destroy = false);
 
                 class TreeImpl {
@@ -46 +49 @@
 
                         template<typename func_t>
-                        friend void ForAll(TreeTop & range, size_t level, func_t func, bool destroy);
+                        friend void ForAll(TreeTop & range, std::size_t level, func_t func, bool destroy);
                 };
 
@@ -56 +59 @@
 
                 template<typename func_t>
-                inline void ForAll(TreeTop & range, size_t level, func_t func, bool destroy) {
+                inline void ForAll(TreeTop & range, std::size_t level, func_t func, bool destroy) {
                         auto it = range.head;
                         while(it) {

src/Common/Stats/Stats.cc

@@ -32 +32 @@
         namespace Time {
                 bool enabled = false;
-                void print() {}
+                void print();
         }
 

src/Common/Stats/Time.h

@@ -18 +18 @@
 #include "Common/Stats/Base.h"
 
+#if defined( NO_STATISTICS )
+        #define NO_TIME_STATISTICS
+#endif
+
 namespace Stats {
         namespace Time {
-                void StartBlock(const char * const name);
-                void StopBlock();
+#               if defined(NO_TIME_STATISTICS)
+                        inline void StartBlock(const char * const) {}
+                        inline void StopBlock() {}
 
-                void print();
+                        inline void print() {}
 
-                struct BlockGuard {
-                        BlockGuard(const char * const name ) { StartBlock(name); }
-                        ~BlockGuard() { StopBlock(); }
-                };
+                        struct BlockGuard {
+                                BlockGuard(const char * const) {}
+                                ~BlockGuard() {}
+                        };
 
-                template<typename func_t>
-                void TimeBLock(const char * name, func_t func) {
-                        BlockGuard guard(name);
-                        func();
-                }
+                        template<typename func_t>
+                        inline void TimeBLock(const char *, func_t) {}
+#               else
+                        void StartBlock(const char * const name);
+                        void StopBlock();
+
+                        void print();
+
+                        struct BlockGuard {
+                                BlockGuard(const char * const name ) { StartBlock(name); }
+                                ~BlockGuard() { StopBlock(); }
+                        };
+
+                        template<typename func_t>
+                        inline void TimeBLock(const char * name, func_t func) {
+                                BlockGuard guard(name);
+                                func();
+                        }
+#               endif
         }
 }

src/Common/module.mk

@@ -23 +23 @@
       Common/Stats/Heap.cc \
       Common/Stats/Stats.cc \
+      Common/Stats/Time.cc \
       Common/UniqueName.cc
 

src/Makefile.in

@@ -168 +168 @@
         Common/PassVisitor.$(OBJEXT) Common/SemanticError.$(OBJEXT) \
         Common/Stats/Counter.$(OBJEXT) Common/Stats/Heap.$(OBJEXT) \
-        Common/Stats/Stats.$(OBJEXT) Common/UniqueName.$(OBJEXT)
+        Common/Stats/Stats.$(OBJEXT) Common/Stats/Time.$(OBJEXT) \
+        Common/UniqueName.$(OBJEXT)
 am__objects_3 = ControlStruct/ForExprMutator.$(OBJEXT) \
         ControlStruct/LabelFixer.$(OBJEXT) \
@@ -567 +568 @@
       Common/Stats/Heap.cc \
       Common/Stats/Stats.cc \
+      Common/Stats/Time.cc \
       Common/UniqueName.cc
 
@@ -741 +743 @@
         Common/Stats/$(DEPDIR)/$(am__dirstamp)
 Common/Stats/Stats.$(OBJEXT): Common/Stats/$(am__dirstamp) \
+        Common/Stats/$(DEPDIR)/$(am__dirstamp)
+Common/Stats/Time.$(OBJEXT): Common/Stats/$(am__dirstamp) \
         Common/Stats/$(DEPDIR)/$(am__dirstamp)
 Common/UniqueName.$(OBJEXT): Common/$(am__dirstamp) \
@@ -1128 +1132 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Stats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Common/Stats/$(DEPDIR)/Time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/Keywords.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Concurrency/$(DEPDIR)/Waitfor.Po@am__quote@

src/main.cc

@@ -79 +79 @@
         if ( errorp ) { cerr << name << endl; } \
         NewPass(name);                          \
-        pass;
+        Stats::Time::StartBlock(name);          \
+        pass;                                   \
+        Stats::Time::StopBlock();
 
 LinkageSpec::Spec linkage = LinkageSpec::Cforall;