From 048c24eaeaae127f5a26a9ba6c8d5dcd2ac0fa17 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 9 Jul 2025 14:11:50 +0200
Subject: [PATCH] Add reporting of optimized cells

---
 himbaechel/uarch/gatemate/pack.cc | 50 +++++++++++++++++--------------
 himbaechel/uarch/gatemate/pack.h  |  4 ++-
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/himbaechel/uarch/gatemate/pack.cc b/himbaechel/uarch/gatemate/pack.cc
index 4e740b94..1b44421e 100644
--- a/himbaechel/uarch/gatemate/pack.cc
+++ b/himbaechel/uarch/gatemate/pack.cc
@@ -86,7 +86,7 @@ void GateMatePacker::pack_misc()
     }
 }
 
-void GateMatePacker::remove_not_used()
+void GateMatePacker::disconnect_not_used()
 {
     for (auto &cell : ctx->cells) {
         CellInfo &ci = *cell.second;
@@ -95,7 +95,6 @@ void GateMatePacker::remove_not_used()
                 NetInfo *net = ci.getPort(p.first);
                 if (net && net->users.entries() == 0) {
                     ci.disconnectPort(p.first);
-                    count++;
                 }
             }
         }
@@ -128,6 +127,16 @@ void GateMatePacker::move_connections(NetInfo *from_net, NetInfo *to_net)
     }
 }
 
+void GateMatePacker::count_cell(CellInfo &ci)
+{
+    packed_cells.insert(ci.name);
+    if (!count_per_type.count(ci.type))
+        count_per_type[ci.type] = 1;
+    else
+        count_per_type[ci.type]++;
+    count++;
+}
+
 void GateMatePacker::optimize_lut()
 {
     for (auto &cell : ctx->cells) {
@@ -136,8 +145,7 @@ void GateMatePacker::optimize_lut()
             continue;
         NetInfo *o_net = ci.getPort(id_O);
         if (!o_net) {
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             continue;
         }
 
@@ -147,23 +155,19 @@ void GateMatePacker::optimize_lut()
         switch (val) {
         case LUT_ZERO: // constant 0
             move_connections(o_net, gnd_net);
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             break;
         case LUT_D0: // propagate
             move_connections(o_net, ci.getPort(id_I0));
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             break;
         case LUT_D1: // propagate
             move_connections(o_net, ci.getPort(id_I1));
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             break;
         case LUT_ONE: // constant 1
             move_connections(o_net, vcc_net);
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             break;
         default:
             break;
@@ -181,8 +185,7 @@ void GateMatePacker::optimize_ff()
 
         NetInfo *q_net = ci.getPort(id_Q);
         if (!q_net) {
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             continue;
         }
 
@@ -196,14 +199,12 @@ void GateMatePacker::optimize_ff()
 
         if (cpe_res == 0) { // RES is always ON
             move_connections(q_net, gnd_net);
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             continue;
         }
         if (cpe_set == 0) { // SET is always ON
             move_connections(q_net, vcc_net);
-            packed_cells.insert(ci.name);
-            count++;
+            count_cell(ci);
             continue;
         }
 
@@ -212,16 +213,14 @@ void GateMatePacker::optimize_ff()
                 // Only when there is no SR signal
                 // EN always OFF (never loads) or CLK never triggers
                 move_connections(q_net, ff_has_init ? (ff_init_value ? vcc_net : gnd_net) : gnd_net);
-                packed_cells.insert(ci.name);
-                count++;
+                count_cell(ci);
                 continue;
             }
         } else {
             if (cpe_clk == 3 && ci.getPort(id_SR) == nullptr && cpe_res == 3 && cpe_set == 3) {
                 // Clamp G if there is no set or reset
                 move_connections(q_net, ci.getPort(id_D));
-                packed_cells.insert(ci.name);
-                count++;
+                count_cell(ci);
                 continue;
             }
         }
@@ -233,11 +232,16 @@ void GateMatePacker::cleanup()
 {
     log_info("Running cleanups..\n");
     dff_update_params();
+    int i = 1;
     do {
         count = 0;
-        remove_not_used();
+        disconnect_not_used();
         optimize_lut();
         optimize_ff();
+        for (auto c : count_per_type)
+            log_info("    %6d %s cells removed (iteration %d)\n", c.second, c.first.c_str(ctx), i);
+        count_per_type.clear();
+        i++;
     } while (count != 0);
 }
 
diff --git a/himbaechel/uarch/gatemate/pack.h b/himbaechel/uarch/gatemate/pack.h
index a8404172..ee837d9d 100644
--- a/himbaechel/uarch/gatemate/pack.h
+++ b/himbaechel/uarch/gatemate/pack.h
@@ -64,7 +64,6 @@ struct GateMatePacker
 
     void remove_constants();
     void remove_clocking();
-    void remove_not_used();
 
     void cleanup();
     void repack();
@@ -77,8 +76,10 @@ struct GateMatePacker
     void disconnect_if_gnd(CellInfo *cell, IdString input);
     void pll_out(CellInfo *cell, IdString origPort, Loc fixed);
 
+    void disconnect_not_used();
     void optimize_lut();
     void optimize_ff();
+    void count_cell(CellInfo &ci);
     void move_connections(NetInfo *from_net, NetInfo *to_net);
 
     PllCfgRecord get_pll_settings(double f_ref, double f_core, int mode, int low_jitter, bool pdiv0_mux, bool feedback);
@@ -113,6 +114,7 @@ struct GateMatePacker
     NetInfo *vcc_net;
     NetInfo *gnd_net;
     int count;
+    std::map<IdString, int> count_per_type;
 };
 
 NEXTPNR_NAMESPACE_END