Changes in / [7a560c1:99b75cab]

Location:

src

Files:

• CodeTools/DeclStats.cc (modified) (1 diff)
• CodeTools/DeclStats.h (modified) (1 diff)
• Common/ScopedMap.h (modified) (2 diffs)
• Common/VectorMap.h (deleted)
• main.cc (modified) (2 diffs)

src/CodeTools/DeclStats.cc

@@ -17 +17 @@
 
 #include <iostream>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-#include "Common/VectorMap.h"
-#include "Parser/LinkageSpec.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Visitor.h"
 
 namespace CodeTools {
-        
-        class DeclStats : public Visitor {
-                struct Stats {
-                        unsigned n_decls;     ///< Total number of declarations
-                        unsigned mono_decls;  ///< Monomorphic declarations
-                        unsigned poly_decls;  ///< Polymorphic declarations
-                        /// Count of declarations with each name
-                        std::unordered_map<std::string, unsigned> by_name;
-                        /// Count of declarations with each number of parameters
-                        VectorMap<unsigned> by_params;
-                        /// Count of declarations with each number of return types
-                        VectorMap<unsigned> by_returns;
-
-                        Stats() : n_decls(0), mono_decls(0), poly_decls(0), by_name() {}
-
-                        Stats& operator+= (const Stats& o) {
-                                n_decls += o.n_decls;
-                                mono_decls += o.mono_decls;
-                                poly_decls += o.poly_decls;
-                                
-                                for ( auto& entry : o.by_name ) {
-                                        by_name[ entry.first ] += entry.second;
-                                }
-                                
-                                by_params.reserve( o.by_params.size() );
-                                for ( unsigned i = 0; i < o.by_params.size(); ++i ) {
-                                        by_params[i] += o.by_params[i];
-                                }
-
-                                by_returns.reserve( o.by_returns.size() );
-                                for ( unsigned i = 0; i < o.by_returns.size(); ++i ) {
-                                        by_returns[i] += o.by_returns[i];
-                                }
-
-                                return *this;
-                        }
-                };
-
-                Stats for_linkage[LinkageSpec::NoOfSpecs];   ///< Stores separate stats per linkage
-                std::unordered_set<std::string> seen_names;  ///< Stores manglenames already seen to avoid double-counting
-                Stats total;
-
-        public:
-                using Visitor::visit;
-
-                virtual void visit( FunctionDecl *decl ) {
-                        // skip if already seen declaration for this function
-                        const std::string& mangleName = decl->get_mangleName().empty() ? decl->get_name() : decl->get_mangleName();
-                        if ( ! seen_names.insert( mangleName ).second ) return;
-                        
-                        Stats& stats = for_linkage[ decl->get_linkage() ];
-
-                        ++stats.n_decls;
-                        FunctionType* fnTy = decl->get_functionType();
-                        if ( fnTy->get_forall().empty() ) ++stats.mono_decls; else ++stats.poly_decls;
-
-                        ++stats.by_name[ decl->get_name() ];
-
-                        unsigned n_params = 0;
-                        for ( auto pdecl : fnTy->get_parameters() ) { n_params += pdecl->get_type()->size(); }
-                        ++stats.by_params.at( n_params );
-
-                        unsigned n_returns = 0;
-                        for ( auto rdecl : fnTy->get_returnVals() ) { n_returns += rdecl->get_type()->size(); }
-                        ++stats.by_returns.at( n_returns );
-                }
-
-        private:
-                template<typename F>
-                void printAll( const char* name, F extract ) {
-                        std::cout << "\"" << name << "\",";
-                        for ( const auto& stats : for_linkage ) {
-                                std::cout << "," << extract(stats);
-                        }
-                        std::cout << "," << extract(total) << std::endl;
-                }
-
-                template<typename F>
-                void printAllMap( const char* name, F extract ) {
-                        for ( const auto& entry : extract(total) ) {
-                                const auto& key = entry.first;
-                                std::cout << "\"" << name << "\"," << key;
-                                for ( const auto& stats : for_linkage ) {
-                                        const auto& map = extract(stats);
-                                        auto it = map.find( key );
-                                        if ( it == map.end() ) std::cout << ",0";
-                                        else std::cout << "," << it->second;
-                                }
-                                std::cout  << "," << entry.second << std::endl;
-                        }
-                }
-
-                template<typename F>
-                void printAllHisto( const char* name, F extract ) {
-                        VectorMap<unsigned> histos[LinkageSpec::NoOfSpecs];
-                        VectorMap<unsigned> thisto;
-
-                        for ( const auto& entry : extract(total) ) { ++thisto.at( entry.second ); }
-
-                        for ( unsigned i = 0; i < LinkageSpec::NoOfSpecs; ++i ) {
-                                // can't be a higher count in one of the sub-histograms than the total
-                                histos[i].reserve( thisto.size() );
-
-                                for ( const auto& entry : extract(for_linkage[i]) ) { ++histos[i][entry.second]; }
-                        }
-
-                        for ( unsigned i = 0; i < thisto.size(); ++i ) {
-                                std::cout << "\"" << name << "\"," << i;
-                                for ( const auto& histo : histos ) {
-                                        std::cout << "," << histo[i];
-                                }
-                                std::cout << "," << thisto[i] << std::endl;
-                        }
-                }
-                
-        public:
-                void print() {
-                        for ( auto& stats : for_linkage ) {
-                                total += stats;
-                        }
-
-                        std::cout << ",,\"intrinsic\",\"Cforall\",\"C\",\"autogen\",\"builtin\",\"TOTAL\"" << std::endl;
-
-                        printAll("mono_decls", [](const Stats& stats) { return stats.mono_decls; });
-                        printAll("poly_decls", [](const Stats& stats) { return stats.poly_decls; });
-                        printAll("n_decls", [](const Stats& stats) { return stats.n_decls; });
-                        printAll("unique_names", [](const Stats& stats) { return stats.by_name.size(); });
-
-                        printAllHisto("overloads", [](const Stats& stats) { return stats.by_name; });
-                        printAllMap("n_params", [](const Stats& stats) { return stats.by_params; });
-                        printAllMap("n_returns", [](const Stats& stats) { return stats.by_returns; });
-                }
-        };
 
         void printDeclStats( std::list< Declaration * > &translationUnit ) {
-                DeclStats stats;
-                acceptAll( translationUnit, stats );
-                stats.print();
+                std::cout << "DeclStats not yet implemented." << std::endl;
         }
         

src/CodeTools/DeclStats.h

@@ -21 +21 @@
 namespace CodeTools {
 
-        /// Prints summary information about a translation unit's function declarations and calls
         void printDeclStats( std::list< Declaration * > &translationUnit );
         

src/Common/ScopedMap.h

@@ -102 +102 @@
                 iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
 
-                bool operator== (const iterator &that) const {
+                bool operator== (const iterator &that) {
                         return scopes == that.scopes && level == that.level && it == that.it;
                 }
-                bool operator!= (const iterator &that) const { return !( *this == that ); }
+                bool operator!= (const iterator &that) { return !( *this == that ); }
 
                 size_type get_level() const { return level; }
@@ -180 +180 @@
                 const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
 
-                bool operator== (const const_iterator &that) const {
+                bool operator== (const const_iterator &that) {
                         return scopes == that.scopes && level == that.level && it == that.it;
                 }
-                bool operator!= (const const_iterator &that) const { return !( *this == that ); }
+                bool operator!= (const const_iterator &that) { return !( *this == that ); }
 
                 size_type get_level() const { return level; }

src/main.cc

@@ -214 +214 @@
                 } // if
 
+                if ( declstatsp ) {
+                        CodeTools::printDeclStats( translationUnit );
+                        deleteAll( translationUnit );
+                        return 0;
+                }
+
                 // add the assignment statement after the initialization of a type parameter
                 OPTPRINT( "validate" )
@@ -245 +251 @@
                         LibCfa::makeLibCfa( translationUnit );
                 } // if
-
-                if ( declstatsp ) {
-                        CodeTools::printDeclStats( translationUnit );
-                        deleteAll( translationUnit );
-                        return 0;
-                }
 
                 if ( bresolvep ) {