Changeset 3c0d4cd

Timestamp:

Mar 5, 2019, 2:17:45 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:

c884f2d

Parents:

79eaeb7

Message:

Fixed/implemented % of parent printing in timing sections

Location:

src

Files:

• Common/Stats/Time.cc (modified) (6 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/Common/Stats/Time.cc

@@ -33 +33 @@
                         typedef  std::chrono::time_point<std::chrono::high_resolution_clock> point_t;
                         std::chrono::duration<double> total;
-                        std::chrono::duration<double> parent;
 
                         point_t global_begin;
+
+                        size_t prevl = 0;
+                        size_t currl = 0;
 
                         template<typename T>
@@ -85 +87 @@
 
                                 virtual void print(std::ostream & os) override {
+                                        if(currl > prevl) {
+                                                parents.push(last);
+                                        } else if(currl < prevl) {
+                                                parents.pop();
+                                        } else {
+                                                last = end - begin;
+                                        }
+
                                         assert(finished);
                                         std::chrono::duration<double> diff = end - begin;
                                         os << diff << " | ";
-                                        os << std::setw(7) << std::setprecision(0);
-                                        os << size_t(100.0 * diff.count() / total.count()) << "% | ";
+                                        if(parents.empty()) {
+                                                os << "     N/A | ";
+                                        } else {
+                                                os << std::setw(7) << std::setprecision(0);
+                                                os << size_t(100.0 * diff.count() / parents.top().count()) << "% | ";
+                                        }
                                         os << std::setw(5) << std::setprecision(0);
                                         os << size_t(100.0 * diff.count() / total.count()) << "% ";
@@ -111 +125 @@
                                 point_t begin;
                                 point_t end;
+
+                                static std::chrono::duration<double> last;
+                                static std::stack<std::chrono::duration<double>> parents;
                         };
 
                         std::stack<TimerNode *> nodes;
+
+                        std::chrono::duration<double> TimerNode::last = {};
+                        std::stack<std::chrono::duration<double>> TimerNode::parents = {};
 
                         void StartGlobal() {
@@ -139 +159 @@
                                 auto global_end = std::chrono::high_resolution_clock::now();
                                 total = global_end - global_begin;
-                                parent = total;
 
                                 size_t nc = 0;
@@ -161 +180 @@
 
                                 Base::ForAll(top, 0, [&](Base::TreeImpl * node, size_t level) {
+                                        currl = level;
                                         std::cerr << std::string(level * 4, ' ');
                                         std::cerr << node->name;
@@ -168 +188 @@
                                         std::cerr << " |";
                                         std::cerr << '\n';
+                                        prevl = level;
                                 }, true);
 

src/SymTab/Validate.cc

@@ -304 +304 @@
                 PassVisitor<FixQualifiedTypes> fixQual;
 
-                Stats::Heap::newPass("validate-A");
-                acceptAll( translationUnit, hoistDecls );
-                ReplaceTypedef::replaceTypedef( translationUnit );
-                ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
-                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
-                Stats::Heap::newPass("validate-B");
-                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
-                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
-                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
-                EliminateTypedef::eliminateTypedef( translationUnit ); //
-                Stats::Heap::newPass("validate-C");
-                acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
-                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
-                ReturnChecker::checkFunctionReturns( translationUnit );
-                InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
-                Stats::Heap::newPass("validate-D");
-                Concurrency::applyKeywords( translationUnit );
-                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
-                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
-                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
-                Stats::Heap::newPass("validate-E");
-                Concurrency::implementMutexFuncs( translationUnit );
-                Concurrency::implementThreadStarter( translationUnit );
-                mutateAll( translationUnit, compoundliteral );
-                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
-                Stats::Heap::newPass("validate-F");
-                FixObjectType::fix( translationUnit );
-                ArrayLength::computeLength( translationUnit );
-                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
-                mutateAll( translationUnit, labelAddrFixer );
-                Validate::handleAttributes( translationUnit );
+                {
+                        Stats::Heap::newPass("validate-A");
+                        Stats::Time::BlockGuard guard("validate-A");
+                        acceptAll( translationUnit, hoistDecls );
+                        ReplaceTypedef::replaceTypedef( translationUnit );
+                        ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                        acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
+                }
+                {
+                        Stats::Heap::newPass("validate-B");
+                        Stats::Time::BlockGuard guard("validate-B");
+                        acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
+                        mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
+                        HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                        EliminateTypedef::eliminateTypedef( translationUnit ); //
+                }
+                {
+                        Stats::Heap::newPass("validate-C");
+                        Stats::Time::BlockGuard guard("validate-C");
+                        acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
+                        VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
+                        ReturnChecker::checkFunctionReturns( translationUnit );
+                        InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
+                }
+                {
+                        Stats::Heap::newPass("validate-D");
+                        Stats::Time::BlockGuard guard("validate-D");
+                        Concurrency::applyKeywords( translationUnit );
+                        acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
+                        ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
+                        autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
+                }
+                {
+                        Stats::Heap::newPass("validate-E");
+                        Stats::Time::BlockGuard guard("validate-E");
+                        Concurrency::implementMutexFuncs( translationUnit );
+                        Concurrency::implementThreadStarter( translationUnit );
+                        mutateAll( translationUnit, compoundliteral );
+                        ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
+                }
+                {
+                        Stats::Heap::newPass("validate-F");
+                        Stats::Time::BlockGuard guard("validate-F");
+                        FixObjectType::fix( translationUnit );
+                        ArrayLength::computeLength( translationUnit );
+                        acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                        mutateAll( translationUnit, labelAddrFixer );
+                        Validate::handleAttributes( translationUnit );
+                }
         }
 

src/main.cc

@@ -194 +194 @@
                 } // if
 
+                Stats::Time::StartGlobal();
                 NewPass("Parse");
-                Stats::Time::StartGlobal();
+                Stats::Time::StartBlock("Parse");
 
                 // read in the builtins, extras, and the prelude
@@ -247 +248 @@
                 // works okay for now.
                 CodeTools::fillLocations( translationUnit );
+                Stats::Time::StopBlock();
 
                 // add the assignment statement after the initialization of a type parameter