[TritonCTS] Updated CTS tests and interface

Author: MarceloDanigno

src/TritonCTS/src/CtsOptions.h

@@ -44,6 +44,7 @@
 #define PARAMETERSFORCTS_H
 
 #include "Util.h"
+#include "db.h"
 
 #include <string>
 #include <iostream>
@@ -114,6 +115,8 @@ class CtsOptions {
         bool runPostCtsOpt() { return _runPostCtsOpt; }
         void setBufDistRatio(double ratio) { _bufDistRatio = ratio; }
         double getBufDistRatio() { return _bufDistRatio; }
+        void setClockNetsObjs(std::vector<odb::dbNet*> nets) { _clockNetsObjs = nets; }
+        std::vector<odb::dbNet*> getClockNetsObjs() const { return  _clockNetsObjs; }
 
 private:
         std::string _blockName                  = "";
@@ -146,6 +149,7 @@ class CtsOptions {
         double      _bufDistRatio               = 0.1;
 
         std::vector<std::string> _bufferList;
+        std::vector<odb::dbNet*> _clockNetsObjs;
 };
 
 }

src/TritonCTS/src/DbWrapper.cpp

@@ -89,39 +89,22 @@ void DbWrapper::initAllClocks() {
         _openSta->findClkNets(clockNets);
 
         //Checks the user input in case there are other nets that need to be added to the set.
-        std::vector<std::string> clockNetNames;
-        parseClockNames(clockNetNames);
-
-        for (const std::string& name: clockNetNames) {
-                odb::dbNet* net = _block->findNet(name.c_str());
-                if (!net) {
-                        odb::dbITerm* iterm = _block->findITerm(name.c_str());
-                        if (!iterm) {
-                                std::cout << " [WARNING] Net \"" << name << "\" not in design. Skipping...\n";
-                                continue;
-                        }
-                        net = iterm->getNet();
-                }
-                if (!net) {
-                        std::cout << " [WARNING] Net \"" << name << "\" not in design. Skipping...\n";
-                        continue;
-                }
+        std::vector<odb::dbNet*> inputClkNets = _options->getClockNetsObjs();
+
+        for (odb::dbNet* net : inputClkNets) {
                 //Since a set is unique, only the nets not found by dbSta are added.
                 clockNets.insert(net);
         }
+
+        //Iterate over all the nets found by the user-input and dbSta
         for (odb::dbNet* net : clockNets){
-                if (!net) {
-                        odb::dbITerm* iterm = _block->findITerm(net->getName().c_str());
-                        net = iterm->getNet();
+                if (net != nullptr) {
+                        std::cout << " Net \"" << net->getName() << "\" found\n";
+                        //Initializes the net in TritonCTS. If the number of sinks is less than 2, the net is discarded.
+                        initClock(net);
+                } else {
+                        std::cout << " [WARNING] A net was not found in the design. Skipping...\n";
                 }
-                if (!net) {
-                        std::cout << " [WARNING] Net \"" << net->getName() << "\" not in design. Skipping...\n";
-                        continue;
-                } 
-                
-                std::cout << " Net \"" << net->getName() << "\" found\n";
-                //Initializes the net in TritonCTS. If the number of sinks is less than 2, the net is discarded.
-                initClock(net);
         }
 
         if (getNumClocks() <= 0) {
@@ -137,7 +120,7 @@ void DbWrapper::initClock(odb::dbNet* net) {
         std::string driver = "";
         odb::dbITerm* iterm = net->getFirstOutput();
         int xPin, yPin;
-        if (!iterm) {
+        if (iterm == nullptr) {
                 odb::dbBTerm* bterm = net->get1stBTerm(); // Clock pin
                 driver = bterm->getConstName();
                 bterm->getFirstPinLocation(xPin, yPin);
@@ -158,11 +141,8 @@ void DbWrapper::initClock(odb::dbNet* net) {
                        driver,
                        xPin, yPin);
 
-        odb::dbSet<odb::dbITerm> iterms = net->getITerms(); 
-        odb::dbSet<odb::dbITerm>::iterator itr;
-        for (itr = iterms.begin(); itr != iterms.end(); ++itr) {
-                odb::dbITerm* iterm = *itr;
-
+        for (odb::dbITerm* iterm : net->getITerms()) {
+                
                 if (!(iterm->isInputSignal())) {
                         continue;
                 }

src/TritonCTS/src/TritonCTSKernel.h

@@ -93,7 +93,7 @@ class TritonCTSKernel {
         void export_characterization(const char* file);
         void set_root_buffer(const char* buffer);
         void set_buffer_list(const char* buffers);
-        void set_clock_nets(const char* names);
+        int set_clock_nets(const char* names);
         void set_wire_segment_distance_unit(unsigned unit);
         void set_max_char_slew(double slew);
         void set_max_char_cap(double cap);

src/TritonCTS/src/TritonCTSKernelTcl.cpp

@@ -42,6 +42,9 @@
 
 #include "TritonCTSKernel.h"
 
+// DB includes
+#include "db.h"
+
 #include <iostream>
 #include <iterator>
 #include <sstream>
@@ -61,8 +64,45 @@ void TritonCTSKernel::set_sol_list_file(const char* file) {
         _options.setSolListFile(file);
 }
 
-void TritonCTSKernel::set_clock_nets(const char* names) {
+int TritonCTSKernel::set_clock_nets(const char* names) {
+        odb::dbDatabase* db    = odb::dbDatabase::getDatabase(_options.getDbId());
+        odb::dbChip* chip  = db->getChip();
+        odb::dbBlock* block = chip->getBlock();
+
         _options.setClockNets(names);
+        std::stringstream ss(names);
+        std::istream_iterator<std::string> begin(ss);
+        std::istream_iterator<std::string> end;
+        std::vector<std::string> nets(begin, end);
+
+        std::vector<odb::dbNet*> netObjects;
+
+        for (std::string name : nets){
+                odb::dbNet* net = block->findNet(name.c_str());
+                bool netFound = false;
+                if (net != nullptr) {
+                        //Since a set is unique, only the nets not found by dbSta are added.
+                        netObjects.push_back(net);
+                        netFound = true;
+                } else {
+                        //User input was a pin, transform it into an iterm if possible
+                        odb::dbITerm* iterm = block->findITerm(name.c_str());
+                        if (iterm != nullptr) {
+                                net = iterm->getNet();
+                                 if (net != nullptr) {
+                                        //Since a set is unique, only the nets not found by dbSta are added.
+                                        netObjects.push_back(net);
+                                        netFound = true;
+                                }
+                        }
+                        
+                }
+                if (!netFound) {
+                        return 1;
+                }
+        }
+        _options.setClockNetsObjs(netObjects);
+        return 0;
 }
 
 void TritonCTSKernel::set_max_char_cap(double cap) {

src/TritonCTS/src/tritoncts.tcl

@@ -113,7 +113,11 @@ proc clock_tree_synthesis { args } {
 
   if { [info exists keys(-clk_nets)] } {
     set clk_nets $keys(-clk_nets)
-    $cts set_clock_nets $clk_nets
+    set fail [$cts set_clock_nets $clk_nets]
+    if {$fail} {
+      puts "Error when finding -clk_nets in DB!"
+      exit
+    }
   }
 
   if { [info exists keys(-slew_inter)] } {

src/TritonCTS/test/regression

@@ -31,7 +31,9 @@ do
 	fi
 
 	cd $unit_test_path 
+	ln -s $testdir/../../../test/Nangate45
 	$test_script $binary
+	unlink Nangate45
 	test_return_code=$?
 	cd $test_root