Merge

Silimate · Nov 21, 2024 · 3b7f344 · 3b7f344
2 parents d87926c + 70d52c2
commit 3b7f344
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 34 deletions.
diff --git a/doc/OpenSTA.odt b/doc/OpenSTA.odt
diff --git a/doc/OpenSTA.pdf b/doc/OpenSTA.pdf
diff --git a/include/sta/Liberty.hh b/include/sta/Liberty.hh
@@ -428,8 +428,6 @@ public:
   void setIsMacro(bool is_macro);
   bool isMemory() const { return is_memory_; }
   void setIsMemory(bool is_memory);
-  bool hasMemory() const { return has_memory_; }
-  void setHasMemory(bool has_memory);
   bool isPad() const { return is_pad_; }
   void setIsPad(bool is_pad);
   bool isClockCell() const { return is_clock_cell_; }
@@ -593,7 +591,6 @@ protected:
   LibertyLibrary *liberty_library_;
   float area_;
   bool dont_use_;
-  bool has_memory_;
   bool is_macro_;
   bool is_memory_;
   bool is_pad_;

diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc
@@ -1077,12 +1077,6 @@ LibertyCell::setIsMemory(bool is_memory)
   is_memory_ = is_memory;
 }
 
-void
-LibertyCell::setHasMemory(bool has_memory)
-{
-  has_memory_ = has_memory;
-}
-
 void
 LibertyCell::setIsPad(bool is_pad)
 {

diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc
@@ -375,7 +375,7 @@ LibertyReader::defineVisitors()
 
   // Memory
   defineGroupVisitor("memory", &LibertyReader::beginMemory,
-		       &LibertyReader::endMemory);
+		     &LibertyReader::endMemory);
 
   // Register/latch
   defineGroupVisitor("ff", &LibertyReader::beginFF, &LibertyReader::endFF);
@@ -3863,7 +3863,7 @@ void
 LibertyReader::beginMemory(LibertyGroup *)
 {
   if (cell_) {
-    cell_->setHasMemory(true);
+    cell_->setIsMemory(true);
   }
 }
 

diff --git a/parasitics/SpefReader.cc b/parasitics/SpefReader.cc
@@ -17,6 +17,7 @@
 #include "SpefReader.hh"
 
 #include "Zlib.hh"
+#include "Stats.hh"
 #include "Report.hh"
 #include "Debug.hh"
 #include "StringUtil.hh"
@@ -64,6 +65,7 @@ readSpefFile(const char *filename,
   // Use zlib to uncompress gzip'd files automagically.
   gzFile stream = gzopen(filename, "rb");
   if (stream) {
+    Stats stats(sta->debug(), sta->report());
     SpefReader reader(filename, stream, instance, ap,
 		      pin_cap_included, keep_coupling_caps, coupling_cap_factor,
 		      reduce, corner, min_max, sta);
@@ -73,6 +75,7 @@ readSpefFile(const char *filename,
     success = (::SpefParse_parse() == 0);
     gzclose(stream);
     spef_reader = nullptr;
+    stats.report("Read spef");
   }
   else
     throw FileNotReadable(filename);

diff --git a/power/Power.cc b/power/Power.cc
@@ -20,6 +20,7 @@
 #include <cmath>     // abs
 
 #include "cudd.h"
+#include "Stats.hh"
 #include "Debug.hh"
 #include "EnumNameMap.hh"
 #include "Hash.hh"
@@ -233,6 +234,7 @@ Power::power(const Corner *corner,
   pad.clear();
 
   ensureActivities();
+  Stats stats(debug_, report_);
   LeafInstanceIterator *inst_iter = network_->leafInstanceIterator();
   while (inst_iter->hasNext()) {
     Instance *inst = inst_iter->next();
@@ -255,6 +257,7 @@ Power::power(const Corner *corner,
     }
   }
   delete inst_iter;
+  stats.report("Find power");
 }
 
 bool
@@ -617,6 +620,7 @@ Power::ensureActivities()
   // No need to propagate activites if global activity is set.
   if (!global_activity_.isSet()) {
     if (!activities_valid_) {
+      Stats stats(debug_, report_);
       // Clear existing activities.
       activity_map_.clear();
       seq_activity_map_.clear();
@@ -646,6 +650,7 @@ Power::ensureActivities()
                    pass, visitor.maxChange());
         pass++;
       }
+      stats.report("Find power activities");
       activities_valid_ = true;
     }
   }

diff --git a/power/VcdReader.cc b/power/VcdReader.cc
@@ -20,6 +20,7 @@
 #include "VcdReader.hh"
 
 #include "Zlib.hh"
+#include "Stats.hh"
 #include "Report.hh"
 #include "Error.hh"
 #include "StringUtil.hh"
@@ -79,6 +80,7 @@ VcdReader::read(const char *filename)
   vcd_ = &vcd;
   stream_ = gzopen(filename, "r");
   if (stream_) {
+    Stats stats(debug_, report_);
     filename_ = filename;
     file_line_ = 1;
     stmt_line_ = 1;
@@ -113,6 +115,7 @@ VcdReader::read(const char *filename)
       token = getToken();
     }
     gzclose(stream_);
+    stats.report("Read VCD");
   }
   else
     throw FileNotReadable(filename);

diff --git a/search/Property.cc b/search/Property.cc
@@ -722,11 +722,8 @@ getProperty(const LibertyCell *cell,
     return PropertyValue(cell->isBuffer());
   else if (stringEqual(property, "is_inverter"))
     return PropertyValue(cell->isInverter());
-  else if (stringEqual(property, "is_memory")
-	   || stringEqual(property, "is_memory_cell"))
+  else if (stringEqual(property, "is_memory"))
     return PropertyValue(cell->isMemory());
-  else if (stringEqual(property, "has_memory"))
-    return PropertyValue(cell->hasMemory());
   else if (stringEqual(property, "dont_use"))
     return PropertyValue(cell->dontUse());
   else if (stringEqual(property, "area"))
@@ -974,11 +971,8 @@ getProperty(const Instance *inst,
     return PropertyValue(liberty_cell && liberty_cell->isInverter());
   else if (stringEqual(property, "is_macro"))
     return PropertyValue(liberty_cell && liberty_cell->isMacro());
-  else if (stringEqual(property, "is_memory")
-	   || stringEqual(property, "is_memory_cell"))
+  else if (stringEqual(property, "is_memory"))
     return PropertyValue(liberty_cell && liberty_cell->isMemory());
-  else if (stringEqual(property, "has_memory"))
-    return PropertyValue(liberty_cell && liberty_cell->hasMemory());
   else
     throw PropertyUnknown("instance", property);
 }

diff --git a/test/get_has_memory.tcl b/test/get_has_memory.tcl
diff --git a/test/get_has_memory.ok → test/get_is_memory.ok b/test/get_has_memory.ok → test/get_is_memory.ok
@@ -1,4 +1,4 @@
-[get_cells -filter has_memory]
+[get_cells -filter is_memory]
 sram_inst
-[get_lib_cells -filter has_memory]
+[get_lib_cells -filter is_memory]
 gf180mcu_fd_ip_sram__sram128x8m8wm1__ff_125C_1v98/gf180mcu_fd_ip_sram__sram128x8m8wm1
diff --git a/test/get_is_memory.tcl b/test/get_is_memory.tcl
@@ -0,0 +1,11 @@
+# Tests whether the is_memory attribute works for cells and libcells
+read_liberty gf180mcu_sram.lib.gz
+read_liberty asap7_small.lib.gz
+read_verilog get_is_memory.v
+link get_is_memory
+
+# Test that the is_memory attribute is set correctly for cells
+puts {[get_cells -filter is_memory]}
+report_object_full_names [get_cells -filter is_memory]
+puts {[get_lib_cells -filter is_memory]}
+report_object_full_names [get_lib_cells -filter is_memory]
diff --git a/test/get_has_memory.v → test/get_is_memory.v b/test/get_has_memory.v → test/get_is_memory.v
@@ -1,4 +1,4 @@
-module get_has_memory (
+module get_is_memory (
 	input           CLK,
 	input           CEN,
 	input           GWEN,

diff --git a/test/gf180mcu_sram.lib.gz b/test/gf180mcu_sram.lib.gz
diff --git a/test/regression_vars.tcl b/test/regression_vars.tcl
@@ -128,7 +128,7 @@ record_sta_tests {
   extras
   liberty_arcs_one2one_1
   liberty_arcs_one2one_2
-  get_has_memory
+  get_is_memory
   get_filter
   get_property_flags
   get_noargs