Changeset 255b294 for src/CodeTools/DeclStats.cc

Timestamp:

Feb 24, 2017, 1:28:00 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

23c4aa8

Parents:

c00ddfe (diff), 783dfd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/CodeTools/DeclStats.cc

@@ -62 +62 @@
                         std::map<unsigned, unsigned> p_basic;  ///< Count of decls with each percentage of basic type elements
                         std::map<unsigned, unsigned> p_poly;   ///< Count of decls with each percentage of polymorphic elements
+                        VectorMap<unsigned> n_types;           ///< Count of decls with each number of distinct types in the pack
 
                         ArgPackStats& operator+= (const ArgPackStats& o) {
@@ -69 +70 @@
                                 sum(p_basic, o.p_basic);
                                 sum(p_poly, o.p_poly);
+                                sum(n_types, o.n_types);
                                 
                                 return *this;
@@ -121 +123 @@
                 /// Update arg pack stats based on a declaration list
                 void analyze( Stats& stats, ArgPackStats& pstats, std::list<DeclarationWithType*>& decls ) {
+                        std::unordered_set<std::string> types;
                         unsigned n = 0;
                         unsigned n_basic = 0;
                         unsigned n_poly = 0;
                         for ( auto decl : decls ) {
-                                n += decl->get_type()->size();
-                                if ( BasicType* bt = dynamic_cast<BasicType*>( decl->get_type() ) ) {
+                                Type* dt = decl->get_type();
+
+                                n += dt->size();
+                                
+                                std::stringstream ss;
+                                dt->print( ss );
+                                types.insert( ss.str() );
+
+                                if ( dynamic_cast<BasicType*>( dt ) ) {
                                         ++n_basic;
-                                        std::stringstream ss;
-                                        bt->print( ss );
                                         ++stats.basic_type_names[ ss.str() ];
-                                } else if ( GenPoly::hasPolyBase( decl->get_type() ) ) {
+                                } else if ( GenPoly::hasPolyBase( dt ) ) {
                                         ++n_poly;
                                 } else {
-                                        std::stringstream ss;
-                                        decl->get_type()->print( ss );
                                         ++stats.compound_type_names[ ss.str() ];
                                 }
@@ -146 +152 @@
                                 ++pstats.p_poly[ n_poly*100/n ];
                         }
+                        ++pstats.n_types.at( types.size() );
                 }
                 
@@ -267 +274 @@
                         printAllMap("%_basic_" + name, [&extract](const Stats& stats) { return extract(stats).p_basic; });
                         printAllMap("%_poly_" + name, [&extract](const Stats& stats) { return extract(stats).p_poly; });
+                        printAllMap("n_distinct_types_" + name, [&extract](const Stats& stats) { return extract(stats).n_types; });
                 }