Merge pull request #7896 from The-OpenROAD-Project-staging/mpl-misc-include-cleaner

maliberty · web-flow · commit 38d93a2918d5 · 2025-07-26T18:29:53.000Z
mpl: fix misc-include-cleaner clang-tidy warnings
diff --git a/src/mpl/src/SACoreHardMacro.cpp b/src/mpl/src/SACoreHardMacro.cpp
@@ -7,6 +7,11 @@
 #include <vector>
 
 #include "MplObserver.h"
+#include "SimulatedAnnealingCore.h"
+#include "clusterEngine.h"
+#include "object.h"
+#include "odb/db.h"
+#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {
diff --git a/src/mpl/src/SACoreHardMacro.h b/src/mpl/src/SACoreHardMacro.h
@@ -7,7 +7,10 @@
 
 #include "MplObserver.h"
 #include "SimulatedAnnealingCore.h"
+#include "clusterEngine.h"
 #include "object.h"
+#include "odb/db.h"
+#include "util.h"
 
 namespace utl {
 class Logger;
diff --git a/src/mpl/src/SACoreSoftMacro.cpp b/src/mpl/src/SACoreSoftMacro.cpp
@@ -12,6 +12,11 @@
 #include <vector>
 
 #include "MplObserver.h"
+#include "SimulatedAnnealingCore.h"
+#include "clusterEngine.h"
+#include "object.h"
+#include "odb/db.h"
+#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {
diff --git a/src/mpl/src/SACoreSoftMacro.h b/src/mpl/src/SACoreSoftMacro.h
@@ -8,7 +8,10 @@
 
 #include "MplObserver.h"
 #include "SimulatedAnnealingCore.h"
+#include "clusterEngine.h"
 #include "object.h"
+#include "odb/db.h"
+#include "util.h"
 
 namespace utl {
 class Logger;
diff --git a/src/mpl/src/SimulatedAnnealingCore.cpp b/src/mpl/src/SimulatedAnnealingCore.cpp
@@ -9,12 +9,18 @@
 #include <fstream>
 #include <iostream>
 #include <map>
+#include <numeric>
+#include <random>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "MplObserver.h"
+#include "clusterEngine.h"
 #include "object.h"
+#include "odb/db.h"
+#include "odb/geom.h"
+#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {
diff --git a/src/mpl/src/SimulatedAnnealingCore.h b/src/mpl/src/SimulatedAnnealingCore.h
@@ -3,14 +3,16 @@
 
 #pragma once
 
+#include <limits>
 #include <map>
 #include <random>
-#include <set>
 #include <string>
 #include <vector>
 
 #include "MplObserver.h"
 #include "clusterEngine.h"
+#include "object.h"
+#include "odb/db.h"
 #include "util.h"
 
 namespace utl {
diff --git a/src/mpl/src/clusterEngine.cpp b/src/mpl/src/clusterEngine.cpp
@@ -3,6 +3,8 @@
 
 #include "clusterEngine.h"
 
+#include <spdlog/fmt/bundled/format.h>
+
 #include <algorithm>
 #include <cmath>
 #include <map>
@@ -14,8 +16,14 @@
 
 #include "MplObserver.h"
 #include "db_sta/dbNetwork.hh"
+#include "object.h"
+#include "odb/db.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
 #include "par/PartitionMgr.h"
 #include "sta/Liberty.hh"
+#include "util.h"
+#include "utl/Logger.h"
 
 namespace mpl {
 using utl::MPL;
diff --git a/src/mpl/src/clusterEngine.h b/src/mpl/src/clusterEngine.h
@@ -7,11 +7,13 @@
 #include <memory>
 #include <queue>
 #include <set>
+#include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "object.h"
+#include "odb/db.h"
 #include "util.h"
 
 namespace par {
diff --git a/src/mpl/src/graphics.cpp b/src/mpl/src/graphics.cpp
@@ -7,12 +7,17 @@
 #include <limits>
 #include <map>
 #include <optional>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "clusterEngine.h"
+#include "gui/gui.h"
 #include "object.h"
+#include "odb/db.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
+#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {
diff --git a/src/mpl/src/graphics.h b/src/mpl/src/graphics.h
@@ -5,12 +5,16 @@
 
 #include <map>
 #include <optional>
-#include <set>
 #include <string>
 #include <vector>
 
 #include "MplObserver.h"
+#include "clusterEngine.h"
 #include "gui/gui.h"
+#include "object.h"
+#include "odb/db.h"
+#include "odb/geom.h"
+#include "util.h"
 
 namespace mpl {
 class SoftMacro;
diff --git a/src/mpl/src/hier_rtlmp.cpp b/src/mpl/src/hier_rtlmp.cpp
@@ -7,10 +7,13 @@
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <limits>
 #include <map>
 #include <memory>
+#include <numeric>
 #include <queue>
+#include <regex>
 #include <set>
 #include <string>
 #include <thread>
@@ -20,12 +23,15 @@
 #include "MplObserver.h"
 #include "SACoreHardMacro.h"
 #include "SACoreSoftMacro.h"
+#include "SimulatedAnnealingCore.h"
+#include "clusterEngine.h"
 #include "db_sta/dbNetwork.hh"
 #include "object.h"
 #include "odb/db.h"
+#include "odb/geom.h"
 #include "odb/util.h"
 #include "par/PartitionMgr.h"
-#include "sta/Liberty.hh"
+#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {
diff --git a/src/mpl/src/hier_rtlmp.h b/src/mpl/src/hier_rtlmp.h
@@ -3,25 +3,21 @@
 
 #pragma once
 
-#include <limits>
 #include <map>
 #include <memory>
-#include <set>
+#include <queue>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "MplObserver.h"
 #include "clusterEngine.h"
+#include "object.h"
+#include "odb/db.h"
+#include "odb/dbTypes.h"
+#include "odb/geom.h"
+#include "shapes.h"
 #include "util.h"
 
-namespace odb {
-class dbBlock;
-class dbDatabase;
-class dbInst;
-class dbModule;
-}  // namespace odb
-
 namespace sta {
 class dbNetwork;
 class dbSta;
diff --git a/src/mpl/src/object.cpp b/src/mpl/src/object.cpp
@@ -6,12 +6,16 @@
 #include <algorithm>
 #include <boost/random/uniform_int_distribution.hpp>
 #include <cmath>
+#include <iterator>
 #include <map>
 #include <memory>
+#include <random>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "odb/db.h"
+#include "odb/dbTypes.h"
 #include "util.h"
 #include "utl/Logger.h"
 
diff --git a/src/mpl/src/object.h b/src/mpl/src/object.h
@@ -3,9 +3,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <iostream>
-#include <limits>
 #include <map>
 #include <memory>
 #include <random>
@@ -16,7 +13,6 @@
 
 #include "odb/db.h"
 #include "odb/dbTypes.h"
-#include "odb/odb.h"
 #include "shapes.h"
 #include "util.h"
 
diff --git a/src/mpl/src/rtl_mp.cpp b/src/mpl/src/rtl_mp.cpp
@@ -3,13 +3,17 @@
 
 #include "mpl/rtl_mp.h"
 
+#include <spdlog/fmt/bundled/format.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "MplObserver.h"
 #include "hier_rtlmp.h"
 #include "object.h"
+#include "odb/db.h"
+#include "utl/Logger.h"
 
 namespace mpl {
 using std::string;
diff --git a/src/mpl/src/util.h b/src/mpl/src/util.h
@@ -3,13 +3,18 @@
 
 #pragma once
 
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <limits>
 #include <map>
 #include <string>
-#include <utility>
+#include <vector>
 
 #include "odb/db.h"
 #include "odb/geom.h"
 #include "shapes.h"
+#include "utl/Logger.h"
 
 namespace mpl {
 struct BoundaryRegion;
diff --git a/src/mpl/test/cpp/MplTest.h b/src/mpl/test/cpp/MplTest.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) 2023-2025, The OpenROAD Authors
+
 #include <memory>
 
 #include "../../src/hier_rtlmp.h"
@@ -34,4 +37,4 @@ class MplTest : public ::testing::Test
   const int die_height_ = 500000;
 };
 
-}  // namespace mpl
+}  // namespace mpl
diff --git a/src/mpl/test/cpp/TestSnapper.cpp b/src/mpl/test/cpp/TestSnapper.cpp
@@ -1,6 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) 2023-2025, The OpenROAD Authors
+
+#include <exception>
 #include <memory>
+#include <string>
 
+#include "../../src/hier_rtlmp.h"
 #include "MplTest.h"
+#include "gtest/gtest.h"
+#include "odb/db.h"
 
 namespace mpl {
 namespace {
