Changeset 31868da

Timestamp:

Feb 28, 2017, 1:48:56 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

fd061ed3

Parents:

356c62a

Message:

Start work on adding expression statistics to DeclStats? pass

File:

• src/CodeTools/DeclStats.cc (modified) (5 diffs)

src/CodeTools/DeclStats.cc

@@ -130 +130 @@
                 std::unordered_set<std::string> seen_names;  ///< Stores manglenames already seen to avoid double-counting
                 Stats total;
+                /// Count of expressions with (depth, fanout)
+                std::map<std::pair<unsigned, unsigned>, unsigned> exprs_by_fanout_at_depth;
 
                 /// Update arg pack stats based on a declaration list
@@ -179 +181 @@
                         analyze( stats, seen, params, fnTy->get_parameters() );
                         analyze( stats, seen, returns, fnTy->get_returnVals() );
+                }
+
+                void analyzeExpr( UntypedExpr *expr, unsigned depth ) {
+                        auto& args = expr->get_args();
+                        unsigned fanout = args.size();
+                        ++exprs_by_fanout_at_depth[ std::make_pair(depth, fanout) ];
+                        for ( Expression* arg : args ) {
+                                if ( UntypedExpr *uearg = dynamic_cast<UntypedExpr*>(arg) ) {
+                                        analyzeExpr( uearg, depth+1 );
+                                }
+                        }
                 }
 
@@ -217 +230 @@
                 }
 
+                virtual void visit( UntypedExpr *expr ) {
+                        analyzeExpr( expr, 0 );
+                }
+
         private:
                 template<typename F>
@@ -297 +314 @@
                         printAllMap("n_distinct_types_" + name, [&extract](const Stats& stats) { return extract(stats).n_types; });
                         printAllMap("%_new_types_in_" + name, [&extract](const Stats& stats) { return extract(stats).p_new; });
+                }
+
+                void printPairMap( const std::string& name, 
+                                   const std::map<std::pair<unsigned, unsigned>, unsigned>& map ) {
+                        for ( const auto& entry : map ) {
+                                const auto& key = entry.first;
+                                std::cout << "\"" << name << "\"," << key.first << "," << key.second << "," 
+                                          << entry.second << std::endl;
+                        }
                 }
                 
@@ -322 +348 @@
                         printAllPack("assn_params", [](const Stats& stats) { return stats.assn_params; });
                         printAllPack("assn_returns", [](const Stats& stats) { return stats.assn_returns; });
+                        std::cout << std::endl;
+
+                        printPairMap("exprs_by_depth+fanout", exprs_by_fanout_at_depth);
                 }
         };