Sort bits

Signed-off-by: Ryszard Rozak <rrozak@antmicro.com>
antmicro · Jan 21, 2025 · e486aa4 · e486aa4
1 parent a73aec2
commit e486aa4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/VlcPoint.h b/src/VlcPoint.h
@@ -63,6 +63,7 @@ class VlcPoint final {
     // KEY ACCESSORS
     string filename() const { return keyExtract(VL_CIK_FILENAME); }
     string comment() const { return keyExtract(VL_CIK_COMMENT); }
+    string commentStripped() const { return comment().substr(0, comment().find("=")); }
     string hier() const { return keyExtract(VL_CIK_HIER); }
     string type() const { return keyExtract(VL_CIK_TYPE); }
     string thresh() const { return keyExtract(VL_CIK_THRESH); }  // string as maybe ""

diff --git a/src/VlcSource.h b/src/VlcSource.h
@@ -35,7 +35,12 @@ class VlcPoint;
 
 class VlcSourceCount final {
     // TYPES
-    using PointsSet = std::set<VlcPoint*>;
+    struct PointCmp {
+        bool operator()(const VlcPoint* a, const VlcPoint* b) const {
+            return a->commentStripped() < b->commentStripped();
+        }
+    };
+    using PointsSet = std::set<VlcPoint*, PointCmp>;
 
     // MEMBERS
     const int m_lineno;  ///< Line number

diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp
@@ -151,7 +151,7 @@ void VlcTop::writeInfo(const string& filename) {
             for (const auto& point : sc.points()) {
                 os << "BRDA:" << sc.lineno() << ",";
                 os << point_num << ",";
-                const string cmt = point->comment().substr(0, point->comment().find("="));
+                const string cmt = point->commentStripped();
 
                 if (cmt.rfind("toggle_", 0) != 0) {
                     std::string typeStr = cmt.substr(0, cmt.find("_"));