Merge pull request #83 from nanocoh/main

Stats + Constant api
najaeda · Jun 6, 2024 · 7bc84ab · 7bc84ab
2 parents 5c1910d + c854201
commit 7bc84ab
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 4 deletions.
diff --git a/src/apps/naja_edit/NajaEdit.cpp b/src/apps/naja_edit/NajaEdit.cpp
@@ -33,6 +33,7 @@
 #include "SNLCapnP.h"
 #include "SNLUniverse.h"
 #include "Reduction.h"
+#include "Utils.h"
 
 using namespace naja::DNL;
 using namespace naja::SNL;
@@ -282,6 +283,8 @@ int main(int argc, char* argv[]) {
       }
     }
 
+
+
     if (optimizationType == OptimizationType::DLE) {
       const auto start{std::chrono::steady_clock::now()};
       SPDLOG_INFO("Starting removal of loadless logic");
@@ -294,6 +297,9 @@ int main(int argc, char* argv[]) {
         oss << "Removal of loadless logic done in: " << elapsed_seconds.count() << "s";
         SPDLOG_INFO(oss.str());
       } 
+      NetlistStatistics stats(*get());
+      stats.process();
+      spdlog::info(stats.getReport());
     } else if (optimizationType == OptimizationType::ALL) {
       const auto start{std::chrono::steady_clock::now()};
       spdlog::info("Starting full optimization(constant propagation and removal of loadless logic)");
@@ -312,8 +318,13 @@ int main(int argc, char* argv[]) {
             << "s";
         spdlog::info(oss.str());
       }
+      NetlistStatistics stats(*get());
+      stats.process();
+      spdlog::info(stats.getReport());
     }
 
+
+
     if (program.is_used("-z")) {
       const auto start{std::chrono::steady_clock::now()};
       auto editPath = std::filesystem::path(program.get<std::string>("-z"));

diff --git a/src/optimization/ConstantPropagation.cpp b/src/optimization/ConstantPropagation.cpp
@@ -1025,8 +1025,7 @@ void ConstantPropagation::propagateConstants() {
     term->setNet(assign0);
     SNLTruthTable tt(0, 0);
     auto logic0 = SNLLibraryTruthTables::getDesignForTruthTable(
-                      term->getDB()->getLibrary(
-                          SNLName("nangate45")),
+                      *(term->getDB()->getPrimitiveLibraries().begin()),
                       tt)
                       .first;
     SNLInstance* logic0Inst = term->getDesign()->getInstance(SNLName(name));
@@ -1058,7 +1057,7 @@ void ConstantPropagation::propagateConstants() {
     term->setNet(assign1);
     SNLTruthTable tt(0, 1);
     auto logic1 = SNLLibraryTruthTables::getDesignForTruthTable(
-                      term->getDB()->getLibrary(SNLName("nangate45")),
+                      *(term->getDB()->getPrimitiveLibraries().begin()),
                       tt)
                       .first;
     SNLInstance* logic1Inst = term->getDesign()->getInstance(SNLName(name));

diff --git a/src/optimization/Utils.cpp b/src/optimization/Utils.cpp
@@ -8,6 +8,7 @@
 #include "SNLBusNetBit.h"
 #include "SNLDB0.h"
 #include "SNLUniverse.h"
+#include <sstream>
 
 using namespace naja::DNL;
 using namespace naja::SNL;
@@ -72,4 +73,16 @@ std::string Uniquifier::getFullPath() {
   return fullPath;
 }
 
+void NetlistStatistics::process() {
+  std::map<std::string, size_t> pritmitveCount;
+  std::stringstream ss; 
+  for (auto leaf : dnl_.getLeaves()) {
+    pritmitveCount[dnl_.getDNLInstanceFromID(leaf).getSNLModel()->getName().getString()]++;
+  }
+  for (const auto& entry : pritmitveCount) {
+    ss << entry.first << " : " << entry.second << std::endl;
+  }
+  report_ = ss.str();
+}
+
 }  // namespace naja::NAJA_OPT
diff --git a/src/optimization/Utils.h b/src/optimization/Utils.h
@@ -25,4 +25,16 @@ class Uniquifier {
   std::vector<SNLInstance*> pathUniq_;
   DNLID id_ = DNLID_MAX;
 };
+
+class NetlistStatistics {
+ public:
+  NetlistStatistics(DNLFull& dnl) : dnl_(dnl) {}
+  void process();
+  const std::string& getReport() const { return report_; }
+
+ private:
+  DNLFull& dnl_;
+  std::string report_;
+};
+
 }  // namespace naja::NAJA_OPT
diff --git a/test/logic_opt/ReductionOptTests.cpp b/test/logic_opt/ReductionOptTests.cpp
@@ -14,7 +14,7 @@ using ::testing::ElementsAre;
 #include "SNLScalarTerm.h"
 #include "SNLUniverse.h"
 using namespace naja::SNL;
-
+#include "Utils.h"
 #include "ConstantPropagation.h"
 #include "DNL.h"
 #include "NetlistGraph.h"
@@ -314,4 +314,7 @@ TEST_F(ReductionOptTests, testTruthTablesMap) {
     ReductionOptimization reductionOpt(cp.getPartialConstantReaders());
     reductionOpt.run();
   }
+  NetlistStatistics netlistStats(*get());
+  netlistStats.process();
+  printf("Netlist statistics: %s\n", netlistStats.getReport().c_str());
 }