From 44159bbb538687de43d93a9115e813445c3abb5a Mon Sep 17 00:00:00 2001 From: James Cherry Date: Thu, 15 Jun 2023 08:59:56 -0700 Subject: [PATCH] remove deprecated system .h includes Signed-off-by: James Cherry --- app/StaMain.cc | 2 +- dcalc/ArnoldiDelayCalc.cc | 2 +- dcalc/ArnoldiReduce.cc | 5 ---- include/sta/ArcDelayCalc.hh | 1 + include/sta/ArrayTable.hh | 2 +- include/sta/Debug.hh | 3 +- include/sta/GraphClass.hh | 4 +++ include/sta/GraphDelayCalc.hh | 1 + include/sta/Machine.hh | 2 +- include/sta/NetworkClass.hh | 1 + include/sta/Parasitics.hh | 1 + include/sta/PatternMatch.hh | 1 + include/sta/Report.hh | 3 +- include/sta/ReportTcl.hh | 1 + include/sta/Set.hh | 53 ++++++++--------------------------- include/sta/Stats.hh | 2 +- include/sta/StringUtil.hh | 5 ++-- include/sta/TimingModel.hh | 1 + include/sta/Transition.hh | 1 + include/sta/Zlib.hh | 2 +- liberty/LibertyParse.yy | 4 +-- liberty/LibertyParser.cc | 4 +-- liberty/LibertyReader.cc | 4 +-- liberty/LibertyWriter.cc | 2 +- network/ConcreteLibrary.cc | 2 +- network/HpinDrvrLoad.cc | 2 +- network/ParseBus.cc | 4 +-- network/VerilogNamespace.cc | 2 +- parasitics/SpefNamespace.cc | 4 +-- parasitics/SpefParse.yy | 2 +- sdc/WriteSdc.cc | 4 +-- sdf/SdfParse.yy | 2 +- sdf/SdfReader.cc | 4 +-- sdf/SdfWriter.cc | 4 +-- search/Bfs.cc | 6 ++-- search/Crpr.cc | 2 +- util/Error.cc | 4 +-- util/Hash.cc | 2 +- util/PatternMatch.cc | 2 +- util/ReportStd.cc | 4 +-- util/ReportTcl.cc | 4 +-- util/StringUtil.cc | 4 +-- util/TokenParser.cc | 4 +-- verilog/VerilogParse.yy | 2 +- verilog/VerilogReader.cc | 2 +- verilog/VerilogWriter.cc | 2 +- 46 files changed, 77 insertions(+), 98 deletions(-) diff --git a/app/StaMain.cc b/app/StaMain.cc index 13ede6ca..fb350b64 100644 --- a/app/StaMain.cc +++ b/app/StaMain.cc @@ -17,7 +17,7 @@ #include "StaMain.hh" #include -#include +#include #include #include "Machine.hh" diff --git a/dcalc/ArnoldiDelayCalc.cc b/dcalc/ArnoldiDelayCalc.cc index 368740e0..53bda7f1 100644 --- a/dcalc/ArnoldiDelayCalc.cc +++ b/dcalc/ArnoldiDelayCalc.cc @@ -20,7 +20,7 @@ #include "ArnoldiDelayCalc.hh" -#include +#include #include // abs #include "Report.hh" diff --git a/dcalc/ArnoldiReduce.cc b/dcalc/ArnoldiReduce.cc index 8353e3d2..8e019426 100644 --- a/dcalc/ArnoldiReduce.cc +++ b/dcalc/ArnoldiReduce.cc @@ -20,11 +20,6 @@ #include "ArnoldiReduce.hh" -#include -#include -#include -#include - #include "Debug.hh" #include "MinMax.hh" #include "Sdc.hh" diff --git a/include/sta/ArcDelayCalc.hh b/include/sta/ArcDelayCalc.hh index 420f5951..37ed4baf 100644 --- a/include/sta/ArcDelayCalc.hh +++ b/include/sta/ArcDelayCalc.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "MinMax.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" diff --git a/include/sta/ArrayTable.hh b/include/sta/ArrayTable.hh index b0e7953d..9f606474 100644 --- a/include/sta/ArrayTable.hh +++ b/include/sta/ArrayTable.hh @@ -16,7 +16,7 @@ #pragma once -#include // memcpy +#include // memcpy #include #include "ObjectId.hh" diff --git a/include/sta/Debug.hh b/include/sta/Debug.hh index 959be91e..ed593b86 100644 --- a/include/sta/Debug.hh +++ b/include/sta/Debug.hh @@ -16,7 +16,8 @@ #pragma once -#include +#include + #include "Map.hh" #include "StringUtil.hh" diff --git a/include/sta/GraphClass.hh b/include/sta/GraphClass.hh index 9a0bba33..388d6a45 100644 --- a/include/sta/GraphClass.hh +++ b/include/sta/GraphClass.hh @@ -16,6 +16,8 @@ #pragma once +#include + #include "ObjectId.hh" #include "Set.hh" #include "Vector.hh" @@ -45,6 +47,8 @@ typedef int DcalcAPIndex; typedef int TagGroupIndex; typedef Vector GraphLoopSeq; +static constexpr int level_max = std::numeric_limits::max(); + // 16,777,215 tags static const int tag_group_index_bits = 24; static const TagGroupIndex tag_group_index_max = (1< + #include "GraphClass.hh" #include "DcalcAnalysisPt.hh" #include "StaState.hh" diff --git a/include/sta/Machine.hh b/include/sta/Machine.hh index cb095393..acb91ce3 100644 --- a/include/sta/Machine.hh +++ b/include/sta/Machine.hh @@ -64,7 +64,7 @@ #define vsnprint vsnprintf #endif -#include // size_t +#include // size_t namespace sta { diff --git a/include/sta/NetworkClass.hh b/include/sta/NetworkClass.hh index 98e610c0..dc2b98d5 100644 --- a/include/sta/NetworkClass.hh +++ b/include/sta/NetworkClass.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "Set.hh" #include "Vector.hh" #include "Iterator.hh" diff --git a/include/sta/Parasitics.hh b/include/sta/Parasitics.hh index eb809e15..4b772f11 100644 --- a/include/sta/Parasitics.hh +++ b/include/sta/Parasitics.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "StaState.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" diff --git a/include/sta/PatternMatch.hh b/include/sta/PatternMatch.hh index 0604d4f4..74171caa 100644 --- a/include/sta/PatternMatch.hh +++ b/include/sta/PatternMatch.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "Error.hh" // Don't require all of tcl.h. diff --git a/include/sta/Report.hh b/include/sta/Report.hh index 6b6fd6c1..552d9fb3 100644 --- a/include/sta/Report.hh +++ b/include/sta/Report.hh @@ -17,9 +17,10 @@ #pragma once #include -#include +#include #include #include + #include "Machine.hh" // __attribute__ struct Tcl_Interp; diff --git a/include/sta/ReportTcl.hh b/include/sta/ReportTcl.hh index 3d749439..7fd16198 100644 --- a/include/sta/ReportTcl.hh +++ b/include/sta/ReportTcl.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "Report.hh" namespace sta { diff --git a/include/sta/Set.hh b/include/sta/Set.hh index 0c4fe89a..9d0dd92e 100644 --- a/include/sta/Set.hh +++ b/include/sta/Set.hh @@ -17,8 +17,6 @@ #pragma once #include -#include -#include namespace sta { @@ -70,12 +68,9 @@ public: this->clear(); } - static bool - intersects(const std::set &set1, - const std::set &set2); static bool intersects(const std::set *set1, - const std::set *set2); + const std::set *set2); // Java style container itererator // Set::Iterator iter(set); @@ -172,47 +167,23 @@ Set::isSubset(const std::set *set2) } } -template -bool -Set::intersects(const std::set &set1, - const std::set &set2) -{ - return intersects(&set1, &set2); -} - template bool Set::intersects(const std::set *set1, - const std::set *set2) + const std::set *set2) { if (set1 && !set1->empty() && set2 && !set2->empty()) { - const std::set *small = set1; - const std::set *big = set2; - if (small->size() > big->size()) { - small = set2; - big = set1; - } - auto iter1 = big->begin(); - auto last1 = big->end(); - auto iter2 = small->begin(); - auto last2 = small->end(); - if (static_cast(small->size() + big->size()) < (small->size() * log(static_cast(big->size())))) { - while (iter1 != last1 && iter2 != last2) { - if (*iter1 < *iter2) - ++iter1; - else if (*iter2 < *iter1) - ++iter2; - else - return true; - } - } - else { - for (/* empty */; iter2 != last2; ++iter2) { - const KEY key2 = *iter2; - if (big->find(key2) != last1) - return true; - } + if (set2->size() > set1->size()) + std::swap(set1, set2); + auto end1 = set1->end(); + auto iter2 = set2->begin(); + auto end2 = set2->end(); + while (iter2 != end2) { + const KEY key2 = *iter2; + if (set1->find(key2) != end1) + return true; + iter2++; } } return false; diff --git a/include/sta/Stats.hh b/include/sta/Stats.hh index f17e48a0..2eb24c6e 100644 --- a/include/sta/Stats.hh +++ b/include/sta/Stats.hh @@ -16,7 +16,7 @@ #pragma once -#include // size_t +#include // size_t namespace sta { diff --git a/include/sta/StringUtil.hh b/include/sta/StringUtil.hh index 912b5bca..c661d472 100644 --- a/include/sta/StringUtil.hh +++ b/include/sta/StringUtil.hh @@ -16,9 +16,10 @@ #pragma once -#include -#include +#include +#include #include + #include "Machine.hh" // __attribute__ #include "Vector.hh" diff --git a/include/sta/TimingModel.hh b/include/sta/TimingModel.hh index 9fbe65a3..94604d78 100644 --- a/include/sta/TimingModel.hh +++ b/include/sta/TimingModel.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "Delay.hh" #include "LibertyClass.hh" diff --git a/include/sta/Transition.hh b/include/sta/Transition.hh index 9a21545d..ceb474d5 100644 --- a/include/sta/Transition.hh +++ b/include/sta/Transition.hh @@ -18,6 +18,7 @@ #include #include + #include "Iterator.hh" #include "Map.hh" #include "StringUtil.hh" diff --git a/include/sta/Zlib.hh b/include/sta/Zlib.hh index e5237a5f..9234b929 100644 --- a/include/sta/Zlib.hh +++ b/include/sta/Zlib.hh @@ -27,7 +27,7 @@ #else // ZLIB_FOUND -#include +#include #define gzFile FILE* #define gzopen fopen diff --git a/liberty/LibertyParse.yy b/liberty/LibertyParse.yy index 5d49158f..c683340d 100644 --- a/liberty/LibertyParse.yy +++ b/liberty/LibertyParse.yy @@ -15,8 +15,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include -#include +#include +#include #include "StringUtil.hh" #include "liberty/LibertyParser.hh" diff --git a/liberty/LibertyParser.cc b/liberty/LibertyParser.cc index bf24519a..3a49c186 100644 --- a/liberty/LibertyParser.cc +++ b/liberty/LibertyParser.cc @@ -16,8 +16,8 @@ #include "LibertyParser.hh" -#include -#include +#include +#include #include "Report.hh" #include "Error.hh" diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc index d48dc95f..864b014b 100644 --- a/liberty/LibertyReader.cc +++ b/liberty/LibertyReader.cc @@ -16,8 +16,8 @@ #include "LibertyReader.hh" -#include -#include +#include +#include #include "Report.hh" #include "Debug.hh" diff --git a/liberty/LibertyWriter.cc b/liberty/LibertyWriter.cc index cf04cb5d..87792688 100644 --- a/liberty/LibertyWriter.cc +++ b/liberty/LibertyWriter.cc @@ -16,7 +16,7 @@ #include "LibertyWriter.hh" -#include +#include #include #include "Units.hh" diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc index 9ec963f8..379fb093 100644 --- a/network/ConcreteLibrary.cc +++ b/network/ConcreteLibrary.cc @@ -16,7 +16,7 @@ #include "ConcreteLibrary.hh" -#include +#include #include "PatternMatch.hh" #include "PortDirection.hh" diff --git a/network/HpinDrvrLoad.cc b/network/HpinDrvrLoad.cc index aa8b1889..e68ed7d9 100644 --- a/network/HpinDrvrLoad.cc +++ b/network/HpinDrvrLoad.cc @@ -16,7 +16,7 @@ #include "HpinDrvrLoad.hh" -#include +#include #include "Network.hh" diff --git a/network/ParseBus.cc b/network/ParseBus.cc index 400e5ff1..f7da16e5 100644 --- a/network/ParseBus.cc +++ b/network/ParseBus.cc @@ -16,8 +16,8 @@ #include "ParseBus.hh" -#include -#include +#include +#include #include #include "StringUtil.hh" diff --git a/network/VerilogNamespace.cc b/network/VerilogNamespace.cc index bb48502f..8486e40a 100644 --- a/network/VerilogNamespace.cc +++ b/network/VerilogNamespace.cc @@ -16,7 +16,7 @@ #include "VerilogNamespace.hh" -#include +#include #include "StringUtil.hh" #include "ParseBus.hh" diff --git a/parasitics/SpefNamespace.cc b/parasitics/SpefNamespace.cc index 586636c9..5164be65 100644 --- a/parasitics/SpefNamespace.cc +++ b/parasitics/SpefNamespace.cc @@ -16,8 +16,8 @@ #include "SpefNamespace.hh" -#include -#include +#include +#include namespace sta { diff --git a/parasitics/SpefParse.yy b/parasitics/SpefParse.yy index 5d41a19e..a92d9251 100755 --- a/parasitics/SpefParse.yy +++ b/parasitics/SpefParse.yy @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include +#include #include "StringUtil.hh" #include "StringSeq.hh" diff --git a/sdc/WriteSdc.cc b/sdc/WriteSdc.cc index c5043443..eb172099 100644 --- a/sdc/WriteSdc.cc +++ b/sdc/WriteSdc.cc @@ -16,9 +16,9 @@ #include "WriteSdc.hh" -#include +#include #include -#include +#include #include "Zlib.hh" #include "Report.hh" diff --git a/sdf/SdfParse.yy b/sdf/SdfParse.yy index b2cf1e54..13d52a4b 100644 --- a/sdf/SdfParse.yy +++ b/sdf/SdfParse.yy @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include +#include #include "sdf/SdfReaderPvt.hh" diff --git a/sdf/SdfReader.cc b/sdf/SdfReader.cc index 5fa136e8..b5e24016 100644 --- a/sdf/SdfReader.cc +++ b/sdf/SdfReader.cc @@ -16,8 +16,8 @@ #include "sdf/SdfReader.hh" -#include -#include +#include +#include #include "Error.hh" #include "Debug.hh" diff --git a/sdf/SdfWriter.cc b/sdf/SdfWriter.cc index c3103ec1..016c95e3 100644 --- a/sdf/SdfWriter.cc +++ b/sdf/SdfWriter.cc @@ -16,8 +16,8 @@ #include "sdf/SdfWriter.hh" -#include -#include +#include +#include #include "Zlib.hh" #include "StaConfig.hh" // STA_VERSION diff --git a/search/Bfs.cc b/search/Bfs.cc index fce4515e..8daf1d0c 100644 --- a/search/Bfs.cc +++ b/search/Bfs.cc @@ -16,8 +16,6 @@ #include "Bfs.hh" -#include - #include "Report.hh" #include "Debug.hh" #include "Mutex.hh" @@ -323,7 +321,7 @@ BfsIterator::remove(Vertex *vertex) BfsFwdIterator::BfsFwdIterator(BfsIndex bfs_index, SearchPred *search_pred, StaState *sta) : - BfsIterator(bfs_index, 0, INT_MAX, search_pred, sta) + BfsIterator(bfs_index, 0, level_max, search_pred, sta) { } @@ -377,7 +375,7 @@ BfsFwdIterator::enqueueAdjacentVertices(Vertex *vertex, BfsBkwdIterator::BfsBkwdIterator(BfsIndex bfs_index, SearchPred *search_pred, StaState *sta) : - BfsIterator(bfs_index, INT_MAX, 0, search_pred, sta) + BfsIterator(bfs_index, level_max, 0, search_pred, sta) { } diff --git a/search/Crpr.cc b/search/Crpr.cc index d9261ae6..d06f4a6f 100644 --- a/search/Crpr.cc +++ b/search/Crpr.cc @@ -402,7 +402,7 @@ CheckCrpr::crprPossible(const Clock *clk1, || clk1->isGenerated() || clk2->isGenerated() // Different non-generated clocks with the same source pins (using -add). - || PinSet::intersects(clk1->pins(), clk2->pins())); + || PinSet::intersects(&clk1->pins(), &clk2->pins())); } } // namespace diff --git a/util/Error.cc b/util/Error.cc index 27b31772..2e8b37f1 100644 --- a/util/Error.cc +++ b/util/Error.cc @@ -16,8 +16,8 @@ #include "Error.hh" -#include -#include +#include +#include #include "StringUtil.hh" diff --git a/util/Hash.cc b/util/Hash.cc index 9525ffa7..820316c9 100644 --- a/util/Hash.cc +++ b/util/Hash.cc @@ -16,7 +16,7 @@ #include "Hash.hh" -#include +#include namespace sta { diff --git a/util/PatternMatch.cc b/util/PatternMatch.cc index 1202c369..1d077cfd 100644 --- a/util/PatternMatch.cc +++ b/util/PatternMatch.cc @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "PatternMatch.hh" -#include +#include #include namespace sta { diff --git a/util/ReportStd.cc b/util/ReportStd.cc index 5a8d2963..e5d5fa51 100644 --- a/util/ReportStd.cc +++ b/util/ReportStd.cc @@ -16,8 +16,8 @@ #include "ReportStd.hh" -#include -#include +#include +#include #include "Report.hh" diff --git a/util/ReportTcl.cc b/util/ReportTcl.cc index d188dde0..ba1cec19 100644 --- a/util/ReportTcl.cc +++ b/util/ReportTcl.cc @@ -16,8 +16,8 @@ #include "ReportTcl.hh" -#include -#include +#include +#include namespace sta { diff --git a/util/StringUtil.cc b/util/StringUtil.cc index 43c94b8c..6f70b2f8 100644 --- a/util/StringUtil.cc +++ b/util/StringUtil.cc @@ -17,8 +17,8 @@ #include "StringUtil.hh" #include -#include -#include +#include +#include #include "Machine.hh" #include "Mutex.hh" diff --git a/util/TokenParser.cc b/util/TokenParser.cc index d7f9a41a..cb089431 100644 --- a/util/TokenParser.cc +++ b/util/TokenParser.cc @@ -16,8 +16,8 @@ #include "TokenParser.hh" -#include -#include +#include +#include namespace sta { diff --git a/verilog/VerilogParse.yy b/verilog/VerilogParse.yy index fa876261..f135f826 100644 --- a/verilog/VerilogParse.yy +++ b/verilog/VerilogParse.yy @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include +#include #include "PortDirection.hh" #include "verilog/VerilogReaderPvt.hh" diff --git a/verilog/VerilogReader.cc b/verilog/VerilogReader.cc index f6b94864..4b0f36bd 100644 --- a/verilog/VerilogReader.cc +++ b/verilog/VerilogReader.cc @@ -16,7 +16,7 @@ #include "VerilogReader.hh" -#include +#include #include "Debug.hh" #include "Report.hh" diff --git a/verilog/VerilogWriter.cc b/verilog/VerilogWriter.cc index 7c407921..1e969d51 100644 --- a/verilog/VerilogWriter.cc +++ b/verilog/VerilogWriter.cc @@ -16,7 +16,7 @@ #include "VerilogWriter.hh" -#include +#include #include #include "Error.hh"