ant/cgt: tidy/format and bzl BUILD fix

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/ant/include/ant/AntennaChecker.hh

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "odb/db.h"
 
 namespace utl {

src/ant/src/AntennaChecker.cc

@@ -10,13 +10,13 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <queue>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
+#include "AntennaCheckerImpl.hh"
 #include "Polygon.hh"
 #include "WireBuilder.hh"
 #include "boost/pending/disjoint_sets.hpp"
@@ -88,7 +88,8 @@ void AntennaChecker::setReportFileName(const char* file_name)
   impl_->setReportFileName(file_name);
 }
 
-void AntennaChecker::makeNetWiresFromGuides(const std::vector<odb::dbNet*>& nets)
+void AntennaChecker::makeNetWiresFromGuides(
+    const std::vector<odb::dbNet*>& nets)
 {
   impl_->makeNetWiresFromGuides(nets);
 }

src/ant/src/AntennaCheckerImpl.hh

@@ -3,10 +3,14 @@
 
 #pragma once
 
+#include <fstream>
 #include <map>
+#include <memory>
 #include <mutex>
-#include <queue>
 #include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "ant/AntennaChecker.hh"
 #include "odb/db.h"

src/cgt/BUILD

@@ -16,16 +16,17 @@ cc_library(
     name = "cgt",
     srcs = [
         "src/ClockGating.cpp",
+        "src/ClockGatingImpl.h",
         "src/MakeClockGating.cpp",
         "src/NetworkBuilder.cpp",
+        "src/NetworkBuilder.h",
+        "src/RandomBits.h",
         ":swig",
         ":tcl",
     ],
     hdrs = [
         "include/cgt/ClockGating.h",
         "include/cgt/MakeClockGating.h",
-        "include/cgt/NetworkBuilder.h",
-        "include/cgt/RandomBits.h",
     ],
     defines = [
         "ABC_NAMESPACE=abc",

src/cgt/src/ClockGating.cpp

@@ -65,7 +65,7 @@ extern void Abc_FrameSetLibGen(void* pLib);
 namespace cgt {
 
 ClockGating::ClockGating(utl::Logger* logger, sta::dbSta* open_sta)
-  : impl_(std::make_unique<Impl>(logger, open_sta))
+    : impl_(std::make_unique<Impl>(logger, open_sta))
 {
 }
 
@@ -679,12 +679,13 @@ static std::vector<sta::Net*> except(
   return result;
 }
 
-void ClockGating::Impl::searchClockGates(sta::Instance* const instance,
-                                   std::vector<sta::Net*>& good_gate_conds,
-                                   const std::vector<sta::Net*>::iterator begin,
-                                   const std::vector<sta::Net*>::iterator end,
-                                   abc::Abc_Ntk_t& abc_network,
-                                   const bool clk_enable)
+void ClockGating::Impl::searchClockGates(
+    sta::Instance* const instance,
+    std::vector<sta::Net*>& good_gate_conds,
+    const std::vector<sta::Net*>::iterator begin,
+    const std::vector<sta::Net*>::iterator end,
+    abc::Abc_Ntk_t& abc_network,
+    const bool clk_enable)
 {
   int half_len = (end - begin) / 2;
   if (half_len == 0) {
@@ -1105,7 +1106,7 @@ utl::UniquePtrWithDeleter<abc::Abc_Ntk_t> ClockGating::Impl::makeTestNetwork(
 }
 
 bool ClockGating::Impl::simulationTest(abc::Abc_Ntk_t* const abc_network,
-                                 const std::string& combined_gate_name)
+                                       const std::string& combined_gate_name)
 {
   DebugScopedTimer timer(
       sim_time_, logger_, CGT, "clock_gating", 3, "Simulation time: {}");
@@ -1144,7 +1145,7 @@ bool ClockGating::Impl::simulationTest(abc::Abc_Ntk_t* const abc_network,
 }
 
 bool ClockGating::Impl::satTest(abc::Abc_Ntk_t* const abc_network,
-                          const std::string& combined_gate_name)
+                                const std::string& combined_gate_name)
 {
   DebugScopedTimer timer(
       sat_time_, logger_, CGT, "clock_gating", 3, "SAT time: {}");
@@ -1215,9 +1216,10 @@ bool ClockGating::Impl::isCorrectClockGate(
   return true;
 }
 
-void ClockGating::Impl::insertClockGate(const std::vector<sta::Instance*>& instances,
-                                  const std::vector<sta::Net*>& gate_cond_nets,
-                                  const bool clk_enable)
+void ClockGating::Impl::insertClockGate(
+    const std::vector<sta::Instance*>& instances,
+    const std::vector<sta::Net*>& gate_cond_nets,
+    const bool clk_enable)
 {
   auto network = sta_->getDbNetwork();
 
@@ -1387,7 +1389,8 @@ void ClockGating::Impl::dump(const char* const name)
   dump_counter_++;
 }
 
-void ClockGating::Impl::dumpAbc(const char* const name, abc::Abc_Ntk_t* const network)
+void ClockGating::Impl::dumpAbc(const char* const name,
+                                abc::Abc_Ntk_t* const network)
 {
   if (!dump_dir_) {
     return;
@@ -1429,7 +1432,8 @@ std::filesystem::path ClockGating::Impl::getAbcGraphvizDumpPath(
          / (std::to_string(dump_counter_) + "_abc_" + name + ".dot");
 }
 
-std::filesystem::path ClockGating::Impl::getAbcVerilogDumpPath(const char* const name)
+std::filesystem::path ClockGating::Impl::getAbcVerilogDumpPath(
+    const char* const name)
 {
   return getDumpDir() / (std::to_string(dump_counter_) + "_abc_" + name + ".v");
 }

src/cgt/src/ClockGatingImpl.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <cstddef>
 #include <filesystem>
 #include <memory>
 #include <optional>
@@ -12,6 +11,7 @@
 
 #include "NetworkBuilder.h"
 #include "RandomBits.h"
+#include "cgt/ClockGating.h"
 #include "db_sta/dbSta.hh"
 #include "utl/deleter.h"
 #include "utl/unique_name.h"