diff --git a/.gitignore b/.gitignore index 93c46a79..0f206d10 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ gmon.out build pvt -util/StaConfig.hh +include/sta/StaConfig.hh app/sta app/libOpenSTA.* diff --git a/CMakeLists.txt b/CMakeLists.txt index d2d01bfa..2d42d02c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,6 +234,8 @@ set(STA_PVT_HEADERS parasitics/SpefNamespace.hh parasitics/SpefReader.hh + sdc/WriteSdcPvt.hh + sdf/ReportAnnotation.hh sdf/Sdf.hh sdf/SdfReader.hh @@ -254,17 +256,13 @@ set(STA_PVT_HEADERS search/PathEnumed.hh search/PathEnum.hh search/PathVertex.hh - search/PathVertexRep.hh - search/PathRef.hh search/ReportPath.hh search/Sim.hh - search/StaState.hh search/Tag.hh search/TagGroup.hh search/VisitPathGroupVertices.hh search/WorstSlack.hh - util/StaConfig.hh util/Machine.hh verilog/VerilogReaderPvt.hh @@ -273,124 +271,129 @@ set(STA_PVT_HEADERS ) set(STA_PUBLIC_HEADERS - include/sta/app/StaMain.hh + include/sta/StaMain.hh - include/sta/dcalc/ArcDelayCalc.hh - include/sta/dcalc/DelayCalc.hh - include/sta/dcalc/GraphDelayCalc.hh - include/sta/dcalc/DcalcAnalysisPt.hh + include/sta/ArcDelayCalc.hh + include/sta/DelayCalc.hh + include/sta/GraphDelayCalc.hh + include/sta/DcalcAnalysisPt.hh - include/sta/graph/Delay.hh - include/sta/graph/DelayFloat.hh - include/sta/graph/DelayNormal1.hh - include/sta/graph/DelayNormal2.hh - include/sta/graph/Graph.hh - include/sta/graph/GraphClass.hh - include/sta/graph/GraphCmp.hh - include/sta/graph/VertexId.hh + include/sta/Delay.hh + include/sta/DelayFloat.hh + include/sta/DelayNormal1.hh + include/sta/DelayNormal2.hh + include/sta/Graph.hh + include/sta/GraphClass.hh + include/sta/GraphCmp.hh + include/sta/VertexId.hh - include/sta/liberty/EquivCells.hh - include/sta/liberty/FuncExpr.hh - include/sta/liberty/InternalPower.hh - include/sta/liberty/LeakagePower.hh - include/sta/liberty/Liberty.hh - include/sta/liberty/LibertyClass.hh - include/sta/liberty/Sequential.hh - include/sta/liberty/TableModel.hh - include/sta/liberty/LinearModel.hh - include/sta/liberty/TimingArc.hh - include/sta/liberty/TimingModel.hh - include/sta/liberty/TimingRole.hh - include/sta/liberty/Transition.hh - include/sta/liberty/Units.hh - include/sta/liberty/Wireload.hh + include/sta/EquivCells.hh + include/sta/FuncExpr.hh + include/sta/InternalPower.hh + include/sta/LeakagePower.hh + include/sta/Liberty.hh + include/sta/LibertyClass.hh + include/sta/Sequential.hh + include/sta/TableModel.hh + include/sta/LinearModel.hh + include/sta/TimingArc.hh + include/sta/TimingModel.hh + include/sta/TimingRole.hh + include/sta/Transition.hh + include/sta/Units.hh + include/sta/Wireload.hh - include/sta/network/ConcreteLibrary.hh - include/sta/network/ConcreteNetwork.hh - include/sta/network/HpinDrvrLoad.hh - include/sta/network/MakeConcreteNetwork.hh - include/sta/network/Network.hh - include/sta/network/NetworkClass.hh - include/sta/network/NetworkCmp.hh - include/sta/network/ParseBus.hh - include/sta/network/PortDirection.hh - include/sta/network/SdcNetwork.hh - include/sta/network/VerilogNamespace.hh + include/sta/ConcreteLibrary.hh + include/sta/ConcreteNetwork.hh + include/sta/HpinDrvrLoad.hh + include/sta/MakeConcreteNetwork.hh + include/sta/Network.hh + include/sta/NetworkClass.hh + include/sta/NetworkCmp.hh + include/sta/ParseBus.hh + include/sta/PortDirection.hh + include/sta/SdcNetwork.hh + include/sta/VerilogNamespace.hh - include/sta/parasitics/MakeConcreteParasitics.hh - include/sta/parasitics/NullParasitics.hh - include/sta/parasitics/Parasitics.hh - include/sta/parasitics/ParasiticsClass.hh + include/sta/MakeConcreteParasitics.hh + include/sta/NullParasitics.hh + include/sta/Parasitics.hh + include/sta/ParasiticsClass.hh - include/sta/sdc/Clock.hh - include/sta/sdc/ClockGatingCheck.hh - include/sta/sdc/ClockGroups.hh - include/sta/sdc/ClockInsertion.hh - include/sta/sdc/ClockLatency.hh - include/sta/sdc/CycleAccting.hh - include/sta/sdc/DataCheck.hh - include/sta/sdc/DeratingFactors.hh - include/sta/sdc/DisabledPorts.hh - include/sta/sdc/ExceptionPath.hh - include/sta/sdc/InputDrive.hh - include/sta/sdc/MinMaxValues.hh - include/sta/sdc/PinPair.hh - include/sta/sdc/PortDelay.hh - include/sta/sdc/PortExtCap.hh - include/sta/sdc/RiseFallMinMax.hh - include/sta/sdc/RiseFallValues.hh - include/sta/sdc/Sdc.hh - include/sta/sdc/SdcClass.hh - include/sta/sdc/SdcCmdComment.hh - include/sta/sdc/WriteSdc.hh - include/sta/sdc/WriteSdcPvt.hh + include/sta/Clock.hh + include/sta/ClockGatingCheck.hh + include/sta/ClockGroups.hh + include/sta/ClockInsertion.hh + include/sta/ClockLatency.hh + include/sta/CycleAccting.hh + include/sta/DataCheck.hh + include/sta/DeratingFactors.hh + include/sta/DisabledPorts.hh + include/sta/ExceptionPath.hh + include/sta/InputDrive.hh + include/sta/MinMaxValues.hh + include/sta/PinPair.hh + include/sta/PortDelay.hh + include/sta/PortExtCap.hh + include/sta/RiseFallMinMax.hh + include/sta/RiseFallValues.hh + include/sta/Sdc.hh + include/sta/SdcClass.hh + include/sta/SdcCmdComment.hh + include/sta/WriteSdc.hh - include/sta/search/Bfs.hh - include/sta/search/ClkInfo.hh - include/sta/search/Corner.hh - include/sta/search/Path.hh - include/sta/search/PathAnalysisPt.hh - include/sta/search/PathEnd.hh - include/sta/search/PathExpanded.hh - include/sta/search/PathGroup.hh - include/sta/search/Power.hh - include/sta/search/Property.hh - include/sta/search/Search.hh - include/sta/search/SearchClass.hh - include/sta/search/SearchPred.hh - include/sta/search/VertexVisitor.hh - include/sta/search/VisitPathEnds.hh - include/sta/search/WritePathSpice.hh + include/sta/Bfs.hh + include/sta/ClkInfo.hh + include/sta/Corner.hh + include/sta/Path.hh + include/sta/PathAnalysisPt.hh + include/sta/PathEnd.hh + include/sta/PathExpanded.hh + include/sta/PathGroup.hh + include/sta/PathRef.hh + include/sta/PathVertex.hh + include/sta/PathVertexRep.hh + include/sta/Power.hh + include/sta/Property.hh + include/sta/Search.hh + include/sta/SearchClass.hh + include/sta/SearchPred.hh + include/sta/Sta.hh + include/sta/StaState.hh + include/sta/VertexVisitor.hh + include/sta/VisitPathEnds.hh + include/sta/WritePathSpice.hh - include/sta/util/ArrayTable.hh - include/sta/util/Debug.hh - include/sta/util/DispatchQueue.hh - include/sta/util/DisallowCopyAssign.hh - include/sta/util/EnumNameMap.hh - include/sta/util/Error.hh - include/sta/util/Fuzzy.hh - include/sta/util/Hash.hh - include/sta/util/HashSet.hh - include/sta/util/Iterator.hh - include/sta/util/Map.hh - include/sta/util/MinMax.hh - include/sta/util/Mutex.hh - include/sta/util/ObjectId.hh - include/sta/util/ObjectTable.hh - include/sta/util/PatternMatch.hh - include/sta/util/Report.hh - include/sta/util/ReportStd.hh - include/sta/util/ReportTcl.hh - include/sta/util/Set.hh - include/sta/util/Stats.hh - include/sta/util/StringSeq.hh - include/sta/util/StringSet.hh - include/sta/util/StringUtil.hh - include/sta/util/TokenParser.hh - include/sta/util/UnorderedMap.hh - include/sta/util/UnorderedSet.hh - include/sta/util/Vector.hh - include/sta/util/Zlib.hh + include/sta/ArrayTable.hh + include/sta/Debug.hh + include/sta/DispatchQueue.hh + include/sta/DisallowCopyAssign.hh + include/sta/EnumNameMap.hh + include/sta/Error.hh + include/sta/Fuzzy.hh + include/sta/Hash.hh + include/sta/HashSet.hh + include/sta/Iterator.hh + include/sta/Map.hh + include/sta/MinMax.hh + include/sta/Mutex.hh + include/sta/ObjectId.hh + include/sta/ObjectTable.hh + include/sta/PatternMatch.hh + include/sta/Report.hh + include/sta/ReportStd.hh + include/sta/ReportTcl.hh + include/sta/Set.hh + include/sta/Stats.hh + include/sta/StaConfig.hh + include/sta/StringSeq.hh + include/sta/StringSet.hh + include/sta/StringUtil.hh + include/sta/TokenParser.hh + include/sta/UnorderedMap.hh + include/sta/UnorderedSet.hh + include/sta/Vector.hh + include/sta/Zlib.hh ) # Source files. @@ -586,9 +589,9 @@ if("${SSTA}" STREQUAL "") endif() message(STATUS "SSTA: ${SSTA}") -# configure a header file to pass some of the CMake settins +# configure a header file to pass some of the CMake settings configure_file(${STA_HOME}/util/StaConfig.hh.cmake - ${STA_HOME}/util/StaConfig.hh + ${STA_HOME}/include/sta/StaConfig.hh ) ################################################################ diff --git a/app/Main.cc b/app/Main.cc index aefb7c71..e5595079 100644 --- a/app/Main.cc +++ b/app/Main.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "app/StaMain.hh" +#include "StaMain.hh" #include #include -#include "util/StaConfig.hh" // STA_VERSION -#include "util/StringUtil.hh" -#include "search/Sta.hh" +#include "StaConfig.hh" // STA_VERSION +#include "StringUtil.hh" +#include "Sta.hh" namespace sta { diff --git a/app/StaMain.cc b/app/StaMain.cc index d6d2bff3..88d5821d 100644 --- a/app/StaMain.cc +++ b/app/StaMain.cc @@ -14,14 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "app/StaMain.hh" +#include "StaMain.hh" #include #include -#include "util/StringUtil.hh" -#include "util/Vector.hh" -#include "search/Sta.hh" +#include "util/Machine.hh" +#include "StringUtil.hh" +#include "Vector.hh" +#include "Sta.hh" namespace sta { @@ -106,7 +107,7 @@ evalTclInit(Tcl_Interp *interp, Tcl_Eval(interp, "$errorInfo"); const char *tcl_err = Tcl_GetStringResult(interp); fprintf(stderr, "Error: TCL init script: %s.\n", tcl_err); - fprintf(stderr, " Try deleting app/TclInitVar.cc and rebuilding.\n"); + fprintf(stderr, " Try deleting TclInitVar.cc and rebuilding.\n"); exit(0); } delete [] unencoded; diff --git a/dcalc/ArcDelayCalc.cc b/dcalc/ArcDelayCalc.cc index 575698e7..8a4042fe 100644 --- a/dcalc/ArcDelayCalc.cc +++ b/dcalc/ArcDelayCalc.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/ArcDelayCalc.hh" +#include "ArcDelayCalc.hh" -#include "liberty/TimingModel.hh" -#include "liberty/TimingArc.hh" -#include "dcalc/GraphDelayCalc.hh" +#include "TimingModel.hh" +#include "TimingArc.hh" +#include "GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/ArnoldiDelayCalc.cc b/dcalc/ArnoldiDelayCalc.cc index 75cd4df6..b4f06b92 100644 --- a/dcalc/ArnoldiDelayCalc.cc +++ b/dcalc/ArnoldiDelayCalc.cc @@ -23,24 +23,24 @@ #include #include // abs -#include "util/Report.hh" -#include "util/Debug.hh" -#include "liberty/Units.hh" -#include "liberty/Liberty.hh" -#include "liberty/TimingModel.hh" -#include "liberty/TimingArc.hh" -#include "liberty/TableModel.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "parasitics/Parasitics.hh" -#include "sdc/Sdc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/DelayCalc.hh" -#include "dcalc/ArcDelayCalc.hh" -#include "dcalc/RCDelayCalc.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "dcalc/Arnoldi.hh" -#include "dcalc/ArnoldiReduce.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Units.hh" +#include "Liberty.hh" +#include "TimingModel.hh" +#include "TimingArc.hh" +#include "TableModel.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Parasitics.hh" +#include "Sdc.hh" +#include "DcalcAnalysisPt.hh" +#include "DelayCalc.hh" +#include "ArcDelayCalc.hh" +#include "RCDelayCalc.hh" +#include "GraphDelayCalc.hh" +#include "Arnoldi.hh" +#include "ArnoldiReduce.hh" namespace sta { diff --git a/dcalc/ArnoldiReduce.cc b/dcalc/ArnoldiReduce.cc index 37f30904..e41877da 100644 --- a/dcalc/ArnoldiReduce.cc +++ b/dcalc/ArnoldiReduce.cc @@ -25,12 +25,12 @@ #include #include -#include "util/Debug.hh" -#include "util/MinMax.hh" -#include "sdc/Sdc.hh" -#include "network/Network.hh" -#include "liberty/Units.hh" -#include "dcalc/Arnoldi.hh" +#include "Debug.hh" +#include "MinMax.hh" +#include "Sdc.hh" +#include "Network.hh" +#include "Units.hh" +#include "Arnoldi.hh" #include "parasitics/ConcreteParasiticsPvt.hh" namespace sta { diff --git a/dcalc/ArnoldiReduce.hh b/dcalc/ArnoldiReduce.hh index 1a41ff9d..da022e1b 100644 --- a/dcalc/ArnoldiReduce.hh +++ b/dcalc/ArnoldiReduce.hh @@ -20,12 +20,12 @@ #pragma once -#include "util/Map.hh" -#include "liberty/Transition.hh" -#include "network/NetworkClass.hh" -#include "parasitics/ParasiticsClass.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" +#include "Map.hh" +#include "Transition.hh" +#include "NetworkClass.hh" +#include "ParasiticsClass.hh" +#include "SdcClass.hh" +#include "StaState.hh" namespace sta { diff --git a/dcalc/DcalcAnalysisPt.cc b/dcalc/DcalcAnalysisPt.cc index 007a2fec..2dfb635a 100644 --- a/dcalc/DcalcAnalysisPt.cc +++ b/dcalc/DcalcAnalysisPt.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringUtil.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/Corner.hh" +#include "StringUtil.hh" +#include "DcalcAnalysisPt.hh" +#include "Corner.hh" namespace sta { diff --git a/dcalc/DelayCalc.cc b/dcalc/DelayCalc.cc index 8f1c3b94..03220c4e 100644 --- a/dcalc/DelayCalc.cc +++ b/dcalc/DelayCalc.cc @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/DelayCalc.hh" +#include "DelayCalc.hh" -#include "util/Map.hh" -#include "util/StringUtil.hh" -#include "dcalc/UnitDelayCalc.hh" -#include "dcalc/LumpedCapDelayCalc.hh" -#include "dcalc/SimpleRCDelayCalc.hh" -#include "dcalc/DmpDelayCalc.hh" -#include "dcalc/ArnoldiDelayCalc.hh" +#include "Map.hh" +#include "StringUtil.hh" +#include "UnitDelayCalc.hh" +#include "LumpedCapDelayCalc.hh" +#include "SimpleRCDelayCalc.hh" +#include "DmpDelayCalc.hh" +#include "ArnoldiDelayCalc.hh" namespace sta { diff --git a/dcalc/DelayCalc.i b/dcalc/DelayCalc.i index 99c65bd5..c85f2d95 100644 --- a/dcalc/DelayCalc.i +++ b/dcalc/DelayCalc.i @@ -18,7 +18,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Sta.hh" +#include "Sta.hh" %} diff --git a/dcalc/DmpCeff.cc b/dcalc/DmpCeff.cc index 25718bd3..29f4ce4a 100644 --- a/dcalc/DmpCeff.cc +++ b/dcalc/DmpCeff.cc @@ -22,22 +22,22 @@ // The only real change from the paper is that Vl, the measured low // slew voltage is matched instead of y20 in eqn 12. -#include "dcalc/DmpCeff.hh" +#include "DmpCeff.hh" #include // abs, min #include // sqrt -#include "util/Report.hh" -#include "util/Debug.hh" -#include "liberty/Units.hh" -#include "liberty/TimingArc.hh" -#include "liberty/TableModel.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/ArcDelayCalc.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Units.hh" +#include "TimingArc.hh" +#include "TableModel.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" +#include "ArcDelayCalc.hh" namespace sta { diff --git a/dcalc/DmpCeff.hh b/dcalc/DmpCeff.hh index ae94afa3..9b427592 100644 --- a/dcalc/DmpCeff.hh +++ b/dcalc/DmpCeff.hh @@ -16,8 +16,8 @@ #pragma once -#include "liberty/LibertyClass.hh" -#include "dcalc/RCDelayCalc.hh" +#include "LibertyClass.hh" +#include "RCDelayCalc.hh" namespace sta { diff --git a/dcalc/DmpDelayCalc.cc b/dcalc/DmpDelayCalc.cc index 641a3135..acaa5880 100644 --- a/dcalc/DmpDelayCalc.cc +++ b/dcalc/DmpDelayCalc.cc @@ -16,14 +16,14 @@ #include "DmpDelayCalc.hh" -#include "liberty/TableModel.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "dcalc/DmpCeff.hh" +#include "TableModel.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "DmpCeff.hh" namespace sta { diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc index 53db1c39..5376e2f6 100644 --- a/dcalc/GraphDelayCalc.cc +++ b/dcalc/GraphDelayCalc.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/GraphDelayCalc.hh" +#include "GraphDelayCalc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Corner.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Corner.hh" namespace sta { diff --git a/dcalc/GraphDelayCalc1.cc b/dcalc/GraphDelayCalc1.cc index a3f6c7bf..b59b16d7 100644 --- a/dcalc/GraphDelayCalc1.cc +++ b/dcalc/GraphDelayCalc1.cc @@ -14,27 +14,27 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Debug.hh" -#include "util/Stats.hh" -#include "util/MinMax.hh" -#include "util/Mutex.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/InputDrive.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "parasitics/Parasitics.hh" +#include "Debug.hh" +#include "Stats.hh" +#include "MinMax.hh" +#include "Mutex.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "InputDrive.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "Parasitics.hh" #include "search/Levelize.hh" -#include "search/Corner.hh" -#include "search/SearchPred.hh" -#include "search/Bfs.hh" -#include "dcalc/ArcDelayCalc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/NetCaps.hh" -#include "dcalc/GraphDelayCalc1.hh" +#include "Corner.hh" +#include "SearchPred.hh" +#include "Bfs.hh" +#include "ArcDelayCalc.hh" +#include "DcalcAnalysisPt.hh" +#include "NetCaps.hh" +#include "GraphDelayCalc1.hh" namespace sta { diff --git a/dcalc/GraphDelayCalc1.hh b/dcalc/GraphDelayCalc1.hh index 52bf7dfd..55b4f9d6 100644 --- a/dcalc/GraphDelayCalc1.hh +++ b/dcalc/GraphDelayCalc1.hh @@ -18,7 +18,7 @@ #include -#include "dcalc/GraphDelayCalc.hh" +#include "GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/LumpedCapDelayCalc.cc b/dcalc/LumpedCapDelayCalc.cc index 4ba9c764..79b8710c 100644 --- a/dcalc/LumpedCapDelayCalc.cc +++ b/dcalc/LumpedCapDelayCalc.cc @@ -14,18 +14,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/LumpedCapDelayCalc.hh" +#include "LumpedCapDelayCalc.hh" -#include "util/Debug.hh" -#include "liberty/Units.hh" -#include "liberty/TimingArc.hh" -#include "liberty/TimingModel.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" +#include "Debug.hh" +#include "Units.hh" +#include "TimingArc.hh" +#include "TimingModel.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/LumpedCapDelayCalc.hh b/dcalc/LumpedCapDelayCalc.hh index ee6fc806..1ea0f70c 100644 --- a/dcalc/LumpedCapDelayCalc.hh +++ b/dcalc/LumpedCapDelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "dcalc/ArcDelayCalc.hh" +#include "ArcDelayCalc.hh" namespace sta { diff --git a/dcalc/NetCaps.cc b/dcalc/NetCaps.cc index b244fb04..423f358f 100644 --- a/dcalc/NetCaps.cc +++ b/dcalc/NetCaps.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/NetCaps.hh" +#include "NetCaps.hh" namespace sta { diff --git a/dcalc/NetCaps.hh b/dcalc/NetCaps.hh index 4a2673a0..288a124b 100644 --- a/dcalc/NetCaps.hh +++ b/dcalc/NetCaps.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/DisallowCopyAssign.hh" +#include "DisallowCopyAssign.hh" namespace sta { diff --git a/dcalc/RCDelayCalc.cc b/dcalc/RCDelayCalc.cc index eac281f8..5ced8fc6 100644 --- a/dcalc/RCDelayCalc.cc +++ b/dcalc/RCDelayCalc.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/RCDelayCalc.hh" +#include "RCDelayCalc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/GraphDelayCalc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/SimpleRCDelayCalc.cc b/dcalc/SimpleRCDelayCalc.cc index 3dbd7079..c0c1497f 100644 --- a/dcalc/SimpleRCDelayCalc.cc +++ b/dcalc/SimpleRCDelayCalc.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/SimpleRCDelayCalc.hh" +#include "SimpleRCDelayCalc.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" namespace sta { diff --git a/dcalc/UnitDelayCalc.cc b/dcalc/UnitDelayCalc.cc index b97b81a8..8c498ced 100644 --- a/dcalc/UnitDelayCalc.cc +++ b/dcalc/UnitDelayCalc.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "dcalc/UnitDelayCalc.hh" +#include "UnitDelayCalc.hh" -#include "liberty/Units.hh" +#include "Units.hh" namespace sta { diff --git a/dcalc/UnitDelayCalc.hh b/dcalc/UnitDelayCalc.hh index bf12ac58..446ea1bd 100644 --- a/dcalc/UnitDelayCalc.hh +++ b/dcalc/UnitDelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "dcalc/ArcDelayCalc.hh" +#include "ArcDelayCalc.hh" namespace sta { diff --git a/graph/DelayFloat.cc b/graph/DelayFloat.cc index dae4ac94..9046da8c 100644 --- a/graph/DelayFloat.cc +++ b/graph/DelayFloat.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "graph/Delay.hh" +#include "Delay.hh" -#include "util/StaConfig.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "search/StaState.hh" +#include "StaConfig.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "StaState.hh" // Non-SSTA compilation. #if !SSTA diff --git a/graph/DelayNormal1.cc b/graph/DelayNormal1.cc index 0dded0b8..4afad127 100644 --- a/graph/DelayNormal1.cc +++ b/graph/DelayNormal1.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "graph/Delay.hh" +#include "Delay.hh" #include // sqrt -#include "util/StaConfig.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "search/StaState.hh" +#include "StaConfig.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "StaState.hh" // SSTA compilation. #if (SSTA == 1) diff --git a/graph/DelayNormal2.cc b/graph/DelayNormal2.cc index ca3bed6f..1edeafd4 100644 --- a/graph/DelayNormal2.cc +++ b/graph/DelayNormal2.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "graph/Delay.hh" +#include "Delay.hh" #include // sqrt -#include "util/StaConfig.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "search/StaState.hh" +#include "StaConfig.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "StaState.hh" // SSTA compilation. #if (SSTA == 2) diff --git a/graph/Graph.cc b/graph/Graph.cc index 6164e8e1..46833f82 100644 --- a/graph/Graph.cc +++ b/graph/Graph.cc @@ -14,21 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "graph/Graph.hh" +#include "Graph.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/Stats.hh" -#include "util/Error.hh" -#include "util/Debug.hh" -#include "util/MinMax.hh" -#include "util/Mutex.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "dcalc/DcalcAnalysisPt.hh" +#include "DisallowCopyAssign.hh" +#include "Stats.hh" +#include "Error.hh" +#include "Debug.hh" +#include "MinMax.hh" +#include "Mutex.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "DcalcAnalysisPt.hh" namespace sta { diff --git a/graph/GraphCmp.cc b/graph/GraphCmp.cc index 170201ae..a475065c 100644 --- a/graph/GraphCmp.cc +++ b/graph/GraphCmp.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringUtil.hh" -#include "network/Network.hh" -#include "network/NetworkCmp.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" +#include "StringUtil.hh" +#include "Network.hh" +#include "NetworkCmp.hh" +#include "Graph.hh" +#include "GraphCmp.hh" namespace sta { diff --git a/include/sta/dcalc/ArcDelayCalc.hh b/include/sta/ArcDelayCalc.hh similarity index 95% rename from include/sta/dcalc/ArcDelayCalc.hh rename to include/sta/ArcDelayCalc.hh index bd77f776..62c1d3f4 100644 --- a/include/sta/dcalc/ArcDelayCalc.hh +++ b/include/sta/ArcDelayCalc.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "graph/Delay.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "Delay.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/util/ArrayTable.hh b/include/sta/ArrayTable.hh similarity index 100% rename from include/sta/util/ArrayTable.hh rename to include/sta/ArrayTable.hh diff --git a/include/sta/search/Bfs.hh b/include/sta/Bfs.hh similarity index 96% rename from include/sta/search/Bfs.hh rename to include/sta/Bfs.hh index 73e14071..b420b250 100644 --- a/include/sta/search/Bfs.hh +++ b/include/sta/Bfs.hh @@ -18,12 +18,12 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/Set.hh" -#include "graph/GraphClass.hh" -#include "search/VertexVisitor.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "Set.hh" +#include "GraphClass.hh" +#include "VertexVisitor.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/search/ClkInfo.hh b/include/sta/ClkInfo.hh similarity index 96% rename from include/sta/search/ClkInfo.hh rename to include/sta/ClkInfo.hh index d225a9f1..97bd678f 100644 --- a/include/sta/search/ClkInfo.hh +++ b/include/sta/ClkInfo.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/Transition.hh" -#include "search/SearchClass.hh" -#include "search/PathVertexRep.hh" +#include "DisallowCopyAssign.hh" +#include "Transition.hh" +#include "SearchClass.hh" +#include "PathVertexRep.hh" namespace sta { diff --git a/include/sta/sdc/Clock.hh b/include/sta/Clock.hh similarity index 97% rename from include/sta/sdc/Clock.hh rename to include/sta/Clock.hh index 754887a5..d38c65ee 100644 --- a/include/sta/sdc/Clock.hh +++ b/include/sta/Clock.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "sdc/RiseFallMinMax.hh" -#include "sdc/SdcClass.hh" -#include "sdc/SdcCmdComment.hh" -#include "graph/GraphClass.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "RiseFallMinMax.hh" +#include "SdcClass.hh" +#include "SdcCmdComment.hh" +#include "GraphClass.hh" namespace sta { diff --git a/include/sta/sdc/ClockGatingCheck.hh b/include/sta/ClockGatingCheck.hh similarity index 91% rename from include/sta/sdc/ClockGatingCheck.hh rename to include/sta/ClockGatingCheck.hh index 77c0c527..a049c73b 100644 --- a/include/sta/sdc/ClockGatingCheck.hh +++ b/include/sta/ClockGatingCheck.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallMinMax.hh" +#include "DisallowCopyAssign.hh" +#include "SdcClass.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/include/sta/sdc/ClockGroups.hh b/include/sta/ClockGroups.hh similarity index 95% rename from include/sta/sdc/ClockGroups.hh rename to include/sta/ClockGroups.hh index 014d564a..ed154b7f 100644 --- a/include/sta/sdc/ClockGroups.hh +++ b/include/sta/ClockGroups.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "sdc/SdcCmdComment.hh" -#include "sdc/SdcClass.hh" +#include "DisallowCopyAssign.hh" +#include "SdcCmdComment.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/sdc/ClockInsertion.hh b/include/sta/ClockInsertion.hh similarity index 89% rename from include/sta/sdc/ClockInsertion.hh rename to include/sta/ClockInsertion.hh index d5a00920..21932658 100644 --- a/include/sta/sdc/ClockInsertion.hh +++ b/include/sta/ClockInsertion.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallMinMax.hh" -#include "liberty/Transition.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "RiseFallMinMax.hh" +#include "Transition.hh" namespace sta { diff --git a/include/sta/sdc/ClockLatency.hh b/include/sta/ClockLatency.hh similarity index 88% rename from include/sta/sdc/ClockLatency.hh rename to include/sta/ClockLatency.hh index 077749ad..b9257662 100644 --- a/include/sta/sdc/ClockLatency.hh +++ b/include/sta/ClockLatency.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "network/NetworkClass.hh" -#include "liberty/Transition.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallMinMax.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "NetworkClass.hh" +#include "Transition.hh" +#include "SdcClass.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/include/sta/network/ConcreteLibrary.hh b/include/sta/ConcreteLibrary.hh similarity index 98% rename from include/sta/network/ConcreteLibrary.hh rename to include/sta/ConcreteLibrary.hh index 440bf93e..68a277a7 100644 --- a/include/sta/network/ConcreteLibrary.hh +++ b/include/sta/ConcreteLibrary.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/StringUtil.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Map.hh" +#include "StringUtil.hh" +#include "NetworkClass.hh" // The classes defined in this file are a contrete implementation of // the library API. They can be used by a reader to construct classes diff --git a/include/sta/network/ConcreteNetwork.hh b/include/sta/ConcreteNetwork.hh similarity index 98% rename from include/sta/network/ConcreteNetwork.hh rename to include/sta/ConcreteNetwork.hh index 8fdeb547..7b418772 100644 --- a/include/sta/network/ConcreteNetwork.hh +++ b/include/sta/ConcreteNetwork.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Map.hh" -#include "util/Set.hh" -#include "util/StringUtil.hh" -#include "network/Network.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "Map.hh" +#include "Set.hh" +#include "StringUtil.hh" +#include "Network.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/search/Corner.hh b/include/sta/Corner.hh similarity index 96% rename from include/sta/search/Corner.hh rename to include/sta/Corner.hh index 72f1b42b..98045abe 100644 --- a/include/sta/search/Corner.hh +++ b/include/sta/Corner.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "util/Vector.hh" -#include "util/StringSet.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "Vector.hh" +#include "StringSet.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/sdc/CycleAccting.hh b/include/sta/CycleAccting.hh similarity index 94% rename from include/sta/sdc/CycleAccting.hh rename to include/sta/CycleAccting.hh index 7c0969fd..a412043f 100644 --- a/include/sta/sdc/CycleAccting.hh +++ b/include/sta/CycleAccting.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/TimingRole.hh" -#include "search/StaState.hh" -#include "sdc/SdcClass.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "TimingRole.hh" +#include "StaState.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/sdc/DataCheck.hh b/include/sta/DataCheck.hh similarity index 89% rename from include/sta/sdc/DataCheck.hh rename to include/sta/DataCheck.hh index eb5cdd28..bb40a8ff 100644 --- a/include/sta/sdc/DataCheck.hh +++ b/include/sta/DataCheck.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "network/NetworkCmp.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallMinMax.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "NetworkCmp.hh" +#include "SdcClass.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/include/sta/dcalc/DcalcAnalysisPt.hh b/include/sta/DcalcAnalysisPt.hh similarity index 90% rename from include/sta/dcalc/DcalcAnalysisPt.hh rename to include/sta/DcalcAnalysisPt.hh index 5d42ec52..57c5cabd 100644 --- a/include/sta/dcalc/DcalcAnalysisPt.hh +++ b/include/sta/DcalcAnalysisPt.hh @@ -16,14 +16,14 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/MinMax.hh" -#include "liberty/LibertyClass.hh" -#include "sdc/SdcClass.hh" -#include "parasitics/ParasiticsClass.hh" -#include "graph/GraphClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "MinMax.hh" +#include "LibertyClass.hh" +#include "SdcClass.hh" +#include "ParasiticsClass.hh" +#include "GraphClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/util/Debug.hh b/include/sta/Debug.hh similarity index 100% rename from include/sta/util/Debug.hh rename to include/sta/Debug.hh diff --git a/include/sta/graph/Delay.hh b/include/sta/Delay.hh similarity index 88% rename from include/sta/graph/Delay.hh rename to include/sta/Delay.hh index 0039366a..06ca2929 100644 --- a/include/sta/graph/Delay.hh +++ b/include/sta/Delay.hh @@ -14,19 +14,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StaConfig.hh" +#include "StaConfig.hh" #pragma once #if (SSTA == 1) // Delays are Normal PDFs. - #include "graph/DelayNormal1.hh" + #include "DelayNormal1.hh" #elif (SSTA == 2) // Delays are Normal PDFs with early/late sigma. - #include "graph/DelayNormal2.hh" + #include "DelayNormal2.hh" #else // Delays are floats. - #include "graph/DelayFloat.hh" + #include "DelayFloat.hh" #endif namespace sta { diff --git a/include/sta/dcalc/DelayCalc.hh b/include/sta/DelayCalc.hh similarity index 97% rename from include/sta/dcalc/DelayCalc.hh rename to include/sta/DelayCalc.hh index 3c49d9fd..501a5d75 100644 --- a/include/sta/dcalc/DelayCalc.hh +++ b/include/sta/DelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/StringSeq.hh" +#include "StringSeq.hh" namespace sta { diff --git a/include/sta/graph/DelayFloat.hh b/include/sta/DelayFloat.hh similarity index 97% rename from include/sta/graph/DelayFloat.hh rename to include/sta/DelayFloat.hh index b86d78a1..896145d3 100644 --- a/include/sta/graph/DelayFloat.hh +++ b/include/sta/DelayFloat.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/MinMax.hh" -#include "util/Fuzzy.hh" +#include "MinMax.hh" +#include "Fuzzy.hh" // Delay values defined as floats. diff --git a/include/sta/graph/DelayNormal1.hh b/include/sta/DelayNormal1.hh similarity index 99% rename from include/sta/graph/DelayNormal1.hh rename to include/sta/DelayNormal1.hh index f4cb7c07..19f20810 100644 --- a/include/sta/graph/DelayNormal1.hh +++ b/include/sta/DelayNormal1.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/MinMax.hh" +#include "MinMax.hh" namespace sta { diff --git a/include/sta/graph/DelayNormal2.hh b/include/sta/DelayNormal2.hh similarity index 99% rename from include/sta/graph/DelayNormal2.hh rename to include/sta/DelayNormal2.hh index ec5bfe54..73b07419 100644 --- a/include/sta/graph/DelayNormal2.hh +++ b/include/sta/DelayNormal2.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/MinMax.hh" +#include "MinMax.hh" namespace sta { diff --git a/include/sta/sdc/DeratingFactors.hh b/include/sta/DeratingFactors.hh similarity index 94% rename from include/sta/sdc/DeratingFactors.hh rename to include/sta/DeratingFactors.hh index b6797440..e233fc8b 100644 --- a/include/sta/sdc/DeratingFactors.hh +++ b/include/sta/DeratingFactors.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/LibertyClass.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallMinMax.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "LibertyClass.hh" +#include "SdcClass.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/include/sta/sdc/DisabledPorts.hh b/include/sta/DisabledPorts.hh similarity index 95% rename from include/sta/sdc/DisabledPorts.hh rename to include/sta/DisabledPorts.hh index 743d6b51..1503508a 100644 --- a/include/sta/sdc/DisabledPorts.hh +++ b/include/sta/DisabledPorts.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Map.hh" -#include "network/NetworkClass.hh" -#include "liberty/LibertyClass.hh" -#include "sdc/SdcClass.hh" +#include "DisallowCopyAssign.hh" +#include "Map.hh" +#include "NetworkClass.hh" +#include "LibertyClass.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/util/DisallowCopyAssign.hh b/include/sta/DisallowCopyAssign.hh similarity index 100% rename from include/sta/util/DisallowCopyAssign.hh rename to include/sta/DisallowCopyAssign.hh diff --git a/include/sta/util/DispatchQueue.hh b/include/sta/DispatchQueue.hh similarity index 100% rename from include/sta/util/DispatchQueue.hh rename to include/sta/DispatchQueue.hh diff --git a/include/sta/util/EnumNameMap.hh b/include/sta/EnumNameMap.hh similarity index 100% rename from include/sta/util/EnumNameMap.hh rename to include/sta/EnumNameMap.hh diff --git a/include/sta/liberty/EquivCells.hh b/include/sta/EquivCells.hh similarity index 95% rename from include/sta/liberty/EquivCells.hh rename to include/sta/EquivCells.hh index 2c13f4a0..ec66da38 100644 --- a/include/sta/liberty/EquivCells.hh +++ b/include/sta/EquivCells.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/UnorderedMap.hh" -#include "liberty/LibertyClass.hh" +#include "Vector.hh" +#include "Map.hh" +#include "UnorderedMap.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/util/Error.hh b/include/sta/Error.hh similarity index 100% rename from include/sta/util/Error.hh rename to include/sta/Error.hh diff --git a/include/sta/sdc/ExceptionPath.hh b/include/sta/ExceptionPath.hh similarity index 99% rename from include/sta/sdc/ExceptionPath.hh rename to include/sta/ExceptionPath.hh index e7b77d55..c04629ad 100644 --- a/include/sta/sdc/ExceptionPath.hh +++ b/include/sta/ExceptionPath.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Error.hh" -#include "util/Set.hh" -#include "sdc/SdcCmdComment.hh" -#include "sdc/SdcClass.hh" +#include "DisallowCopyAssign.hh" +#include "Error.hh" +#include "Set.hh" +#include "SdcCmdComment.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/liberty/FuncExpr.hh b/include/sta/FuncExpr.hh similarity index 95% rename from include/sta/liberty/FuncExpr.hh rename to include/sta/FuncExpr.hh index a03a9261..113bd72f 100644 --- a/include/sta/liberty/FuncExpr.hh +++ b/include/sta/FuncExpr.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Set.hh" -#include "network/NetworkClass.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "Set.hh" +#include "NetworkClass.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/util/Fuzzy.hh b/include/sta/Fuzzy.hh similarity index 100% rename from include/sta/util/Fuzzy.hh rename to include/sta/Fuzzy.hh diff --git a/include/sta/graph/Graph.hh b/include/sta/Graph.hh similarity index 97% rename from include/sta/graph/Graph.hh rename to include/sta/Graph.hh index b151907e..32141e7b 100644 --- a/include/sta/graph/Graph.hh +++ b/include/sta/Graph.hh @@ -18,25 +18,24 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/Map.hh" -#include "util/Vector.hh" -#include "util/ObjectTable.hh" -#include "util/ArrayTable.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "graph/Delay.hh" -#include "graph/GraphClass.hh" -#include "graph/VertexId.hh" -#include "search/PathVertexRep.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "Map.hh" +#include "Vector.hh" +#include "ObjectTable.hh" +#include "ArrayTable.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "Delay.hh" +#include "GraphClass.hh" +#include "VertexId.hh" +#include "PathVertexRep.hh" +#include "StaState.hh" namespace sta { class MinMax; class Sdc; -class PathVertexRep; enum class LevelColor { white, gray, black }; diff --git a/include/sta/graph/GraphClass.hh b/include/sta/GraphClass.hh similarity index 92% rename from include/sta/graph/GraphClass.hh rename to include/sta/GraphClass.hh index a133a771..d7654415 100644 --- a/include/sta/graph/GraphClass.hh +++ b/include/sta/GraphClass.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/ObjectId.hh" -#include "util/Set.hh" -#include "util/Vector.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" +#include "ObjectId.hh" +#include "Set.hh" +#include "Vector.hh" +#include "MinMax.hh" +#include "Transition.hh" namespace sta { diff --git a/include/sta/graph/GraphCmp.hh b/include/sta/GraphCmp.hh similarity index 92% rename from include/sta/graph/GraphCmp.hh rename to include/sta/GraphCmp.hh index 028a1bfb..a21618a8 100644 --- a/include/sta/graph/GraphCmp.hh +++ b/include/sta/GraphCmp.hh @@ -16,9 +16,9 @@ #pragma once -#include "network/NetworkClass.hh" -#include "network/NetworkCmp.hh" -#include "graph/GraphClass.hh" +#include "NetworkClass.hh" +#include "NetworkCmp.hh" +#include "GraphClass.hh" namespace sta { diff --git a/include/sta/dcalc/GraphDelayCalc.hh b/include/sta/GraphDelayCalc.hh similarity index 97% rename from include/sta/dcalc/GraphDelayCalc.hh rename to include/sta/GraphDelayCalc.hh index 4ee9e71e..c7ad7e5e 100644 --- a/include/sta/dcalc/GraphDelayCalc.hh +++ b/include/sta/GraphDelayCalc.hh @@ -17,10 +17,10 @@ #pragma once #include -#include "util/DisallowCopyAssign.hh" -#include "graph/GraphClass.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "GraphClass.hh" +#include "DcalcAnalysisPt.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/util/Hash.hh b/include/sta/Hash.hh similarity index 100% rename from include/sta/util/Hash.hh rename to include/sta/Hash.hh diff --git a/include/sta/util/HashMap.hh b/include/sta/HashMap.hh similarity index 100% rename from include/sta/util/HashMap.hh rename to include/sta/HashMap.hh diff --git a/include/sta/util/HashSet.hh b/include/sta/HashSet.hh similarity index 100% rename from include/sta/util/HashSet.hh rename to include/sta/HashSet.hh diff --git a/include/sta/network/HpinDrvrLoad.hh b/include/sta/HpinDrvrLoad.hh similarity index 95% rename from include/sta/network/HpinDrvrLoad.hh rename to include/sta/HpinDrvrLoad.hh index 22dfc05a..be5efb75 100644 --- a/include/sta/network/HpinDrvrLoad.hh +++ b/include/sta/HpinDrvrLoad.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Set.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "Set.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/sdc/InputDrive.hh b/include/sta/InputDrive.hh similarity index 95% rename from include/sta/sdc/InputDrive.hh rename to include/sta/InputDrive.hh index 50c5629c..286c12b7 100644 --- a/include/sta/sdc/InputDrive.hh +++ b/include/sta/InputDrive.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/RiseFallMinMax.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/include/sta/liberty/InternalPower.hh b/include/sta/InternalPower.hh similarity index 96% rename from include/sta/liberty/InternalPower.hh rename to include/sta/InternalPower.hh index 312fcffa..48c32ebc 100644 --- a/include/sta/liberty/InternalPower.hh +++ b/include/sta/InternalPower.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/LibertyClass.hh" -#include "liberty/Transition.hh" +#include "DisallowCopyAssign.hh" +#include "LibertyClass.hh" +#include "Transition.hh" namespace sta { diff --git a/include/sta/util/Iterator.hh b/include/sta/Iterator.hh similarity index 100% rename from include/sta/util/Iterator.hh rename to include/sta/Iterator.hh diff --git a/include/sta/liberty/LeakagePower.hh b/include/sta/LeakagePower.hh similarity index 95% rename from include/sta/liberty/LeakagePower.hh rename to include/sta/LeakagePower.hh index 231303c9..9f362150 100644 --- a/include/sta/liberty/LeakagePower.hh +++ b/include/sta/LeakagePower.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/liberty/Liberty.hh b/include/sta/Liberty.hh similarity index 99% rename from include/sta/liberty/Liberty.hh rename to include/sta/Liberty.hh index 1e8b1902..61932825 100644 --- a/include/sta/liberty/Liberty.hh +++ b/include/sta/Liberty.hh @@ -16,14 +16,14 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "sdc/RiseFallMinMax.hh" -#include "network/ConcreteLibrary.hh" -#include "sdc/RiseFallValues.hh" -#include "sdc/MinMaxValues.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "RiseFallMinMax.hh" +#include "ConcreteLibrary.hh" +#include "RiseFallValues.hh" +#include "MinMaxValues.hh" +#include "Transition.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/liberty/LibertyClass.hh b/include/sta/LibertyClass.hh similarity index 98% rename from include/sta/liberty/LibertyClass.hh rename to include/sta/LibertyClass.hh index 3feee2cc..d8e7580b 100644 --- a/include/sta/liberty/LibertyClass.hh +++ b/include/sta/LibertyClass.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/Set.hh" +#include "Vector.hh" +#include "Map.hh" +#include "Set.hh" namespace sta { diff --git a/include/sta/liberty/LinearModel.hh b/include/sta/LinearModel.hh similarity index 97% rename from include/sta/liberty/LinearModel.hh rename to include/sta/LinearModel.hh index 20a21b17..505da764 100644 --- a/include/sta/liberty/LinearModel.hh +++ b/include/sta/LinearModel.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/TimingModel.hh" +#include "DisallowCopyAssign.hh" +#include "TimingModel.hh" namespace sta { diff --git a/include/sta/network/MakeConcreteNetwork.hh b/include/sta/MakeConcreteNetwork.hh similarity index 100% rename from include/sta/network/MakeConcreteNetwork.hh rename to include/sta/MakeConcreteNetwork.hh diff --git a/include/sta/parasitics/MakeConcreteParasitics.hh b/include/sta/MakeConcreteParasitics.hh similarity index 100% rename from include/sta/parasitics/MakeConcreteParasitics.hh rename to include/sta/MakeConcreteParasitics.hh diff --git a/include/sta/util/Map.hh b/include/sta/Map.hh similarity index 100% rename from include/sta/util/Map.hh rename to include/sta/Map.hh diff --git a/include/sta/util/MinMax.hh b/include/sta/MinMax.hh similarity index 100% rename from include/sta/util/MinMax.hh rename to include/sta/MinMax.hh diff --git a/include/sta/sdc/MinMaxValues.hh b/include/sta/MinMaxValues.hh similarity index 98% rename from include/sta/sdc/MinMaxValues.hh rename to include/sta/MinMaxValues.hh index 60592704..5a47635e 100644 --- a/include/sta/sdc/MinMaxValues.hh +++ b/include/sta/MinMaxValues.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/MinMax.hh" -#include "util/Error.hh" +#include "MinMax.hh" +#include "Error.hh" namespace sta { diff --git a/include/sta/util/Mutex.hh b/include/sta/Mutex.hh similarity index 100% rename from include/sta/util/Mutex.hh rename to include/sta/Mutex.hh diff --git a/include/sta/network/Network.hh b/include/sta/Network.hh similarity index 99% rename from include/sta/network/Network.hh rename to include/sta/Network.hh index 5af0914f..35e58138 100644 --- a/include/sta/network/Network.hh +++ b/include/sta/Network.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Map.hh" -#include "util/StringUtil.hh" -#include "liberty/LibertyClass.hh" -#include "graph/VertexId.hh" -#include "network/NetworkClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Map.hh" +#include "StringUtil.hh" +#include "LibertyClass.hh" +#include "VertexId.hh" +#include "NetworkClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/network/NetworkClass.hh b/include/sta/NetworkClass.hh similarity index 96% rename from include/sta/network/NetworkClass.hh rename to include/sta/NetworkClass.hh index b4a20a6b..aa77c906 100644 --- a/include/sta/network/NetworkClass.hh +++ b/include/sta/NetworkClass.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/Set.hh" -#include "util/Vector.hh" -#include "util/Iterator.hh" +#include "Set.hh" +#include "Vector.hh" +#include "Iterator.hh" namespace sta { diff --git a/include/sta/network/NetworkCmp.hh b/include/sta/NetworkCmp.hh similarity index 96% rename from include/sta/network/NetworkCmp.hh rename to include/sta/NetworkCmp.hh index 0875ff46..cc1b0356 100644 --- a/include/sta/network/NetworkCmp.hh +++ b/include/sta/NetworkCmp.hh @@ -16,8 +16,8 @@ #pragma once -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/parasitics/NullParasitics.hh b/include/sta/NullParasitics.hh similarity index 99% rename from include/sta/parasitics/NullParasitics.hh rename to include/sta/NullParasitics.hh index 8648c746..7456111f 100644 --- a/include/sta/parasitics/NullParasitics.hh +++ b/include/sta/NullParasitics.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "parasitics/Parasitics.hh" +#include "DisallowCopyAssign.hh" +#include "Parasitics.hh" namespace sta { diff --git a/include/sta/util/ObjectId.hh b/include/sta/ObjectId.hh similarity index 100% rename from include/sta/util/ObjectId.hh rename to include/sta/ObjectId.hh diff --git a/include/sta/util/ObjectTable.hh b/include/sta/ObjectTable.hh similarity index 100% rename from include/sta/util/ObjectTable.hh rename to include/sta/ObjectTable.hh diff --git a/include/sta/parasitics/Parasitics.hh b/include/sta/Parasitics.hh similarity index 98% rename from include/sta/parasitics/Parasitics.hh rename to include/sta/Parasitics.hh index 7e195489..4ae0419e 100644 --- a/include/sta/parasitics/Parasitics.hh +++ b/include/sta/Parasitics.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "util/DisallowCopyAssign.hh" -#include "search/StaState.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "parasitics/ParasiticsClass.hh" +#include "DisallowCopyAssign.hh" +#include "StaState.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "ParasiticsClass.hh" namespace sta { diff --git a/include/sta/parasitics/ParasiticsClass.hh b/include/sta/ParasiticsClass.hh similarity index 100% rename from include/sta/parasitics/ParasiticsClass.hh rename to include/sta/ParasiticsClass.hh diff --git a/include/sta/network/ParseBus.hh b/include/sta/ParseBus.hh similarity index 100% rename from include/sta/network/ParseBus.hh rename to include/sta/ParseBus.hh diff --git a/include/sta/search/Path.hh b/include/sta/Path.hh similarity index 94% rename from include/sta/search/Path.hh rename to include/sta/Path.hh index 50a5ddfe..88a45228 100644 --- a/include/sta/search/Path.hh +++ b/include/sta/Path.hh @@ -16,15 +16,15 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "liberty/Transition.hh" -#include "graph/GraphClass.hh" -#include "graph/Delay.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "Transition.hh" +#include "GraphClass.hh" +#include "Delay.hh" +#include "StaState.hh" +#include "SearchClass.hh" namespace sta { diff --git a/include/sta/search/PathAnalysisPt.hh b/include/sta/PathAnalysisPt.hh similarity index 92% rename from include/sta/search/PathAnalysisPt.hh rename to include/sta/PathAnalysisPt.hh index 8bd05ec7..d5e45500 100644 --- a/include/sta/search/PathAnalysisPt.hh +++ b/include/sta/PathAnalysisPt.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/MinMax.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "MinMax.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" namespace sta { diff --git a/include/sta/search/PathEnd.hh b/include/sta/PathEnd.hh similarity index 98% rename from include/sta/search/PathEnd.hh rename to include/sta/PathEnd.hh index b363fe94..c60d8fdc 100644 --- a/include/sta/search/PathEnd.hh +++ b/include/sta/PathEnd.hh @@ -18,14 +18,13 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "liberty/LibertyClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" -#include "search/PathRef.hh" -#include "search/Crpr.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "LibertyClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" +#include "PathRef.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/search/PathExpanded.hh b/include/sta/PathExpanded.hh similarity index 93% rename from include/sta/search/PathExpanded.hh rename to include/sta/PathExpanded.hh index a75693e5..1eb75b2b 100644 --- a/include/sta/search/PathExpanded.hh +++ b/include/sta/PathExpanded.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/TimingArc.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "TimingArc.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/search/PathGroup.hh b/include/sta/PathGroup.hh similarity index 97% rename from include/sta/search/PathGroup.hh rename to include/sta/PathGroup.hh index ce8d739e..bf2d2e9b 100644 --- a/include/sta/search/PathGroup.hh +++ b/include/sta/PathGroup.hh @@ -18,12 +18,12 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/Map.hh" -#include "util/Vector.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" +#include "DisallowCopyAssign.hh" +#include "Map.hh" +#include "Vector.hh" +#include "SdcClass.hh" +#include "StaState.hh" +#include "SearchClass.hh" namespace sta { diff --git a/search/PathRef.hh b/include/sta/PathRef.hh similarity index 94% rename from search/PathRef.hh rename to include/sta/PathRef.hh index 92572186..d7ef4f57 100644 --- a/search/PathRef.hh +++ b/include/sta/PathRef.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "search/SearchClass.hh" -#include "search/Path.hh" -#include "search/PathVertex.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "SearchClass.hh" +#include "Path.hh" +#include "PathVertex.hh" namespace sta { diff --git a/search/PathVertex.hh b/include/sta/PathVertex.hh similarity index 97% rename from search/PathVertex.hh rename to include/sta/PathVertex.hh index 5470a399..578639eb 100644 --- a/search/PathVertex.hh +++ b/include/sta/PathVertex.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "search/SearchClass.hh" -#include "search/Path.hh" +#include "DisallowCopyAssign.hh" +#include "SearchClass.hh" +#include "Path.hh" namespace sta { diff --git a/search/PathVertexRep.hh b/include/sta/PathVertexRep.hh similarity index 97% rename from search/PathVertexRep.hh rename to include/sta/PathVertexRep.hh index 6011a244..74b72fc3 100644 --- a/search/PathVertexRep.hh +++ b/include/sta/PathVertexRep.hh @@ -16,8 +16,8 @@ #pragma once -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" namespace sta { diff --git a/include/sta/util/PatternMatch.hh b/include/sta/PatternMatch.hh similarity index 100% rename from include/sta/util/PatternMatch.hh rename to include/sta/PatternMatch.hh diff --git a/include/sta/sdc/PinPair.hh b/include/sta/PinPair.hh similarity index 93% rename from include/sta/sdc/PinPair.hh rename to include/sta/PinPair.hh index bdcb2759..eea20583 100644 --- a/include/sta/sdc/PinPair.hh +++ b/include/sta/PinPair.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/Hash.hh" -#include "util/Set.hh" -#include "network/NetworkClass.hh" +#include "Hash.hh" +#include "Set.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/sdc/PortDelay.hh b/include/sta/PortDelay.hh similarity index 96% rename from include/sta/sdc/PortDelay.hh rename to include/sta/PortDelay.hh index 45d23459..b481cb0e 100644 --- a/include/sta/sdc/PortDelay.hh +++ b/include/sta/PortDelay.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "sdc/RiseFallMinMax.hh" -#include "sdc/SdcClass.hh" +#include "DisallowCopyAssign.hh" +#include "RiseFallMinMax.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/network/PortDirection.hh b/include/sta/PortDirection.hh similarity index 97% rename from include/sta/network/PortDirection.hh rename to include/sta/PortDirection.hh index a0cc9bb5..fe019b4a 100644 --- a/include/sta/network/PortDirection.hh +++ b/include/sta/PortDirection.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/sdc/PortExtCap.hh b/include/sta/PortExtCap.hh similarity index 90% rename from include/sta/sdc/PortExtCap.hh rename to include/sta/PortExtCap.hh index bfddb9ea..e611af60 100644 --- a/include/sta/sdc/PortExtCap.hh +++ b/include/sta/PortExtCap.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "sdc/RiseFallMinMax.hh" -#include "sdc/MinMaxValues.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "RiseFallMinMax.hh" +#include "MinMaxValues.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/search/Power.hh b/include/sta/Power.hh similarity index 99% rename from include/sta/search/Power.hh rename to include/sta/Power.hh index da09c5d9..e2c891da 100644 --- a/include/sta/search/Power.hh +++ b/include/sta/Power.hh @@ -16,7 +16,7 @@ #pragma once -#include "search/Sta.hh" +#include "Sta.hh" namespace sta { diff --git a/include/sta/search/Property.hh b/include/sta/Property.hh similarity index 96% rename from include/sta/search/Property.hh rename to include/sta/Property.hh index fc078785..c83f1af1 100644 --- a/include/sta/search/Property.hh +++ b/include/sta/Property.hh @@ -18,11 +18,11 @@ #include -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "search/SearchClass.hh" -#include "sdc/SdcClass.hh" -#include "search/Power.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "SearchClass.hh" +#include "SdcClass.hh" +#include "Power.hh" namespace sta { diff --git a/include/sta/util/Report.hh b/include/sta/Report.hh similarity index 100% rename from include/sta/util/Report.hh rename to include/sta/Report.hh diff --git a/include/sta/util/ReportStd.hh b/include/sta/ReportStd.hh similarity index 100% rename from include/sta/util/ReportStd.hh rename to include/sta/ReportStd.hh diff --git a/include/sta/util/ReportTcl.hh b/include/sta/ReportTcl.hh similarity index 100% rename from include/sta/util/ReportTcl.hh rename to include/sta/ReportTcl.hh diff --git a/include/sta/sdc/RiseFallMinMax.hh b/include/sta/RiseFallMinMax.hh similarity index 95% rename from include/sta/sdc/RiseFallMinMax.hh rename to include/sta/RiseFallMinMax.hh index 0c5415d6..57f2900d 100644 --- a/include/sta/sdc/RiseFallMinMax.hh +++ b/include/sta/RiseFallMinMax.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "Transition.hh" namespace sta { diff --git a/include/sta/sdc/RiseFallValues.hh b/include/sta/RiseFallValues.hh similarity index 95% rename from include/sta/sdc/RiseFallValues.hh rename to include/sta/RiseFallValues.hh index daf96885..0cb092ee 100644 --- a/include/sta/sdc/RiseFallValues.hh +++ b/include/sta/RiseFallValues.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/Transition.hh" +#include "DisallowCopyAssign.hh" +#include "Transition.hh" namespace sta { diff --git a/include/sta/sdc/Sdc.hh b/include/sta/Sdc.hh similarity index 99% rename from include/sta/sdc/Sdc.hh rename to include/sta/Sdc.hh index 65aed99c..4643c5f5 100644 --- a/include/sta/sdc/Sdc.hh +++ b/include/sta/Sdc.hh @@ -18,22 +18,22 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/StringUtil.hh" -#include "util/StringSet.hh" -#include "util/Map.hh" -#include "util/HashSet.hh" -#include "util/UnorderedMap.hh" -#include "util/MinMax.hh" -#include "search/StaState.hh" -#include "network/NetworkClass.hh" -#include "liberty/LibertyClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "sdc/RiseFallValues.hh" -#include "sdc/Clock.hh" -#include "sdc/DataCheck.hh" -#include "sdc/CycleAccting.hh" +#include "DisallowCopyAssign.hh" +#include "StringUtil.hh" +#include "StringSet.hh" +#include "Map.hh" +#include "HashSet.hh" +#include "UnorderedMap.hh" +#include "MinMax.hh" +#include "StaState.hh" +#include "NetworkClass.hh" +#include "LibertyClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "RiseFallValues.hh" +#include "Clock.hh" +#include "DataCheck.hh" +#include "CycleAccting.hh" namespace sta { diff --git a/include/sta/sdc/SdcClass.hh b/include/sta/SdcClass.hh similarity index 93% rename from include/sta/sdc/SdcClass.hh rename to include/sta/SdcClass.hh index 3ec41039..be2f0284 100644 --- a/include/sta/sdc/SdcClass.hh +++ b/include/sta/SdcClass.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/Map.hh" -#include "util/Set.hh" -#include "util/Vector.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/MinMaxValues.hh" -#include "sdc/PinPair.hh" +#include "Map.hh" +#include "Set.hh" +#include "Vector.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "MinMaxValues.hh" +#include "PinPair.hh" namespace sta { diff --git a/include/sta/sdc/SdcCmdComment.hh b/include/sta/SdcCmdComment.hh similarity index 100% rename from include/sta/sdc/SdcCmdComment.hh rename to include/sta/SdcCmdComment.hh diff --git a/include/sta/network/SdcNetwork.hh b/include/sta/SdcNetwork.hh similarity index 99% rename from include/sta/network/SdcNetwork.hh rename to include/sta/SdcNetwork.hh index 438029e0..6172a17d 100644 --- a/include/sta/network/SdcNetwork.hh +++ b/include/sta/SdcNetwork.hh @@ -18,8 +18,8 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "network/Network.hh" +#include "DisallowCopyAssign.hh" +#include "Network.hh" namespace sta { diff --git a/include/sta/search/Search.hh b/include/sta/Search.hh similarity index 98% rename from include/sta/search/Search.hh rename to include/sta/Search.hh index 8745dfc1..ee750485 100644 --- a/include/sta/search/Search.hh +++ b/include/sta/Search.hh @@ -18,18 +18,18 @@ #include -#include "util/MinMax.hh" -#include "util/HashSet.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "graph/Delay.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" -#include "search/SearchPred.hh" -#include "search/VertexVisitor.hh" +#include "MinMax.hh" +#include "HashSet.hh" +#include "Transition.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "Delay.hh" +#include "SdcClass.hh" +#include "StaState.hh" +#include "SearchClass.hh" +#include "SearchPred.hh" +#include "VertexVisitor.hh" namespace sta { diff --git a/include/sta/search/SearchClass.hh b/include/sta/SearchClass.hh similarity index 93% rename from include/sta/search/SearchClass.hh rename to include/sta/SearchClass.hh index e0653874..2eaae23c 100644 --- a/include/sta/search/SearchClass.hh +++ b/include/sta/SearchClass.hh @@ -16,14 +16,14 @@ #pragma once -#include "util/Vector.hh" -#include "util/Set.hh" -#include "util/Map.hh" -#include "util/UnorderedMap.hh" -#include "util/StringSet.hh" -#include "graph/Delay.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" +#include "Vector.hh" +#include "Set.hh" +#include "Map.hh" +#include "UnorderedMap.hh" +#include "StringSet.hh" +#include "Delay.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" namespace sta { diff --git a/include/sta/search/SearchPred.hh b/include/sta/SearchPred.hh similarity index 96% rename from include/sta/search/SearchPred.hh rename to include/sta/SearchPred.hh index 95b8d3f9..8f00e015 100644 --- a/include/sta/search/SearchPred.hh +++ b/include/sta/SearchPred.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "liberty/LibertyClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "LibertyClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/liberty/Sequential.hh b/include/sta/Sequential.hh similarity index 95% rename from include/sta/liberty/Sequential.hh rename to include/sta/Sequential.hh index df928d9e..ed07a153 100644 --- a/include/sta/liberty/Sequential.hh +++ b/include/sta/Sequential.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/include/sta/util/Set.hh b/include/sta/Set.hh similarity index 100% rename from include/sta/util/Set.hh rename to include/sta/Set.hh diff --git a/include/sta/search/Sta.hh b/include/sta/Sta.hh similarity index 99% rename from include/sta/search/Sta.hh rename to include/sta/Sta.hh index bca0b525..35248c20 100644 --- a/include/sta/search/Sta.hh +++ b/include/sta/Sta.hh @@ -18,17 +18,16 @@ #include -#include "util/Machine.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/StringSeq.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "graph/GraphClass.hh" -#include "parasitics/ParasiticsClass.hh" -#include "search/StaState.hh" -#include "search/VertexVisitor.hh" -#include "search/SearchClass.hh" +#include "DisallowCopyAssign.hh" +#include "StringSeq.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "GraphClass.hh" +#include "ParasiticsClass.hh" +#include "StaState.hh" +#include "VertexVisitor.hh" +#include "SearchClass.hh" struct Tcl_Interp; diff --git a/include/sta/app/StaMain.hh b/include/sta/StaMain.hh similarity index 100% rename from include/sta/app/StaMain.hh rename to include/sta/StaMain.hh diff --git a/search/StaState.hh b/include/sta/StaState.hh similarity index 99% rename from search/StaState.hh rename to include/sta/StaState.hh index 92bb4765..03d1fa2c 100644 --- a/search/StaState.hh +++ b/include/sta/StaState.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/DisallowCopyAssign.hh" +#include "DisallowCopyAssign.hh" namespace sta { diff --git a/include/sta/util/Stats.hh b/include/sta/Stats.hh similarity index 100% rename from include/sta/util/Stats.hh rename to include/sta/Stats.hh diff --git a/include/sta/util/StringSeq.hh b/include/sta/StringSeq.hh similarity index 100% rename from include/sta/util/StringSeq.hh rename to include/sta/StringSeq.hh diff --git a/include/sta/util/StringSet.hh b/include/sta/StringSet.hh similarity index 100% rename from include/sta/util/StringSet.hh rename to include/sta/StringSet.hh diff --git a/include/sta/util/StringUtil.hh b/include/sta/StringUtil.hh similarity index 100% rename from include/sta/util/StringUtil.hh rename to include/sta/StringUtil.hh diff --git a/include/sta/liberty/TableModel.hh b/include/sta/TableModel.hh similarity index 98% rename from include/sta/liberty/TableModel.hh rename to include/sta/TableModel.hh index fc4b156d..12f88caf 100644 --- a/include/sta/liberty/TableModel.hh +++ b/include/sta/TableModel.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "util/Vector.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" -#include "liberty/TimingModel.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "Vector.hh" +#include "Transition.hh" +#include "LibertyClass.hh" +#include "TimingModel.hh" namespace sta { diff --git a/include/sta/liberty/TimingArc.hh b/include/sta/TimingArc.hh similarity index 98% rename from include/sta/liberty/TimingArc.hh rename to include/sta/TimingArc.hh index daa51956..ce1a2fc9 100644 --- a/include/sta/liberty/TimingArc.hh +++ b/include/sta/TimingArc.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Transition.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/liberty/TimingModel.hh b/include/sta/TimingModel.hh similarity index 97% rename from include/sta/liberty/TimingModel.hh rename to include/sta/TimingModel.hh index c12f4023..51dcca41 100644 --- a/include/sta/liberty/TimingModel.hh +++ b/include/sta/TimingModel.hh @@ -17,8 +17,8 @@ #pragma once #include -#include "graph/Delay.hh" -#include "liberty/LibertyClass.hh" +#include "Delay.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/liberty/TimingRole.hh b/include/sta/TimingRole.hh similarity index 97% rename from include/sta/liberty/TimingRole.hh rename to include/sta/TimingRole.hh index ee199667..720c51c1 100644 --- a/include/sta/liberty/TimingRole.hh +++ b/include/sta/TimingRole.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "util/Map.hh" -#include "util/StringUtil.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "Map.hh" +#include "StringUtil.hh" namespace sta { diff --git a/include/sta/util/TokenParser.hh b/include/sta/TokenParser.hh similarity index 100% rename from include/sta/util/TokenParser.hh rename to include/sta/TokenParser.hh diff --git a/include/sta/liberty/Transition.hh b/include/sta/Transition.hh similarity index 98% rename from include/sta/liberty/Transition.hh rename to include/sta/Transition.hh index 7273318c..2ea093ab 100644 --- a/include/sta/liberty/Transition.hh +++ b/include/sta/Transition.hh @@ -18,10 +18,10 @@ #include #include -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/Map.hh" -#include "util/StringUtil.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "Map.hh" +#include "StringUtil.hh" namespace sta { diff --git a/include/sta/liberty/Units.hh b/include/sta/Units.hh similarity index 100% rename from include/sta/liberty/Units.hh rename to include/sta/Units.hh diff --git a/include/sta/util/UnorderedMap.hh b/include/sta/UnorderedMap.hh similarity index 100% rename from include/sta/util/UnorderedMap.hh rename to include/sta/UnorderedMap.hh diff --git a/include/sta/util/UnorderedSet.hh b/include/sta/UnorderedSet.hh similarity index 100% rename from include/sta/util/UnorderedSet.hh rename to include/sta/UnorderedSet.hh diff --git a/include/sta/util/Vector.hh b/include/sta/Vector.hh similarity index 100% rename from include/sta/util/Vector.hh rename to include/sta/Vector.hh diff --git a/include/sta/network/VerilogNamespace.hh b/include/sta/VerilogNamespace.hh similarity index 100% rename from include/sta/network/VerilogNamespace.hh rename to include/sta/VerilogNamespace.hh diff --git a/include/sta/graph/VertexId.hh b/include/sta/VertexId.hh similarity index 94% rename from include/sta/graph/VertexId.hh rename to include/sta/VertexId.hh index c367c6f0..9f1d3b48 100644 --- a/include/sta/graph/VertexId.hh +++ b/include/sta/VertexId.hh @@ -9,7 +9,7 @@ #ifndef STA_VERTEX_ID_H #define STA_VERTEX_ID_H -#include "util/ObjectId.hh" +#include "ObjectId.hh" // VertexId typedef for Networks to get/set on pins. diff --git a/include/sta/search/VertexVisitor.hh b/include/sta/VertexVisitor.hh similarity index 93% rename from include/sta/search/VertexVisitor.hh rename to include/sta/VertexVisitor.hh index 8b6d7d3c..5b705b01 100644 --- a/include/sta/search/VertexVisitor.hh +++ b/include/sta/VertexVisitor.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" +#include "DisallowCopyAssign.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" namespace sta { diff --git a/include/sta/search/VisitPathEnds.hh b/include/sta/VisitPathEnds.hh similarity index 97% rename from include/sta/search/VisitPathEnds.hh rename to include/sta/VisitPathEnds.hh index e5fdb831..a973599a 100644 --- a/include/sta/search/VisitPathEnds.hh +++ b/include/sta/VisitPathEnds.hh @@ -16,10 +16,10 @@ #pragma once -#include "sdc/SdcClass.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "SdcClass.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/liberty/Wireload.hh b/include/sta/Wireload.hh similarity index 96% rename from include/sta/liberty/Wireload.hh rename to include/sta/Wireload.hh index a4d1c4f6..b5a25bf0 100644 --- a/include/sta/liberty/Wireload.hh +++ b/include/sta/Wireload.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "liberty/LibertyClass.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "LibertyClass.hh" namespace sta { diff --git a/include/sta/search/WritePathSpice.hh b/include/sta/WritePathSpice.hh similarity index 100% rename from include/sta/search/WritePathSpice.hh rename to include/sta/WritePathSpice.hh diff --git a/include/sta/sdc/WriteSdc.hh b/include/sta/WriteSdc.hh similarity index 94% rename from include/sta/sdc/WriteSdc.hh rename to include/sta/WriteSdc.hh index 2242be50..24627d80 100644 --- a/include/sta/sdc/WriteSdc.hh +++ b/include/sta/WriteSdc.hh @@ -16,8 +16,8 @@ #pragma once -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" namespace sta { diff --git a/include/sta/util/Zlib.hh b/include/sta/Zlib.hh similarity index 96% rename from include/sta/util/Zlib.hh rename to include/sta/Zlib.hh index 85101d6f..30dcba0b 100644 --- a/include/sta/util/Zlib.hh +++ b/include/sta/Zlib.hh @@ -19,7 +19,7 @@ // The zlib package is optional. // Define stdio based macros if it is missing. -#include "util/StaConfig.hh" // ZLIB +#include "StaConfig.hh" // ZLIB #ifdef ZLIB_FOUND diff --git a/liberty/EquivCells.cc b/liberty/EquivCells.cc index 2e13d7a4..17c9f176 100644 --- a/liberty/EquivCells.cc +++ b/liberty/EquivCells.cc @@ -14,18 +14,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/EquivCells.hh" +#include "EquivCells.hh" -#include "util/Hash.hh" -#include "util/MinMax.hh" -#include "network/PortDirection.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "liberty/TableModel.hh" -#include "liberty/Sequential.hh" +#include "Hash.hh" +#include "MinMax.hh" +#include "PortDirection.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "FuncExpr.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "TableModel.hh" +#include "Sequential.hh" namespace sta { diff --git a/liberty/FuncExpr.cc b/liberty/FuncExpr.cc index f8195346..a2d62a52 100644 --- a/liberty/FuncExpr.cc +++ b/liberty/FuncExpr.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/FuncExpr.hh" +#include "FuncExpr.hh" -#include "util/StringUtil.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" +#include "StringUtil.hh" +#include "Liberty.hh" +#include "Network.hh" namespace sta { diff --git a/liberty/InternalPower.cc b/liberty/InternalPower.cc index f4195f6f..099f1cf5 100644 --- a/liberty/InternalPower.cc +++ b/liberty/InternalPower.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/InternalPower.hh" +#include "InternalPower.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TableModel.hh" -#include "liberty/Liberty.hh" +#include "FuncExpr.hh" +#include "TableModel.hh" +#include "Liberty.hh" namespace sta { diff --git a/liberty/LeakagePower.cc b/liberty/LeakagePower.cc index d19bdd60..1b217fc0 100644 --- a/liberty/LeakagePower.cc +++ b/liberty/LeakagePower.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/LeakagePower.hh" +#include "LeakagePower.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TableModel.hh" -#include "liberty/Liberty.hh" +#include "FuncExpr.hh" +#include "TableModel.hh" +#include "Liberty.hh" namespace sta { diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc index 5c65bdc9..7529c433 100644 --- a/liberty/Liberty.cc +++ b/liberty/Liberty.cc @@ -14,29 +14,29 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/Liberty.hh" +#include "Liberty.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/EnumNameMap.hh" -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/StringSet.hh" -#include "util/PatternMatch.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TableModel.hh" -#include "liberty/TimingArc.hh" -#include "liberty/InternalPower.hh" -#include "liberty/LeakagePower.hh" -#include "liberty/Sequential.hh" -#include "liberty/Wireload.hh" -#include "liberty/EquivCells.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" +#include "DisallowCopyAssign.hh" +#include "EnumNameMap.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "StringSet.hh" +#include "PatternMatch.hh" +#include "Units.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "FuncExpr.hh" +#include "TableModel.hh" +#include "TimingArc.hh" +#include "InternalPower.hh" +#include "LeakagePower.hh" +#include "Sequential.hh" +#include "Wireload.hh" +#include "EquivCells.hh" +#include "Network.hh" +#include "PortDirection.hh" namespace sta { diff --git a/liberty/LibertyBuilder.cc b/liberty/LibertyBuilder.cc index 44a5ffa1..9cea6a63 100644 --- a/liberty/LibertyBuilder.cc +++ b/liberty/LibertyBuilder.cc @@ -16,14 +16,14 @@ #include "LibertyBuilder.hh" -#include "network/PortDirection.hh" -#include "liberty/TimingRole.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingArc.hh" -#include "liberty/InternalPower.hh" -#include "liberty/LeakagePower.hh" -#include "liberty/Sequential.hh" -#include "liberty/Liberty.hh" +#include "PortDirection.hh" +#include "TimingRole.hh" +#include "FuncExpr.hh" +#include "TimingArc.hh" +#include "InternalPower.hh" +#include "LeakagePower.hh" +#include "Sequential.hh" +#include "Liberty.hh" namespace sta { diff --git a/liberty/LibertyBuilder.hh b/liberty/LibertyBuilder.hh index 39536b51..d0bd3f8f 100644 --- a/liberty/LibertyBuilder.hh +++ b/liberty/LibertyBuilder.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" -#include "network/ConcreteLibrary.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Transition.hh" +#include "LibertyClass.hh" +#include "ConcreteLibrary.hh" namespace sta { diff --git a/liberty/LibertyExpr.cc b/liberty/LibertyExpr.cc index 30f4472d..60ce4f55 100644 --- a/liberty/LibertyExpr.cc +++ b/liberty/LibertyExpr.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/FuncExpr.hh" +#include "FuncExpr.hh" -#include "util/Report.hh" -#include "util/StringUtil.hh" -#include "liberty/Liberty.hh" -#include "liberty/LibertyExprPvt.hh" +#include "Report.hh" +#include "StringUtil.hh" +#include "Liberty.hh" +#include "LibertyExprPvt.hh" extern int LibertyExprParse_parse(); diff --git a/liberty/LibertyExprLex.ll b/liberty/LibertyExprLex.ll index 707ec032..d282c29f 100644 --- a/liberty/LibertyExprLex.ll +++ b/liberty/LibertyExprLex.ll @@ -19,8 +19,8 @@ // Liberty function expression lexical analyzer #include "util/FlexPragma.hh" -#include "util/Debug.hh" -#include "util/StringUtil.hh" +#include "Debug.hh" +#include "StringUtil.hh" #include "liberty/LibertyExprPvt.hh" using sta::libexpr_parser; diff --git a/liberty/LibertyExprParse.yy b/liberty/LibertyExprParse.yy index da6846f6..0de05763 100644 --- a/liberty/LibertyExprParse.yy +++ b/liberty/LibertyExprParse.yy @@ -18,7 +18,7 @@ // Liberty function expression parser. -#include "liberty/FuncExpr.hh" +#include "FuncExpr.hh" #include "liberty/LibertyExpr.hh" #include "liberty/LibertyExprPvt.hh" diff --git a/liberty/LibertyExprPvt.hh b/liberty/LibertyExprPvt.hh index 260ec9d9..205104e1 100644 --- a/liberty/LibertyExprPvt.hh +++ b/liberty/LibertyExprPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/DisallowCopyAssign.hh" +#include "DisallowCopyAssign.hh" namespace sta { diff --git a/liberty/LibertyParse.yy b/liberty/LibertyParse.yy index 3ad66412..2ac53a9d 100644 --- a/liberty/LibertyParse.yy +++ b/liberty/LibertyParse.yy @@ -18,7 +18,7 @@ #include #include -#include "util/StringUtil.hh" +#include "StringUtil.hh" #include "liberty/LibertyParser.hh" int LibertyLex_lex(); diff --git a/liberty/LibertyParser.cc b/liberty/LibertyParser.cc index c106abbf..7e60cc80 100644 --- a/liberty/LibertyParser.cc +++ b/liberty/LibertyParser.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/LibertyParser.hh" +#include "LibertyParser.hh" #include #include -#include "util/Report.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" +#include "Report.hh" +#include "Error.hh" +#include "StringUtil.hh" // Global namespace diff --git a/liberty/LibertyParser.hh b/liberty/LibertyParser.hh index d1f96140..6c959e17 100644 --- a/liberty/LibertyParser.hh +++ b/liberty/LibertyParser.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/Set.hh" -#include "util/StringUtil.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Map.hh" +#include "Set.hh" +#include "StringUtil.hh" namespace sta { diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc index b2c727d0..5e325299 100644 --- a/liberty/LibertyReader.cc +++ b/liberty/LibertyReader.cc @@ -14,31 +14,31 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/LibertyReader.hh" +#include "LibertyReader.hh" #include #include -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/TokenParser.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingArc.hh" -#include "liberty/TableModel.hh" -#include "liberty/LeakagePower.hh" -#include "liberty/InternalPower.hh" -#include "liberty/LinearModel.hh" -#include "liberty/Wireload.hh" -#include "liberty/EquivCells.hh" -#include "liberty/LibertyExpr.hh" -#include "liberty/Liberty.hh" -#include "liberty/LibertyBuilder.hh" -#include "liberty/LibertyReaderPvt.hh" -#include "network/PortDirection.hh" -#include "network/ParseBus.hh" -#include "network/Network.hh" +#include "Report.hh" +#include "Debug.hh" +#include "TokenParser.hh" +#include "Units.hh" +#include "Transition.hh" +#include "FuncExpr.hh" +#include "TimingArc.hh" +#include "TableModel.hh" +#include "LeakagePower.hh" +#include "InternalPower.hh" +#include "LinearModel.hh" +#include "Wireload.hh" +#include "EquivCells.hh" +#include "LibertyExpr.hh" +#include "Liberty.hh" +#include "LibertyBuilder.hh" +#include "LibertyReaderPvt.hh" +#include "PortDirection.hh" +#include "ParseBus.hh" +#include "Network.hh" namespace sta { diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh index a8bbd530..097b1ca2 100644 --- a/liberty/LibertyReaderPvt.hh +++ b/liberty/LibertyReaderPvt.hh @@ -16,19 +16,19 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/StringSeq.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingArc.hh" -#include "liberty/InternalPower.hh" -#include "liberty/LeakagePower.hh" -#include "liberty/Liberty.hh" -#include "liberty/LibertyParser.hh" -#include "liberty/LibertyReader.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Map.hh" +#include "StringSeq.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "TimingArc.hh" +#include "InternalPower.hh" +#include "LeakagePower.hh" +#include "Liberty.hh" +#include "LibertyParser.hh" +#include "LibertyReader.hh" +#include "NetworkClass.hh" namespace sta { diff --git a/liberty/LinearModel.cc b/liberty/LinearModel.cc index 166450a9..68b55666 100644 --- a/liberty/LinearModel.cc +++ b/liberty/LinearModel.cc @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/LinearModel.hh" +#include "LinearModel.hh" -#include "liberty/Units.hh" -#include "liberty/Liberty.hh" +#include "Units.hh" +#include "Liberty.hh" namespace sta { diff --git a/liberty/Sequential.cc b/liberty/Sequential.cc index ab41cf6e..108281d9 100644 --- a/liberty/Sequential.cc +++ b/liberty/Sequential.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/Sequential.hh" +#include "Sequential.hh" -#include "liberty/FuncExpr.hh" +#include "FuncExpr.hh" namespace sta { diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc index e2d5cb89..98fcc51d 100644 --- a/liberty/TableModel.cc +++ b/liberty/TableModel.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/TableModel.hh" +#include "TableModel.hh" -#include "util/Report.hh" -#include "util/Error.hh" -#include "util/EnumNameMap.hh" -#include "liberty/Units.hh" -#include "liberty/Liberty.hh" +#include "Report.hh" +#include "Error.hh" +#include "EnumNameMap.hh" +#include "Units.hh" +#include "Liberty.hh" namespace sta { diff --git a/liberty/TimingArc.cc b/liberty/TimingArc.cc index 3f496c1f..55a3d4f9 100644 --- a/liberty/TimingArc.cc +++ b/liberty/TimingArc.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/TimingModel.hh" +#include "TimingModel.hh" -#include "util/EnumNameMap.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Liberty.hh" -#include "liberty/TimingArc.hh" +#include "EnumNameMap.hh" +#include "FuncExpr.hh" +#include "TimingRole.hh" +#include "Liberty.hh" +#include "TimingArc.hh" namespace sta { diff --git a/liberty/TimingRole.cc b/liberty/TimingRole.cc index 6a2cafaa..3140627f 100644 --- a/liberty/TimingRole.cc +++ b/liberty/TimingRole.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/TimingRole.hh" +#include "TimingRole.hh" namespace sta { diff --git a/liberty/Transition.cc b/liberty/Transition.cc index bedcd270..ab435114 100644 --- a/liberty/Transition.cc +++ b/liberty/Transition.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/Transition.hh" +#include "Transition.hh" namespace sta { diff --git a/liberty/Units.cc b/liberty/Units.cc index c6c9509e..9d3a4dcd 100644 --- a/liberty/Units.cc +++ b/liberty/Units.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/Units.hh" +#include "Units.hh" #include // abs #include -#include "util/StringUtil.hh" -#include "util/MinMax.hh" // INF +#include "StringUtil.hh" +#include "MinMax.hh" // INF namespace sta { diff --git a/liberty/Wireload.cc b/liberty/Wireload.cc index eb36c90a..dcf39c08 100644 --- a/liberty/Wireload.cc +++ b/liberty/Wireload.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "liberty/Wireload.hh" +#include "Wireload.hh" #include -#include "util/DisallowCopyAssign.hh" -#include "util/StringUtil.hh" -#include "liberty/Liberty.hh" +#include "DisallowCopyAssign.hh" +#include "StringUtil.hh" +#include "Liberty.hh" namespace sta { diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc index 6477e6e1..27af31b9 100644 --- a/network/ConcreteLibrary.cc +++ b/network/ConcreteLibrary.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/ConcreteLibrary.hh" +#include "ConcreteLibrary.hh" #include -#include "util/DisallowCopyAssign.hh" -#include "util/PatternMatch.hh" -#include "network/PortDirection.hh" -#include "network/ParseBus.hh" +#include "DisallowCopyAssign.hh" +#include "PatternMatch.hh" +#include "PortDirection.hh" +#include "ParseBus.hh" namespace sta { diff --git a/network/ConcreteNetwork.cc b/network/ConcreteNetwork.cc index 5f6e5b70..369457d0 100644 --- a/network/ConcreteNetwork.cc +++ b/network/ConcreteNetwork.cc @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/ConcreteNetwork.hh" +#include "ConcreteNetwork.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/PatternMatch.hh" -#include "util/Report.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/ConcreteLibrary.hh" -#include "network/Network.hh" +#include "DisallowCopyAssign.hh" +#include "PatternMatch.hh" +#include "Report.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "ConcreteLibrary.hh" +#include "Network.hh" namespace sta { diff --git a/network/HpinDrvrLoad.cc b/network/HpinDrvrLoad.cc index c1d22564..39be18a8 100644 --- a/network/HpinDrvrLoad.cc +++ b/network/HpinDrvrLoad.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/HpinDrvrLoad.hh" +#include "HpinDrvrLoad.hh" #include -#include "network/Network.hh" +#include "Network.hh" namespace sta { diff --git a/network/Network.cc b/network/Network.cc index 891d6148..8ac29711 100644 --- a/network/Network.cc +++ b/network/Network.cc @@ -15,13 +15,13 @@ // along with this program. If not, see . -#include "network/Network.hh" +#include "Network.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/StringUtil.hh" -#include "util/PatternMatch.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" +#include "DisallowCopyAssign.hh" +#include "StringUtil.hh" +#include "PatternMatch.hh" +#include "Liberty.hh" +#include "PortDirection.hh" namespace sta { diff --git a/network/NetworkCmp.cc b/network/NetworkCmp.cc index 19e1144e..6cd63268 100644 --- a/network/NetworkCmp.cc +++ b/network/NetworkCmp.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/NetworkCmp.hh" +#include "NetworkCmp.hh" #include -#include "util/StringUtil.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" +#include "StringUtil.hh" +#include "Liberty.hh" +#include "Network.hh" namespace sta { diff --git a/network/ParseBus.cc b/network/ParseBus.cc index 64d60b68..ff972877 100644 --- a/network/ParseBus.cc +++ b/network/ParseBus.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/ParseBus.hh" +#include "ParseBus.hh" #include #include #include -#include "util/StringUtil.hh" +#include "StringUtil.hh" namespace sta { diff --git a/network/PortDirection.cc b/network/PortDirection.cc index 56cf7b64..7fffcdf2 100644 --- a/network/PortDirection.cc +++ b/network/PortDirection.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/PortDirection.hh" +#include "PortDirection.hh" namespace sta { diff --git a/network/SdcNetwork.cc b/network/SdcNetwork.cc index 39c082ba..f8b4de73 100644 --- a/network/SdcNetwork.cc +++ b/network/SdcNetwork.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/SdcNetwork.hh" +#include "SdcNetwork.hh" -#include "util/StringUtil.hh" -#include "util/PatternMatch.hh" -#include "network/ParseBus.hh" +#include "StringUtil.hh" +#include "PatternMatch.hh" +#include "ParseBus.hh" namespace sta { diff --git a/network/VerilogNamespace.cc b/network/VerilogNamespace.cc index 2435c887..c9ca8a05 100644 --- a/network/VerilogNamespace.cc +++ b/network/VerilogNamespace.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "network/VerilogNamespace.hh" +#include "VerilogNamespace.hh" #include -#include "util/StringUtil.hh" -#include "network/ParseBus.hh" +#include "StringUtil.hh" +#include "ParseBus.hh" namespace sta { diff --git a/parasitics/ConcreteParasitics.cc b/parasitics/ConcreteParasitics.cc index 92aeea42..dd2b437c 100644 --- a/parasitics/ConcreteParasitics.cc +++ b/parasitics/ConcreteParasitics.cc @@ -14,27 +14,27 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/ConcreteParasitics.hh" +#include "ConcreteParasitics.hh" #include #include // max -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Error.hh" -#include "util/Mutex.hh" -#include "util/Set.hh" -#include "util/MinMax.hh" -#include "network/Network.hh" -#include "liberty/Wireload.hh" -#include "liberty/Liberty.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "parasitics/ReduceParasitics.hh" -#include "parasitics/MakeConcreteParasitics.hh" -#include "parasitics/Parasitics.hh" -#include "parasitics/ConcreteParasiticsPvt.hh" -#include "search/Corner.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Error.hh" +#include "Mutex.hh" +#include "Set.hh" +#include "MinMax.hh" +#include "Network.hh" +#include "Wireload.hh" +#include "Liberty.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "ReduceParasitics.hh" +#include "MakeConcreteParasitics.hh" +#include "Parasitics.hh" +#include "ConcreteParasiticsPvt.hh" +#include "Corner.hh" // Multiple inheritance is used to share elmore and pi model base // classes, but care is taken to make sure there are no loops in the diff --git a/parasitics/ConcreteParasitics.hh b/parasitics/ConcreteParasitics.hh index 23f83c29..019126b9 100644 --- a/parasitics/ConcreteParasitics.hh +++ b/parasitics/ConcreteParasitics.hh @@ -18,11 +18,11 @@ #include -#include "util/Map.hh" -#include "util/Set.hh" -#include "util/MinMax.hh" -#include "parasitics/EstimateParasitics.hh" -#include "parasitics/Parasitics.hh" +#include "Map.hh" +#include "Set.hh" +#include "MinMax.hh" +#include "EstimateParasitics.hh" +#include "Parasitics.hh" namespace sta { diff --git a/parasitics/ConcreteParasiticsPvt.hh b/parasitics/ConcreteParasiticsPvt.hh index f70cf944..c44a2461 100644 --- a/parasitics/ConcreteParasiticsPvt.hh +++ b/parasitics/ConcreteParasiticsPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "parasitics/Parasitics.hh" +#include "Parasitics.hh" namespace sta { diff --git a/parasitics/EstimateParasitics.cc b/parasitics/EstimateParasitics.cc index ab7ac0c4..a9afef0a 100644 --- a/parasitics/EstimateParasitics.cc +++ b/parasitics/EstimateParasitics.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/EstimateParasitics.hh" +#include "EstimateParasitics.hh" -#include "liberty/Wireload.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" +#include "Wireload.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Parasitics.hh" namespace sta { diff --git a/parasitics/EstimateParasitics.hh b/parasitics/EstimateParasitics.hh index 88ec1723..73674fe6 100644 --- a/parasitics/EstimateParasitics.hh +++ b/parasitics/EstimateParasitics.hh @@ -16,10 +16,10 @@ #pragma once -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "parasitics/ParasiticsClass.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "ParasiticsClass.hh" namespace sta { diff --git a/parasitics/NullParasitics.cc b/parasitics/NullParasitics.cc index 92c23615..5521a057 100644 --- a/parasitics/NullParasitics.cc +++ b/parasitics/NullParasitics.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/NullParasitics.hh" +#include "NullParasitics.hh" namespace sta { diff --git a/parasitics/Parasitics.cc b/parasitics/Parasitics.cc index 20b45b7a..fc50eef1 100644 --- a/parasitics/Parasitics.cc +++ b/parasitics/Parasitics.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/Parasitics.hh" +#include "Parasitics.hh" -#include "util/Error.hh" -#include "util/Debug.hh" -#include "liberty/Liberty.hh" -#include "liberty/Wireload.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" -#include "sdc/Sdc.hh" -#include "parasitics/ReduceParasitics.hh" +#include "Error.hh" +#include "Debug.hh" +#include "Liberty.hh" +#include "Wireload.hh" +#include "Network.hh" +#include "PortDirection.hh" +#include "Sdc.hh" +#include "ReduceParasitics.hh" namespace sta { diff --git a/parasitics/Parasitics.i b/parasitics/Parasitics.i index fa6ad1db..f0780c8c 100644 --- a/parasitics/Parasitics.i +++ b/parasitics/Parasitics.i @@ -18,7 +18,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Sta.hh" +#include "Sta.hh" using sta::Sta; using sta::cmdLinkedNetwork; diff --git a/parasitics/ReduceParasitics.cc b/parasitics/ReduceParasitics.cc index acebdfc6..c1e5014d 100644 --- a/parasitics/ReduceParasitics.cc +++ b/parasitics/ReduceParasitics.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/ReduceParasitics.hh" +#include "ReduceParasitics.hh" -#include "util/Error.hh" -#include "util/Debug.hh" -#include "util/MinMax.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "search/Corner.hh" -#include "parasitics/Parasitics.hh" +#include "Error.hh" +#include "Debug.hh" +#include "MinMax.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Corner.hh" +#include "Parasitics.hh" namespace sta { diff --git a/parasitics/ReduceParasitics.hh b/parasitics/ReduceParasitics.hh index 6d94150a..897b754f 100644 --- a/parasitics/ReduceParasitics.hh +++ b/parasitics/ReduceParasitics.hh @@ -16,8 +16,8 @@ #pragma once -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" namespace sta { diff --git a/parasitics/SpefLex.ll b/parasitics/SpefLex.ll index 291e9925..c09d90a6 100644 --- a/parasitics/SpefLex.ll +++ b/parasitics/SpefLex.ll @@ -20,7 +20,7 @@ #include #include "util/FlexPragma.hh" -#include "util/StringUtil.hh" +#include "StringUtil.hh" #include "parasitics/SpefReaderPvt.hh" #include "SpefParse.hh" diff --git a/parasitics/SpefNamespace.cc b/parasitics/SpefNamespace.cc index 09299845..9616116d 100644 --- a/parasitics/SpefNamespace.cc +++ b/parasitics/SpefNamespace.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/SpefNamespace.hh" +#include "SpefNamespace.hh" #include #include diff --git a/parasitics/SpefParse.yy b/parasitics/SpefParse.yy index 6afda474..18831b1e 100755 --- a/parasitics/SpefParse.yy +++ b/parasitics/SpefParse.yy @@ -18,8 +18,8 @@ #include -#include "util/StringUtil.hh" -#include "util/StringSeq.hh" +#include "StringUtil.hh" +#include "StringSeq.hh" #include "parasitics/SpefReaderPvt.hh" int SpefLex_lex(); diff --git a/parasitics/SpefReader.cc b/parasitics/SpefReader.cc index b490d2a6..3980a5b1 100644 --- a/parasitics/SpefReader.cc +++ b/parasitics/SpefReader.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "parasitics/SpefReader.hh" +#include "SpefReader.hh" #include -#include "util/Zlib.hh" -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/StringUtil.hh" -#include "util/Map.hh" -#include "liberty/Transition.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "parasitics/SpefReaderPvt.hh" -#include "parasitics/SpefNamespace.hh" +#include "Zlib.hh" +#include "Report.hh" +#include "Debug.hh" +#include "StringUtil.hh" +#include "Map.hh" +#include "Transition.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "PortDirection.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "SpefReaderPvt.hh" +#include "SpefNamespace.hh" int SpefParse_parse(); diff --git a/parasitics/SpefReader.hh b/parasitics/SpefReader.hh index 11707982..b743c1f7 100644 --- a/parasitics/SpefReader.hh +++ b/parasitics/SpefReader.hh @@ -16,9 +16,9 @@ #pragma once -#include "util/Zlib.hh" -#include "util/MinMax.hh" -#include "parasitics/ParasiticsClass.hh" +#include "Zlib.hh" +#include "MinMax.hh" +#include "ParasiticsClass.hh" namespace sta { diff --git a/parasitics/SpefReaderPvt.hh b/parasitics/SpefReaderPvt.hh index 816c4425..3008230a 100644 --- a/parasitics/SpefReaderPvt.hh +++ b/parasitics/SpefReaderPvt.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/Zlib.hh" -#include "util/Map.hh" -#include "util/StringSeq.hh" -#include "network/NetworkClass.hh" -#include "parasitics/ParasiticsClass.hh" +#include "Zlib.hh" +#include "Map.hh" +#include "StringSeq.hh" +#include "NetworkClass.hh" +#include "ParasiticsClass.hh" // Global namespace. #define YY_INPUT(buf,result,max_size) \ diff --git a/sdc/Clock.cc b/sdc/Clock.cc index 7b76ae5f..51a991a5 100644 --- a/sdc/Clock.cc +++ b/sdc/Clock.cc @@ -14,18 +14,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/Clock.hh" +#include "Clock.hh" #include -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" namespace sta { diff --git a/sdc/ClockGatingCheck.cc b/sdc/ClockGatingCheck.cc index 28db1ae5..db539534 100644 --- a/sdc/ClockGatingCheck.cc +++ b/sdc/ClockGatingCheck.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/ClockGatingCheck.hh" +#include "ClockGatingCheck.hh" namespace sta { diff --git a/sdc/ClockGroups.cc b/sdc/ClockGroups.cc index b27ddb16..3d6ef946 100644 --- a/sdc/ClockGroups.cc +++ b/sdc/ClockGroups.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/ClockGroups.hh" +#include "ClockGroups.hh" -#include "util/StringUtil.hh" +#include "StringUtil.hh" namespace sta { diff --git a/sdc/ClockInsertion.cc b/sdc/ClockInsertion.cc index 7043b2ba..33d2e077 100644 --- a/sdc/ClockInsertion.cc +++ b/sdc/ClockInsertion.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/ClockInsertion.hh" +#include "ClockInsertion.hh" namespace sta { diff --git a/sdc/ClockLatency.cc b/sdc/ClockLatency.cc index c5916383..09ed66e1 100644 --- a/sdc/ClockLatency.cc +++ b/sdc/ClockLatency.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/ClockLatency.hh" +#include "ClockLatency.hh" namespace sta { diff --git a/sdc/CycleAccting.cc b/sdc/CycleAccting.cc index 9b2d5cf2..5bdc8728 100644 --- a/sdc/CycleAccting.cc +++ b/sdc/CycleAccting.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/CycleAccting.hh" +#include "CycleAccting.hh" #include // ceil #include // max -#include "util/Debug.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "liberty/TimingRole.hh" -#include "sdc/Clock.hh" +#include "Debug.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "TimingRole.hh" +#include "Clock.hh" namespace sta { diff --git a/sdc/DataCheck.cc b/sdc/DataCheck.cc index 8b1ba9a9..5acfdb52 100644 --- a/sdc/DataCheck.cc +++ b/sdc/DataCheck.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/DataCheck.hh" +#include "DataCheck.hh" -#include "sdc/Clock.hh" +#include "Clock.hh" namespace sta { diff --git a/sdc/DeratingFactors.cc b/sdc/DeratingFactors.cc index 54369bc3..e6b78022 100644 --- a/sdc/DeratingFactors.cc +++ b/sdc/DeratingFactors.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/DeratingFactors.hh" +#include "DeratingFactors.hh" namespace sta { diff --git a/sdc/DisabledPorts.cc b/sdc/DisabledPorts.cc index d50b3bbd..faec9d7e 100644 --- a/sdc/DisabledPorts.cc +++ b/sdc/DisabledPorts.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/DisabledPorts.hh" +#include "DisabledPorts.hh" #include -#include "util/StringUtil.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" +#include "StringUtil.hh" +#include "TimingRole.hh" +#include "Liberty.hh" +#include "Network.hh" namespace sta { diff --git a/sdc/ExceptionPath.cc b/sdc/ExceptionPath.cc index b832a08b..086d7e15 100644 --- a/sdc/ExceptionPath.cc +++ b/sdc/ExceptionPath.cc @@ -14,19 +14,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/ExceptionPath.hh" +#include "ExceptionPath.hh" #include -#include "util/DisallowCopyAssign.hh" -#include "util/MinMax.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "network/NetworkCmp.hh" -#include "sdc/Clock.hh" +#include "DisallowCopyAssign.hh" +#include "MinMax.hh" +#include "TimingRole.hh" +#include "Units.hh" +#include "Transition.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "NetworkCmp.hh" +#include "Clock.hh" namespace sta { diff --git a/sdc/InputDrive.cc b/sdc/InputDrive.cc index 62ae07c2..b1d03f48 100644 --- a/sdc/InputDrive.cc +++ b/sdc/InputDrive.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/InputDrive.hh" +#include "InputDrive.hh" namespace sta { diff --git a/sdc/PinPair.cc b/sdc/PinPair.cc index 508bc805..0ce4c547 100644 --- a/sdc/PinPair.cc +++ b/sdc/PinPair.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/PinPair.hh" +#include "PinPair.hh" namespace sta { diff --git a/sdc/PortDelay.cc b/sdc/PortDelay.cc index 816c5ca4..00c0c6a1 100644 --- a/sdc/PortDelay.cc +++ b/sdc/PortDelay.cc @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/PortDelay.hh" +#include "PortDelay.hh" -#include "sdc/Sdc.hh" -#include "network/Network.hh" +#include "Sdc.hh" +#include "Network.hh" namespace sta { diff --git a/sdc/PortExtCap.cc b/sdc/PortExtCap.cc index 5d501bd4..1dacf223 100644 --- a/sdc/PortExtCap.cc +++ b/sdc/PortExtCap.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/PortExtCap.hh" +#include "PortExtCap.hh" namespace sta { diff --git a/sdc/RiseFallMinMax.cc b/sdc/RiseFallMinMax.cc index e1b8db99..47e66a28 100644 --- a/sdc/RiseFallMinMax.cc +++ b/sdc/RiseFallMinMax.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/RiseFallMinMax.hh" +#include "RiseFallMinMax.hh" namespace sta { diff --git a/sdc/RiseFallValues.cc b/sdc/RiseFallValues.cc index 34c85a9d..e4f9642d 100644 --- a/sdc/RiseFallValues.cc +++ b/sdc/RiseFallValues.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/RiseFallValues.hh" +#include "RiseFallValues.hh" namespace sta { diff --git a/sdc/Sdc.cc b/sdc/Sdc.cc index 555ecaa8..1df2bfa6 100644 --- a/sdc/Sdc.cc +++ b/sdc/Sdc.cc @@ -14,41 +14,41 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/Sdc.hh" +#include "Sdc.hh" #include -#include "util/DisallowCopyAssign.hh" -#include "util/Stats.hh" -#include "util/Debug.hh" -#include "util/Mutex.hh" -#include "util/Report.hh" -#include "util/PatternMatch.hh" -#include "util/MinMax.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "liberty/Transition.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "network/HpinDrvrLoad.hh" -#include "sdc/RiseFallMinMax.hh" -#include "sdc/Clock.hh" -#include "sdc/ClockLatency.hh" -#include "sdc/ClockInsertion.hh" -#include "sdc/CycleAccting.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/PortExtCap.hh" -#include "sdc/DisabledPorts.hh" -#include "sdc/InputDrive.hh" -#include "sdc/DataCheck.hh" -#include "sdc/ClockGatingCheck.hh" -#include "sdc/ClockGroups.hh" -#include "sdc/DeratingFactors.hh" -#include "graph/Graph.hh" +#include "DisallowCopyAssign.hh" +#include "Stats.hh" +#include "Debug.hh" +#include "Mutex.hh" +#include "Report.hh" +#include "PatternMatch.hh" +#include "MinMax.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Transition.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "HpinDrvrLoad.hh" +#include "RiseFallMinMax.hh" +#include "Clock.hh" +#include "ClockLatency.hh" +#include "ClockInsertion.hh" +#include "CycleAccting.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "PortExtCap.hh" +#include "DisabledPorts.hh" +#include "InputDrive.hh" +#include "DataCheck.hh" +#include "ClockGatingCheck.hh" +#include "ClockGroups.hh" +#include "DeratingFactors.hh" +#include "Graph.hh" #include "search/Levelize.hh" -#include "search/Corner.hh" +#include "Corner.hh" namespace sta { diff --git a/sdc/SdcCmdComment.cc b/sdc/SdcCmdComment.cc index abae5a88..4be288e6 100644 --- a/sdc/SdcCmdComment.cc +++ b/sdc/SdcCmdComment.cc @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringUtil.hh" -#include "sdc/SdcCmdComment.hh" +#include "StringUtil.hh" +#include "SdcCmdComment.hh" namespace sta { diff --git a/sdc/WriteSdc.cc b/sdc/WriteSdc.cc index 33888975..88e9059d 100644 --- a/sdc/WriteSdc.cc +++ b/sdc/WriteSdc.cc @@ -14,38 +14,38 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sdc/WriteSdc.hh" +#include "WriteSdc.hh" #include #include #include -#include "util/DisallowCopyAssign.hh" -#include "util/Report.hh" -#include "util/Error.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "liberty/Liberty.hh" -#include "liberty/Wireload.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" -#include "network/NetworkCmp.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" -#include "sdc/RiseFallValues.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/PortExtCap.hh" -#include "sdc/DisabledPorts.hh" -#include "sdc/ClockGroups.hh" -#include "sdc/ClockInsertion.hh" -#include "sdc/ClockLatency.hh" -#include "sdc/InputDrive.hh" -#include "sdc/DataCheck.hh" -#include "sdc/DeratingFactors.hh" -#include "sdc/Sdc.hh" -#include "sdc/WriteSdcPvt.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Report.hh" +#include "Error.hh" +#include "Units.hh" +#include "Transition.hh" +#include "Liberty.hh" +#include "Wireload.hh" +#include "Network.hh" +#include "PortDirection.hh" +#include "NetworkCmp.hh" +#include "Graph.hh" +#include "GraphCmp.hh" +#include "RiseFallValues.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "PortExtCap.hh" +#include "DisabledPorts.hh" +#include "ClockGroups.hh" +#include "ClockInsertion.hh" +#include "ClockLatency.hh" +#include "InputDrive.hh" +#include "DataCheck.hh" +#include "DeratingFactors.hh" +#include "Sdc.hh" +#include "WriteSdcPvt.hh" +#include "StaState.hh" namespace sta { diff --git a/include/sta/sdc/WriteSdcPvt.hh b/sdc/WriteSdcPvt.hh similarity index 99% rename from include/sta/sdc/WriteSdcPvt.hh rename to sdc/WriteSdcPvt.hh index 8ca21f77..83ee4d2e 100644 --- a/include/sta/sdc/WriteSdcPvt.hh +++ b/sdc/WriteSdcPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "util/DisallowCopyAssign.hh" +#include "DisallowCopyAssign.hh" namespace sta { diff --git a/sdf/ReportAnnotation.cc b/sdf/ReportAnnotation.cc index 2cbe43f1..f14791e2 100644 --- a/sdf/ReportAnnotation.cc +++ b/sdf/ReportAnnotation.cc @@ -16,17 +16,17 @@ #include "sdf/ReportAnnotation.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/StringUtil.hh" -#include "util/Report.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" -#include "sdc/Sdc.hh" -#include "dcalc/DcalcAnalysisPt.hh" +#include "DisallowCopyAssign.hh" +#include "StringUtil.hh" +#include "Report.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "GraphCmp.hh" +#include "Sdc.hh" +#include "DcalcAnalysisPt.hh" namespace sta { diff --git a/sdf/Sdf.hh b/sdf/Sdf.hh index 8f664a8f..2377b679 100644 --- a/sdf/Sdf.hh +++ b/sdf/Sdf.hh @@ -16,16 +16,16 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Zlib.hh" -#include "util/Vector.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Transition.hh" -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Zlib.hh" +#include "Vector.hh" +#include "TimingRole.hh" +#include "Transition.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "StaState.hh" // Header for ReadSdf.cc to communicate with SdfLex.cc, SdfParse.cc diff --git a/sdf/Sdf.i b/sdf/Sdf.i index 379168a4..db720c8b 100644 --- a/sdf/Sdf.i +++ b/sdf/Sdf.i @@ -21,8 +21,8 @@ #include "sdf/SdfReader.hh" #include "sdf/ReportAnnotation.hh" #include "sdf/SdfWriter.hh" -#include "search/Search.hh" -#include "search/Sta.hh" +#include "Search.hh" +#include "Sta.hh" using sta::Sta; using sta::cmdLinkedNetwork; diff --git a/sdf/SdfReader.cc b/sdf/SdfReader.cc index cacdd4da..98f7dff6 100644 --- a/sdf/SdfReader.cc +++ b/sdf/SdfReader.cc @@ -19,16 +19,16 @@ #include #include -#include "util/DisallowCopyAssign.hh" -#include "util/Error.hh" -#include "util/Report.hh" -#include "util/MinMax.hh" -#include "liberty/TimingArc.hh" -#include "network/Network.hh" -#include "network/SdcNetwork.hh" -#include "graph/Graph.hh" -#include "search/Corner.hh" -#include "dcalc/DcalcAnalysisPt.hh" +#include "DisallowCopyAssign.hh" +#include "Error.hh" +#include "Report.hh" +#include "MinMax.hh" +#include "TimingArc.hh" +#include "Network.hh" +#include "SdcNetwork.hh" +#include "Graph.hh" +#include "Corner.hh" +#include "DcalcAnalysisPt.hh" #include "sdf/Sdf.hh" extern int diff --git a/sdf/SdfReader.hh b/sdf/SdfReader.hh index e83ddb87..07d2d8d2 100644 --- a/sdf/SdfReader.hh +++ b/sdf/SdfReader.hh @@ -16,7 +16,7 @@ #pragma once -#include "sdc/SdcClass.hh" +#include "SdcClass.hh" namespace sta { diff --git a/sdf/SdfWriter.cc b/sdf/SdfWriter.cc index def2cc2e..4287776c 100644 --- a/sdf/SdfWriter.cc +++ b/sdf/SdfWriter.cc @@ -19,23 +19,23 @@ #include #include -#include "util/Zlib.hh" -#include "util/StaConfig.hh" // STA_VERSION -#include "util/Fuzzy.hh" -#include "util/StringUtil.hh" -#include "liberty/Units.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "sdc/Sdc.hh" -#include "sdc/MinMaxValues.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc1.hh" -#include "search/StaState.hh" -#include "search/Corner.hh" -#include "search/PathAnalysisPt.hh" +#include "Zlib.hh" +#include "StaConfig.hh" // STA_VERSION +#include "Fuzzy.hh" +#include "StringUtil.hh" +#include "Units.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Sdc.hh" +#include "MinMaxValues.hh" +#include "Network.hh" +#include "Graph.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "StaState.hh" +#include "Corner.hh" +#include "PathAnalysisPt.hh" namespace sta { diff --git a/search/Bfs.cc b/search/Bfs.cc index 426a5e04..4d8ff872 100644 --- a/search/Bfs.cc +++ b/search/Bfs.cc @@ -14,19 +14,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Bfs.hh" +#include "Bfs.hh" #include -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Mutex.hh" -#include "util/DispatchQueue.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Levelize.hh" -#include "search/SearchPred.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Mutex.hh" +#include "DispatchQueue.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Levelize.hh" +#include "SearchPred.hh" namespace sta { diff --git a/search/CheckMaxSkews.cc b/search/CheckMaxSkews.cc index 26b31afa..d7020cc5 100644 --- a/search/CheckMaxSkews.cc +++ b/search/CheckMaxSkews.cc @@ -14,18 +14,18 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/CheckMaxSkews.hh" +#include "CheckMaxSkews.hh" -#include "util/DisallowCopyAssign.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Clock.hh" -#include "search/PathVertex.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Search.hh" +#include "DisallowCopyAssign.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Clock.hh" +#include "PathVertex.hh" +#include "PathAnalysisPt.hh" +#include "Search.hh" namespace sta { diff --git a/search/CheckMaxSkews.hh b/search/CheckMaxSkews.hh index 9bdac387..8d9ea10f 100644 --- a/search/CheckMaxSkews.hh +++ b/search/CheckMaxSkews.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "graph/GraphClass.hh" -#include "graph/Delay.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" -#include "search/PathRef.hh" +#include "DisallowCopyAssign.hh" +#include "GraphClass.hh" +#include "Delay.hh" +#include "StaState.hh" +#include "SearchClass.hh" +#include "PathRef.hh" namespace sta { diff --git a/search/CheckMinPeriods.cc b/search/CheckMinPeriods.cc index 80c51170..dd21636d 100644 --- a/search/CheckMinPeriods.cc +++ b/search/CheckMinPeriods.cc @@ -14,17 +14,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/CheckMinPeriods.hh" +#include "CheckMinPeriods.hh" -#include "util/DisallowCopyAssign.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "sdc/Clock.hh" -#include "graph/Graph.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/Search.hh" +#include "DisallowCopyAssign.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Clock.hh" +#include "Graph.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "Search.hh" namespace sta { diff --git a/search/CheckMinPeriods.hh b/search/CheckMinPeriods.hh index d927a94b..41e2b279 100644 --- a/search/CheckMinPeriods.hh +++ b/search/CheckMinPeriods.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "graph/Delay.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "Delay.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/CheckMinPulseWidths.cc b/search/CheckMinPulseWidths.cc index 3b492a57..385662c0 100644 --- a/search/CheckMinPulseWidths.cc +++ b/search/CheckMinPulseWidths.cc @@ -16,25 +16,26 @@ #include "CheckMinPulseWidths.hh" -#include "util/Debug.hh" -#include "util/DisallowCopyAssign.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Clock.hh" -#include "sdc/Sdc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/PathVertex.hh" -#include "search/PathRef.hh" -#include "search/Corner.hh" -#include "search/PathAnalysisPt.hh" -#include "search/SearchPred.hh" -#include "search/PathEnd.hh" -#include "search/Search.hh" +#include "Debug.hh" +#include "DisallowCopyAssign.hh" +#include "TimingRole.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Clock.hh" +#include "Sdc.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "PathVertex.hh" +#include "PathRef.hh" +#include "Corner.hh" +#include "PathAnalysisPt.hh" +#include "SearchPred.hh" +#include "PathEnd.hh" +#include "Search.hh" +#include "search/Crpr.hh" namespace sta { diff --git a/search/CheckMinPulseWidths.hh b/search/CheckMinPulseWidths.hh index 34403cfa..21a6104c 100644 --- a/search/CheckMinPulseWidths.hh +++ b/search/CheckMinPulseWidths.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" -#include "search/PathRef.hh" +#include "DisallowCopyAssign.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" +#include "PathRef.hh" namespace sta { diff --git a/search/CheckSlewLimits.cc b/search/CheckSlewLimits.cc index 531317c3..b9a9990e 100644 --- a/search/CheckSlewLimits.cc +++ b/search/CheckSlewLimits.cc @@ -14,19 +14,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/CheckSlewLimits.hh" +#include "CheckSlewLimits.hh" -#include "util/Fuzzy.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/StaState.hh" -#include "search/Corner.hh" -#include "search/PathVertex.hh" -#include "search/Search.hh" +#include "Fuzzy.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "StaState.hh" +#include "Corner.hh" +#include "PathVertex.hh" +#include "Search.hh" namespace sta { diff --git a/search/CheckSlewLimits.hh b/search/CheckSlewLimits.hh index ee4e6f09..0fa728df 100644 --- a/search/CheckSlewLimits.hh +++ b/search/CheckSlewLimits.hh @@ -16,12 +16,12 @@ #pragma once -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "graph/Delay.hh" -#include "sdc/SdcClass.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "Delay.hh" +#include "SdcClass.hh" namespace sta { diff --git a/search/CheckTiming.cc b/search/CheckTiming.cc index 3131cf70..a6ad21dd 100644 --- a/search/CheckTiming.cc +++ b/search/CheckTiming.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/CheckTiming.hh" +#include "CheckTiming.hh" -#include "util/Error.hh" -#include "liberty/TimingRole.hh" -#include "network/Network.hh" -#include "network/NetworkCmp.hh" -#include "network/PortDirection.hh" -#include "graph/Graph.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "search/SearchPred.hh" -#include "search/Levelize.hh" -#include "search/Bfs.hh" -#include "search/Search.hh" -#include "search/Genclks.hh" -#include "search/PathVertex.hh" +#include "Error.hh" +#include "TimingRole.hh" +#include "Network.hh" +#include "NetworkCmp.hh" +#include "PortDirection.hh" +#include "Graph.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "SearchPred.hh" +#include "Levelize.hh" +#include "Bfs.hh" +#include "Search.hh" +#include "Genclks.hh" +#include "PathVertex.hh" namespace sta { diff --git a/search/CheckTiming.hh b/search/CheckTiming.hh index 0f634fa2..e459d0fb 100644 --- a/search/CheckTiming.hh +++ b/search/CheckTiming.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/StringSeq.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "StringSeq.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/ClkInfo.cc b/search/ClkInfo.cc index 74feaf79..8638eda3 100644 --- a/search/ClkInfo.cc +++ b/search/ClkInfo.cc @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/ClkInfo.hh" +#include "ClkInfo.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/Tag.hh" -#include "search/PathAnalysisPt.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Corner.hh" +#include "Search.hh" +#include "Tag.hh" +#include "PathAnalysisPt.hh" namespace sta { diff --git a/search/ClkSkew.cc b/search/ClkSkew.cc index 1d8609a7..3a438bda 100644 --- a/search/ClkSkew.cc +++ b/search/ClkSkew.cc @@ -14,26 +14,26 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/ClkSkew.hh" +#include "ClkSkew.hh" #include // abs -#include "util/DisallowCopyAssign.hh" -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "liberty/TimingArc.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Bfs.hh" -#include "search/PathVertex.hh" -#include "search/StaState.hh" -#include "search/PathAnalysisPt.hh" -#include "search/SearchPred.hh" -#include "search/Search.hh" -#include "search/Crpr.hh" +#include "DisallowCopyAssign.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "TimingArc.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Bfs.hh" +#include "PathVertex.hh" +#include "StaState.hh" +#include "PathAnalysisPt.hh" +#include "SearchPred.hh" +#include "Search.hh" +#include "Crpr.hh" namespace sta { diff --git a/search/ClkSkew.hh b/search/ClkSkew.hh index 11b26af1..ddffce9a 100644 --- a/search/ClkSkew.hh +++ b/search/ClkSkew.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/Map.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" +#include "Map.hh" +#include "SdcClass.hh" +#include "StaState.hh" +#include "SearchClass.hh" namespace sta { diff --git a/search/Corner.cc b/search/Corner.cc index b490449b..492419b7 100644 --- a/search/Corner.cc +++ b/search/Corner.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Corner.hh" +#include "Corner.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/PathAnalysisPt.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" +#include "PathAnalysisPt.hh" namespace sta { diff --git a/search/Crpr.cc b/search/Crpr.cc index 4660f8d3..3d9fc1ee 100644 --- a/search/Crpr.cc +++ b/search/Crpr.cc @@ -14,27 +14,27 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Crpr.hh" +#include "Crpr.hh" #include // abs #include -#include "util/Debug.hh" -#include "util/Vector.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/PathVertex.hh" -#include "search/PathVertexRep.hh" -#include "search/Path.hh" -#include "search/PathAnalysisPt.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/TagGroup.hh" -#include "search/VisitPathEnds.hh" -#include "search/PathEnd.hh" -#include "search/Search.hh" -#include "search/Genclks.hh" +#include "Debug.hh" +#include "Vector.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "PathVertex.hh" +#include "PathVertexRep.hh" +#include "Path.hh" +#include "PathAnalysisPt.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "TagGroup.hh" +#include "VisitPathEnds.hh" +#include "PathEnd.hh" +#include "Search.hh" +#include "Genclks.hh" namespace sta { diff --git a/search/Crpr.hh b/search/Crpr.hh index e9df6e92..0e976931 100644 --- a/search/Crpr.hh +++ b/search/Crpr.hh @@ -16,10 +16,10 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" +#include "DisallowCopyAssign.hh" +#include "SdcClass.hh" +#include "StaState.hh" +#include "SearchClass.hh" namespace sta { diff --git a/search/FindRegister.cc b/search/FindRegister.cc index 0b4626f7..0285a461 100644 --- a/search/FindRegister.cc +++ b/search/FindRegister.cc @@ -14,20 +14,20 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/FindRegister.hh" +#include "FindRegister.hh" -#include "util/DisallowCopyAssign.hh" -#include "liberty/TimingRole.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Sequential.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "sdc/Clock.hh" -#include "search/SearchPred.hh" -#include "search/Search.hh" +#include "DisallowCopyAssign.hh" +#include "TimingRole.hh" +#include "FuncExpr.hh" +#include "TimingArc.hh" +#include "Sequential.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Clock.hh" +#include "SearchPred.hh" +#include "Search.hh" namespace sta { diff --git a/search/FindRegister.hh b/search/FindRegister.hh index 577277aa..e333ae16 100644 --- a/search/FindRegister.hh +++ b/search/FindRegister.hh @@ -16,10 +16,10 @@ #pragma once -#include "liberty/LibertyClass.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" +#include "LibertyClass.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/GatedClk.cc b/search/GatedClk.cc index 7d6535d6..0f8357ca 100644 --- a/search/GatedClk.cc +++ b/search/GatedClk.cc @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/GatedClk.hh" +#include "GatedClk.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Search.hh" +#include "FuncExpr.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Search.hh" namespace sta { diff --git a/search/GatedClk.hh b/search/GatedClk.hh index 04b0d362..01d824c4 100644 --- a/search/GatedClk.hh +++ b/search/GatedClk.hh @@ -16,10 +16,10 @@ #pragma once -#include "sdc/SdcClass.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "SdcClass.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/Genclks.cc b/search/Genclks.cc index d3f4c987..78da5608 100644 --- a/search/Genclks.cc +++ b/search/Genclks.cc @@ -14,26 +14,26 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Genclks.hh" +#include "Genclks.hh" -#include "util/Stats.hh" -#include "util/Debug.hh" -#include "util/Report.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Clock.hh" -#include "search/StaState.hh" -#include "search/SearchPred.hh" -#include "search/Bfs.hh" -#include "search/TagGroup.hh" -#include "search/Corner.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Levelize.hh" -#include "search/PathVertexRep.hh" -#include "search/Search.hh" +#include "Stats.hh" +#include "Debug.hh" +#include "Report.hh" +#include "Network.hh" +#include "PortDirection.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "ExceptionPath.hh" +#include "Clock.hh" +#include "StaState.hh" +#include "SearchPred.hh" +#include "Bfs.hh" +#include "TagGroup.hh" +#include "Corner.hh" +#include "PathAnalysisPt.hh" +#include "Levelize.hh" +#include "PathVertexRep.hh" +#include "Search.hh" namespace sta { diff --git a/search/Genclks.hh b/search/Genclks.hh index da29072b..ca48746c 100644 --- a/search/Genclks.hh +++ b/search/Genclks.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/Map.hh" -#include "liberty/Transition.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "Map.hh" +#include "Transition.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/Latches.cc b/search/Latches.cc index 32ecd656..dec6bcf2 100644 --- a/search/Latches.cc +++ b/search/Latches.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Debug.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/Sim.hh" -#include "search/PathEnd.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Search.hh" -#include "search/Crpr.hh" +#include "Debug.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "Sim.hh" +#include "PathEnd.hh" +#include "PathAnalysisPt.hh" +#include "Search.hh" +#include "Crpr.hh" -#include "search/Latches.hh" +#include "Latches.hh" namespace sta { diff --git a/search/Latches.hh b/search/Latches.hh index fc937907..4674d219 100644 --- a/search/Latches.hh +++ b/search/Latches.hh @@ -18,9 +18,9 @@ namespace sta { -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/StaState.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "StaState.hh" enum class LatchEnableState { enabled, open, closed }; diff --git a/search/Levelize.cc b/search/Levelize.cc index 1069c29a..7b81307f 100644 --- a/search/Levelize.cc +++ b/search/Levelize.cc @@ -18,16 +18,16 @@ #include -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Stats.hh" -#include "liberty/TimingRole.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" -#include "search/SearchPred.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Stats.hh" +#include "TimingRole.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "GraphCmp.hh" +#include "SearchPred.hh" namespace sta { diff --git a/search/Levelize.hh b/search/Levelize.hh index 11b9c9fa..305ae7cf 100644 --- a/search/Levelize.hh +++ b/search/Levelize.hh @@ -16,11 +16,11 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "network/NetworkClass.hh" -#include "sdc/SdcClass.hh" -#include "graph/GraphClass.hh" -#include "search/StaState.hh" +#include "DisallowCopyAssign.hh" +#include "NetworkClass.hh" +#include "SdcClass.hh" +#include "GraphClass.hh" +#include "StaState.hh" namespace sta { diff --git a/search/Path.cc b/search/Path.cc index dc763ef3..259be8c3 100644 --- a/search/Path.cc +++ b/search/Path.cc @@ -14,17 +14,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Path.hh" +#include "Path.hh" -#include "liberty/TimingArc.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Clock.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/Corner.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Tag.hh" -#include "search/PathRef.hh" +#include "TimingArc.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Clock.hh" +#include "DcalcAnalysisPt.hh" +#include "Corner.hh" +#include "PathAnalysisPt.hh" +#include "Tag.hh" +#include "PathRef.hh" namespace sta { diff --git a/search/PathAnalysisPt.cc b/search/PathAnalysisPt.cc index 3827441c..3ae4ee9b 100644 --- a/search/PathAnalysisPt.cc +++ b/search/PathAnalysisPt.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathAnalysisPt.hh" +#include "PathAnalysisPt.hh" -#include "util/StringUtil.hh" -#include "search/Corner.hh" -#include "search/Search.hh" +#include "StringUtil.hh" +#include "Corner.hh" +#include "Search.hh" namespace sta { diff --git a/search/PathEnd.cc b/search/PathEnd.cc index fb166a62..aecfa1de 100644 --- a/search/PathEnd.cc +++ b/search/PathEnd.cc @@ -14,28 +14,29 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathEnd.hh" +#include "PathEnd.hh" -#include "util/Debug.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Clock.hh" -#include "sdc/PortDelay.hh" -#include "sdc/DataCheck.hh" -#include "sdc/Sdc.hh" -#include "sdc/ExceptionPath.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Search.hh" -#include "search/ReportPath.hh" -#include "search/Sim.hh" -#include "search/Latches.hh" -#include "search/StaState.hh" -#include "search/PathExpanded.hh" +#include "Debug.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Clock.hh" +#include "PortDelay.hh" +#include "DataCheck.hh" +#include "Sdc.hh" +#include "ExceptionPath.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "PathAnalysisPt.hh" +#include "Search.hh" +#include "ReportPath.hh" +#include "Sim.hh" +#include "Latches.hh" +#include "StaState.hh" +#include "PathExpanded.hh" +#include "search/Crpr.hh" namespace sta { diff --git a/search/PathEnum.cc b/search/PathEnum.cc index 7808d936..0d650fa1 100644 --- a/search/PathEnum.cc +++ b/search/PathEnum.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathEnum.hh" +#include "PathEnum.hh" -#include "util/DisallowCopyAssign.hh" -#include "util/Debug.hh" -#include "util/Error.hh" -#include "util/Fuzzy.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Tag.hh" -#include "search/Search.hh" -#include "search/PathEnd.hh" -#include "search/PathRef.hh" -#include "search/PathEnumed.hh" +#include "DisallowCopyAssign.hh" +#include "Debug.hh" +#include "Error.hh" +#include "Fuzzy.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "PathAnalysisPt.hh" +#include "Tag.hh" +#include "Search.hh" +#include "PathEnd.hh" +#include "PathRef.hh" +#include "PathEnumed.hh" namespace sta { diff --git a/search/PathEnum.hh b/search/PathEnum.hh index 371e4a4d..33c0548f 100644 --- a/search/PathEnum.hh +++ b/search/PathEnum.hh @@ -18,12 +18,12 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/Iterator.hh" -#include "util/Vector.hh" -#include "search/StaState.hh" -#include "search/SearchClass.hh" -#include "search/Path.hh" +#include "DisallowCopyAssign.hh" +#include "Iterator.hh" +#include "Vector.hh" +#include "StaState.hh" +#include "SearchClass.hh" +#include "Path.hh" namespace sta { diff --git a/search/PathEnumed.cc b/search/PathEnumed.cc index e9aec9c6..614251ed 100644 --- a/search/PathEnumed.cc +++ b/search/PathEnumed.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathEnumed.hh" +#include "PathEnumed.hh" -#include "util/Set.hh" -#include "graph/Graph.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/Tag.hh" -#include "search/PathRef.hh" +#include "Set.hh" +#include "Graph.hh" +#include "Corner.hh" +#include "Search.hh" +#include "Tag.hh" +#include "PathRef.hh" namespace sta { diff --git a/search/PathEnumed.hh b/search/PathEnumed.hh index d4707e65..cf7fc518 100644 --- a/search/PathEnumed.hh +++ b/search/PathEnumed.hh @@ -16,8 +16,8 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "search/Path.hh" +#include "DisallowCopyAssign.hh" +#include "Path.hh" namespace sta { diff --git a/search/PathExpanded.cc b/search/PathExpanded.cc index 7a083b10..21a22687 100644 --- a/search/PathExpanded.cc +++ b/search/PathExpanded.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathExpanded.hh" +#include "PathExpanded.hh" -#include "liberty/TimingRole.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/Clock.hh" -#include "search/Search.hh" -#include "search/PathRef.hh" -#include "search/Latches.hh" -#include "search/Genclks.hh" +#include "TimingRole.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Clock.hh" +#include "Search.hh" +#include "PathRef.hh" +#include "Latches.hh" +#include "Genclks.hh" namespace sta { diff --git a/search/PathGroup.cc b/search/PathGroup.cc index 65cd8270..20422f8d 100644 --- a/search/PathGroup.cc +++ b/search/PathGroup.cc @@ -14,27 +14,27 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathGroup.hh" +#include "PathGroup.hh" #include #include -#include "util/Stats.hh" -#include "util/Debug.hh" -#include "util/Mutex.hh" -#include "util/Fuzzy.hh" -#include "util/MinMax.hh" -#include "util/DispatchQueue.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "search/PathEnd.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Tag.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/VisitPathEnds.hh" -#include "search/PathEnum.hh" +#include "Stats.hh" +#include "Debug.hh" +#include "Mutex.hh" +#include "Fuzzy.hh" +#include "MinMax.hh" +#include "DispatchQueue.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "PathEnd.hh" +#include "PathAnalysisPt.hh" +#include "Tag.hh" +#include "Corner.hh" +#include "Search.hh" +#include "VisitPathEnds.hh" +#include "PathEnum.hh" namespace sta { diff --git a/search/PathRef.cc b/search/PathRef.cc index 8cc2cbca..68f4d467 100644 --- a/search/PathRef.cc +++ b/search/PathRef.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathRef.hh" +#include "PathRef.hh" -#include "graph/Graph.hh" -#include "search/TagGroup.hh" -#include "search/PathEnumed.hh" -#include "search/PathVertex.hh" -#include "search/Search.hh" +#include "Graph.hh" +#include "TagGroup.hh" +#include "PathEnumed.hh" +#include "PathVertex.hh" +#include "Search.hh" namespace sta { diff --git a/search/PathVertex.cc b/search/PathVertex.cc index d074b33a..e870f659 100644 --- a/search/PathVertex.cc +++ b/search/PathVertex.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathVertex.hh" +#include "PathVertex.hh" #include -#include "util/DisallowCopyAssign.hh" -#include "util/Fuzzy.hh" -#include "graph/Graph.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/Corner.hh" -#include "search/Tag.hh" -#include "search/TagGroup.hh" -#include "search/PathAnalysisPt.hh" -#include "search/PathRef.hh" -#include "search/PathVertexRep.hh" -#include "search/Search.hh" +#include "DisallowCopyAssign.hh" +#include "Fuzzy.hh" +#include "Graph.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "GraphDelayCalc.hh" +#include "Corner.hh" +#include "Tag.hh" +#include "TagGroup.hh" +#include "PathAnalysisPt.hh" +#include "PathRef.hh" +#include "PathVertexRep.hh" +#include "Search.hh" namespace sta { diff --git a/search/PathVertexRep.cc b/search/PathVertexRep.cc index afea247a..1411bc01 100644 --- a/search/PathVertexRep.cc +++ b/search/PathVertexRep.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/PathVertexRep.hh" +#include "PathVertexRep.hh" -#include "graph/Graph.hh" -#include "search/SearchClass.hh" -#include "search/Tag.hh" -#include "search/TagGroup.hh" -#include "search/Search.hh" -#include "search/PathVertex.hh" +#include "Graph.hh" +#include "SearchClass.hh" +#include "Tag.hh" +#include "TagGroup.hh" +#include "Search.hh" +#include "PathVertex.hh" namespace sta { diff --git a/search/Power.cc b/search/Power.cc index 80fa7a19..6fa6d9a6 100644 --- a/search/Power.cc +++ b/search/Power.cc @@ -14,35 +14,35 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Power.hh" +#include "Power.hh" #include // max -#include "util/Debug.hh" -#include "util/EnumNameMap.hh" -#include "util/MinMax.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Liberty.hh" -#include "liberty/InternalPower.hh" -#include "liberty/LeakagePower.hh" -#include "liberty/Sequential.hh" -#include "liberty/TimingArc.hh" -#include "liberty/FuncExpr.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/Clock.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/Corner.hh" -#include "search/PathVertex.hh" -#include "search/Levelize.hh" -#include "search/Sim.hh" -#include "search/Search.hh" -#include "search/Bfs.hh" +#include "Debug.hh" +#include "EnumNameMap.hh" +#include "MinMax.hh" +#include "Units.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "Liberty.hh" +#include "InternalPower.hh" +#include "LeakagePower.hh" +#include "Sequential.hh" +#include "TimingArc.hh" +#include "FuncExpr.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Clock.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "DcalcAnalysisPt.hh" +#include "GraphDelayCalc.hh" +#include "Corner.hh" +#include "PathVertex.hh" +#include "Levelize.hh" +#include "Sim.hh" +#include "Search.hh" +#include "Bfs.hh" // Related liberty not supported: // library diff --git a/search/Property.cc b/search/Property.cc index d8b0515f..2877fc86 100644 --- a/search/Property.cc +++ b/search/Property.cc @@ -14,24 +14,24 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Property.hh" +#include "Property.hh" -#include "util/StringUtil.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "liberty/Units.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Clock.hh" -#include "search/Corner.hh" -#include "search/PathEnd.hh" -#include "search/PathExpanded.hh" -#include "search/PathRef.hh" -#include "search/Power.hh" -#include "search/Sta.hh" +#include "StringUtil.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "Units.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Clock.hh" +#include "Corner.hh" +#include "PathEnd.hh" +#include "PathExpanded.hh" +#include "PathRef.hh" +#include "Power.hh" +#include "Sta.hh" namespace sta { diff --git a/search/ReportPath.cc b/search/ReportPath.cc index b6ba9798..e0eb8811 100644 --- a/search/ReportPath.cc +++ b/search/ReportPath.cc @@ -14,42 +14,42 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/ReportPath.hh" +#include "ReportPath.hh" -#include "util/Report.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/InputDrive.hh" -#include "sdc/Sdc.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "dcalc/ArcDelayCalc.hh" -#include "dcalc/GraphDelayCalc.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/PathVertex.hh" -#include "search/PathAnalysisPt.hh" -#include "search/PathGroup.hh" -#include "search/CheckMinPulseWidths.hh" -#include "search/CheckMinPeriods.hh" -#include "search/CheckMaxSkews.hh" -#include "search/PathRef.hh" -#include "search/Search.hh" -#include "search/PathExpanded.hh" -#include "search/Latches.hh" -#include "search/Corner.hh" -#include "search/Genclks.hh" +#include "Report.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "TimingRole.hh" +#include "Transition.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Graph.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "InputDrive.hh" +#include "Sdc.hh" +#include "Parasitics.hh" +#include "DcalcAnalysisPt.hh" +#include "ArcDelayCalc.hh" +#include "GraphDelayCalc.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "PathVertex.hh" +#include "PathAnalysisPt.hh" +#include "PathGroup.hh" +#include "CheckMinPulseWidths.hh" +#include "CheckMinPeriods.hh" +#include "CheckMaxSkews.hh" +#include "PathRef.hh" +#include "Search.hh" +#include "PathExpanded.hh" +#include "Latches.hh" +#include "Corner.hh" +#include "Genclks.hh" namespace sta { diff --git a/search/ReportPath.hh b/search/ReportPath.hh index 52176c55..3166fa22 100644 --- a/search/ReportPath.hh +++ b/search/ReportPath.hh @@ -18,10 +18,10 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/StringSeq.hh" -#include "search/SearchClass.hh" -#include "search/PathEnd.hh" +#include "DisallowCopyAssign.hh" +#include "StringSeq.hh" +#include "SearchClass.hh" +#include "PathEnd.hh" namespace sta { diff --git a/search/Search.cc b/search/Search.cc index 7654de08..cb4603a4 100644 --- a/search/Search.cc +++ b/search/Search.cc @@ -14,55 +14,55 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Search.hh" +#include "Search.hh" #include #include // abs -#include "util/DisallowCopyAssign.hh" -#include "util/Mutex.hh" -#include "util/Report.hh" -#include "util/Debug.hh" -#include "util/Error.hh" -#include "util/Stats.hh" -#include "util/Fuzzy.hh" -#include "liberty/TimingRole.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Sequential.hh" -#include "liberty/Units.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "network/PortDirection.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" -#include "sdc/PortDelay.hh" -#include "sdc/Clock.hh" -#include "sdc/CycleAccting.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/DataCheck.hh" -#include "sdc/Sdc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/SearchPred.hh" -#include "search/Levelize.hh" -#include "search/Bfs.hh" -#include "search/Corner.hh" -#include "search/Sim.hh" -#include "search/PathVertex.hh" -#include "search/PathVertexRep.hh" -#include "search/PathRef.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/TagGroup.hh" -#include "search/PathEnd.hh" -#include "search/PathGroup.hh" -#include "search/PathAnalysisPt.hh" -#include "search/VisitPathEnds.hh" -#include "search/GatedClk.hh" -#include "search/WorstSlack.hh" -#include "search/Latches.hh" -#include "search/Crpr.hh" -#include "search/Genclks.hh" +#include "DisallowCopyAssign.hh" +#include "Mutex.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Error.hh" +#include "Stats.hh" +#include "Fuzzy.hh" +#include "TimingRole.hh" +#include "FuncExpr.hh" +#include "TimingArc.hh" +#include "Sequential.hh" +#include "Units.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "PortDirection.hh" +#include "Graph.hh" +#include "GraphCmp.hh" +#include "PortDelay.hh" +#include "Clock.hh" +#include "CycleAccting.hh" +#include "ExceptionPath.hh" +#include "DataCheck.hh" +#include "Sdc.hh" +#include "DcalcAnalysisPt.hh" +#include "SearchPred.hh" +#include "Levelize.hh" +#include "Bfs.hh" +#include "Corner.hh" +#include "Sim.hh" +#include "PathVertex.hh" +#include "PathVertexRep.hh" +#include "PathRef.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "TagGroup.hh" +#include "PathEnd.hh" +#include "PathGroup.hh" +#include "PathAnalysisPt.hh" +#include "VisitPathEnds.hh" +#include "GatedClk.hh" +#include "WorstSlack.hh" +#include "Latches.hh" +#include "Crpr.hh" +#include "Genclks.hh" namespace sta { diff --git a/search/SearchPred.cc b/search/SearchPred.cc index 96c5c466..156c55a7 100644 --- a/search/SearchPred.cc +++ b/search/SearchPred.cc @@ -14,17 +14,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/SearchPred.hh" +#include "SearchPred.hh" -#include "liberty/TimingArc.hh" -#include "liberty/TimingRole.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "search/Levelize.hh" -#include "search/Search.hh" -#include "search/Latches.hh" +#include "TimingArc.hh" +#include "TimingRole.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "Levelize.hh" +#include "Search.hh" +#include "Latches.hh" namespace sta { diff --git a/search/Sim.cc b/search/Sim.cc index 05fed82a..3ee5d57d 100644 --- a/search/Sim.cc +++ b/search/Sim.cc @@ -14,22 +14,22 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Sim.hh" +#include "Sim.hh" -#include "util/StaConfig.hh" // CUDD -#include "util/Error.hh" -#include "util/Mutex.hh" -#include "util/Debug.hh" -#include "util/Report.hh" -#include "util/Stats.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" +#include "StaConfig.hh" // CUDD +#include "Error.hh" +#include "Mutex.hh" +#include "Debug.hh" +#include "Report.hh" +#include "Stats.hh" +#include "FuncExpr.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Sdc.hh" +#include "Graph.hh" #if CUDD // https://davidkebo.com/cudd diff --git a/search/Sim.hh b/search/Sim.hh index b7a333cd..aeda7f45 100644 --- a/search/Sim.hh +++ b/search/Sim.hh @@ -19,13 +19,13 @@ #include #include -#include "util/StaConfig.hh" // CUDD -#include "util/DisallowCopyAssign.hh" -#include "util/Map.hh" -#include "network/NetworkClass.hh" -#include "graph/GraphClass.hh" -#include "sdc/SdcClass.hh" -#include "search/StaState.hh" +#include "StaConfig.hh" // CUDD +#include "DisallowCopyAssign.hh" +#include "Map.hh" +#include "NetworkClass.hh" +#include "GraphClass.hh" +#include "SdcClass.hh" +#include "StaState.hh" struct DdNode; struct DdManager; diff --git a/search/Sta.cc b/search/Sta.cc index f1900bfa..acc287c7 100644 --- a/search/Sta.cc +++ b/search/Sta.cc @@ -14,55 +14,56 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Sta.hh" +#include "Sta.hh" -#include "util/DispatchQueue.hh" -#include "util/ReportTcl.hh" -#include "util/Debug.hh" -#include "util/Stats.hh" -#include "util/Fuzzy.hh" -#include "liberty/Units.hh" -#include "liberty/TimingArc.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/EquivCells.hh" -#include "liberty/Liberty.hh" +#include "util/Machine.hh" +#include "DispatchQueue.hh" +#include "ReportTcl.hh" +#include "Debug.hh" +#include "Stats.hh" +#include "Fuzzy.hh" +#include "Units.hh" +#include "TimingArc.hh" +#include "FuncExpr.hh" +#include "EquivCells.hh" +#include "Liberty.hh" #include "liberty/LibertyReader.hh" -#include "network/SdcNetwork.hh" -#include "network/MakeConcreteNetwork.hh" -#include "network/PortDirection.hh" +#include "SdcNetwork.hh" +#include "MakeConcreteNetwork.hh" +#include "PortDirection.hh" #include "verilog/VerilogReader.hh" -#include "graph/Graph.hh" -#include "graph/GraphCmp.hh" -#include "sdc/Sdc.hh" -#include "sdc/WriteSdc.hh" -#include "sdc/ExceptionPath.hh" -#include "parasitics/MakeConcreteParasitics.hh" -#include "parasitics/Parasitics.hh" +#include "Graph.hh" +#include "GraphCmp.hh" +#include "Sdc.hh" +#include "WriteSdc.hh" +#include "ExceptionPath.hh" +#include "MakeConcreteParasitics.hh" +#include "Parasitics.hh" #include "parasitics/SpefReader.hh" -#include "dcalc/DelayCalc.hh" -#include "dcalc/ArcDelayCalc.hh" +#include "DelayCalc.hh" +#include "ArcDelayCalc.hh" #include "dcalc/GraphDelayCalc1.hh" #include "sdf/SdfWriter.hh" -#include "search/Levelize.hh" -#include "search/Sim.hh" -#include "search/ClkInfo.hh" -#include "search/TagGroup.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/Latches.hh" -#include "search/PathGroup.hh" -#include "search/CheckTiming.hh" -#include "search/CheckSlewLimits.hh" -#include "search/CheckMinPulseWidths.hh" -#include "search/CheckMinPeriods.hh" -#include "search/CheckMaxSkews.hh" -#include "search/ClkSkew.hh" -#include "search/FindRegister.hh" -#include "search/ReportPath.hh" -#include "search/VisitPathGroupVertices.hh" -#include "search/Genclks.hh" -#include "search/Power.hh" +#include "Levelize.hh" +#include "Sim.hh" +#include "ClkInfo.hh" +#include "TagGroup.hh" +#include "PathAnalysisPt.hh" +#include "Corner.hh" +#include "Search.hh" +#include "Latches.hh" +#include "PathGroup.hh" +#include "CheckTiming.hh" +#include "CheckSlewLimits.hh" +#include "CheckMinPulseWidths.hh" +#include "CheckMinPeriods.hh" +#include "CheckMaxSkews.hh" +#include "ClkSkew.hh" +#include "FindRegister.hh" +#include "ReportPath.hh" +#include "VisitPathGroupVertices.hh" +#include "Genclks.hh" +#include "Power.hh" namespace sta { diff --git a/search/StaState.cc b/search/StaState.cc index ed2d0f32..fcc87f8d 100644 --- a/search/StaState.cc +++ b/search/StaState.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/StaState.hh" +#include "StaState.hh" #include -#include "util/DispatchQueue.hh" -#include "liberty/Units.hh" -#include "network/Network.hh" +#include "DispatchQueue.hh" +#include "Units.hh" +#include "Network.hh" namespace sta { diff --git a/search/Tag.cc b/search/Tag.cc index 02a2f6e6..65ed862c 100644 --- a/search/Tag.cc +++ b/search/Tag.cc @@ -14,19 +14,19 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/Tag.hh" +#include "Tag.hh" -#include "util/Report.hh" -#include "network/Network.hh" -#include "sdc/Clock.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/PathAnalysisPt.hh" -#include "search/ClkInfo.hh" +#include "Report.hh" +#include "Network.hh" +#include "Clock.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "Corner.hh" +#include "Search.hh" +#include "PathAnalysisPt.hh" +#include "ClkInfo.hh" namespace sta { diff --git a/search/Tag.hh b/search/Tag.hh index c7904e9d..b350cb3c 100644 --- a/search/Tag.hh +++ b/search/Tag.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/Set.hh" -#include "liberty/Transition.hh" -#include "sdc/SdcClass.hh" -#include "search/SearchClass.hh" -#include "search/PathRef.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Set.hh" +#include "Transition.hh" +#include "SdcClass.hh" +#include "SearchClass.hh" +#include "PathRef.hh" namespace sta { diff --git a/search/TagGroup.cc b/search/TagGroup.cc index 68762201..85287b59 100644 --- a/search/TagGroup.cc +++ b/search/TagGroup.cc @@ -14,17 +14,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/TagGroup.hh" +#include "TagGroup.hh" -#include "util/Report.hh" -#include "util/Debug.hh" -#include "graph/Graph.hh" -#include "search/PathAnalysisPt.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/PathVertexRep.hh" +#include "Report.hh" +#include "Debug.hh" +#include "Graph.hh" +#include "PathAnalysisPt.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "Corner.hh" +#include "Search.hh" +#include "PathVertexRep.hh" namespace sta { diff --git a/search/TagGroup.hh b/search/TagGroup.hh index e5b61fa9..c0cffac6 100644 --- a/search/TagGroup.hh +++ b/search/TagGroup.hh @@ -16,15 +16,15 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/Iterator.hh" -#include "util/MinMax.hh" -#include "liberty/Transition.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" -#include "search/Tag.hh" +#include "DisallowCopyAssign.hh" +#include "Vector.hh" +#include "Map.hh" +#include "Iterator.hh" +#include "MinMax.hh" +#include "Transition.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" +#include "Tag.hh" namespace sta { diff --git a/search/VertexVisitor.cc b/search/VertexVisitor.cc index ee2513ae..1de3fa00 100644 --- a/search/VertexVisitor.cc +++ b/search/VertexVisitor.cc @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/VertexVisitor.hh" +#include "VertexVisitor.hh" -#include "util/Error.hh" -#include "graph/Graph.hh" +#include "Error.hh" +#include "Graph.hh" namespace sta { diff --git a/search/VisitPathEnds.cc b/search/VisitPathEnds.cc index a6f27c8c..d3bd3da7 100644 --- a/search/VisitPathEnds.cc +++ b/search/VisitPathEnds.cc @@ -14,23 +14,23 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/VisitPathEnds.hh" +#include "VisitPathEnds.hh" -#include "util/Debug.hh" -#include "liberty/Liberty.hh" -#include "network/Network.hh" -#include "liberty/TimingArc.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/PortDelay.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "search/ClkInfo.hh" -#include "search/Tag.hh" -#include "search/PathVertex.hh" -#include "search/PathAnalysisPt.hh" -#include "search/PathEnd.hh" -#include "search/Search.hh" -#include "search/GatedClk.hh" +#include "Debug.hh" +#include "Liberty.hh" +#include "Network.hh" +#include "TimingArc.hh" +#include "ExceptionPath.hh" +#include "PortDelay.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "ClkInfo.hh" +#include "Tag.hh" +#include "PathVertex.hh" +#include "PathAnalysisPt.hh" +#include "PathEnd.hh" +#include "Search.hh" +#include "GatedClk.hh" namespace sta { diff --git a/search/VisitPathGroupVertices.cc b/search/VisitPathGroupVertices.cc index 36b19a82..7f44695f 100644 --- a/search/VisitPathGroupVertices.cc +++ b/search/VisitPathGroupVertices.cc @@ -14,16 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/VisitPathGroupVertices.hh" +#include "VisitPathGroupVertices.hh" -#include "util/Debug.hh" -#include "graph/Graph.hh" -#include "search/Bfs.hh" -#include "search/Search.hh" -#include "search/PathVertex.hh" -#include "search/PathEnd.hh" -#include "search/Tag.hh" -#include "search/VisitPathEnds.hh" +#include "Debug.hh" +#include "Graph.hh" +#include "Bfs.hh" +#include "Search.hh" +#include "PathVertex.hh" +#include "PathEnd.hh" +#include "Tag.hh" +#include "VisitPathEnds.hh" namespace sta { diff --git a/search/WorstSlack.cc b/search/WorstSlack.cc index bafe9d67..ebb8c6e2 100644 --- a/search/WorstSlack.cc +++ b/search/WorstSlack.cc @@ -14,15 +14,15 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Debug.hh" -#include "util/Report.hh" -#include "util/Mutex.hh" -#include "graph/Graph.hh" -#include "search/Corner.hh" -#include "search/Search.hh" -#include "search/PathAnalysisPt.hh" +#include "Debug.hh" +#include "Report.hh" +#include "Mutex.hh" +#include "Graph.hh" +#include "Corner.hh" +#include "Search.hh" +#include "PathAnalysisPt.hh" -#include "search/WorstSlack.hh" +#include "WorstSlack.hh" namespace sta { diff --git a/search/WorstSlack.hh b/search/WorstSlack.hh index 60c2bc1b..1bb3a87a 100644 --- a/search/WorstSlack.hh +++ b/search/WorstSlack.hh @@ -20,10 +20,10 @@ namespace sta { #include -#include "util/MinMax.hh" -#include "util/Vector.hh" -#include "graph/GraphClass.hh" -#include "search/SearchClass.hh" +#include "MinMax.hh" +#include "Vector.hh" +#include "GraphClass.hh" +#include "SearchClass.hh" class StaState; class WorstSlack; diff --git a/search/WritePathSpice.cc b/search/WritePathSpice.cc index d8e151ed..c07330bd 100644 --- a/search/WritePathSpice.cc +++ b/search/WritePathSpice.cc @@ -14,34 +14,34 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "search/WritePathSpice.hh" +#include "WritePathSpice.hh" #include #include #include -#include "util/Debug.hh" -#include "util/Error.hh" -#include "util/Report.hh" -#include "util/StringUtil.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/Units.hh" -#include "liberty/Sequential.hh" -#include "liberty/TableModel.hh" -#include "liberty/Liberty.hh" -#include "liberty/TimingArc.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "graph/Graph.hh" -#include "sdc/Sdc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "parasitics/Parasitics.hh" -#include "search/PathAnalysisPt.hh" -#include "search/Path.hh" -#include "search/PathRef.hh" -#include "search/PathExpanded.hh" -#include "search/StaState.hh" -#include "search/Sim.hh" +#include "Debug.hh" +#include "Error.hh" +#include "Report.hh" +#include "StringUtil.hh" +#include "FuncExpr.hh" +#include "Units.hh" +#include "Sequential.hh" +#include "TableModel.hh" +#include "Liberty.hh" +#include "TimingArc.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Graph.hh" +#include "Sdc.hh" +#include "DcalcAnalysisPt.hh" +#include "Parasitics.hh" +#include "PathAnalysisPt.hh" +#include "Path.hh" +#include "PathRef.hh" +#include "PathExpanded.hh" +#include "StaState.hh" +#include "Sim.hh" namespace sta { diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i index 91fa287f..1e0d6874 100644 --- a/tcl/StaTcl.i +++ b/tcl/StaTcl.i @@ -35,49 +35,50 @@ #include -#include "util/StaConfig.hh" // STA_VERSION -#include "util/Stats.hh" -#include "util/Report.hh" -#include "util/Error.hh" -#include "util/StringUtil.hh" -#include "util/PatternMatch.hh" -#include "util/MinMax.hh" -#include "util/Fuzzy.hh" -#include "liberty/FuncExpr.hh" -#include "liberty/Units.hh" -#include "liberty/Transition.hh" -#include "liberty/TimingRole.hh" -#include "liberty/TimingArc.hh" -#include "liberty/Liberty.hh" -#include "liberty/EquivCells.hh" -#include "liberty/Wireload.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "sdc/Clock.hh" -#include "sdc/PortDelay.hh" -#include "sdc/ExceptionPath.hh" -#include "sdc/Sdc.hh" -#include "graph/Graph.hh" -#include "parasitics/Parasitics.hh" -#include "dcalc/DelayCalc.hh" -#include "dcalc/DcalcAnalysisPt.hh" -#include "search/Corner.hh" +#include "StaConfig.hh" // STA_VERSION +#include "Stats.hh" +#include "Report.hh" +#include "Error.hh" +#include "StringUtil.hh" +#include "PatternMatch.hh" +#include "MinMax.hh" +#include "Fuzzy.hh" +#include "FuncExpr.hh" +#include "Units.hh" +#include "Transition.hh" +#include "TimingRole.hh" +#include "TimingArc.hh" +#include "Liberty.hh" +#include "EquivCells.hh" +#include "Wireload.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "Clock.hh" +#include "PortDelay.hh" +#include "ExceptionPath.hh" +#include "Sdc.hh" +#include "Graph.hh" +#include "Parasitics.hh" +#include "DelayCalc.hh" +#include "DcalcAnalysisPt.hh" +#include "Corner.hh" +#include "PathVertex.hh" +#include "PathRef.hh" +#include "PathExpanded.hh" +#include "PathEnd.hh" +#include "PathGroup.hh" +#include "PathAnalysisPt.hh" +#include "Power.hh" +#include "Property.hh" +#include "WritePathSpice.hh" +#include "Search.hh" +#include "Sta.hh" +#include "util/Machine.hh" #include "search/Tag.hh" -#include "search/PathVertex.hh" -#include "search/PathRef.hh" -#include "search/PathExpanded.hh" -#include "search/PathEnd.hh" -#include "search/PathGroup.hh" #include "search/CheckTiming.hh" #include "search/CheckMinPulseWidths.hh" #include "search/Levelize.hh" -#include "search/PathAnalysisPt.hh" #include "search/ReportPath.hh" -#include "search/Power.hh" -#include "search/Property.hh" -#include "search/WritePathSpice.hh" -#include "search/Search.hh" -#include "search/Sta.hh" namespace sta { diff --git a/util/Debug.cc b/util/Debug.cc index 81c2be21..2d637e34 100644 --- a/util/Debug.cc +++ b/util/Debug.cc @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Debug.hh" +#include "Debug.hh" -#include "util/Report.hh" +#include "Report.hh" namespace sta { diff --git a/util/DispatchQueue.cc b/util/DispatchQueue.cc index 39e9509a..d59fdf18 100644 --- a/util/DispatchQueue.cc +++ b/util/DispatchQueue.cc @@ -3,7 +3,7 @@ // https://github.com/embeddedartistry/embedded-resources/blob/master/examples/cpp/dispatch.cpp // https://embeddedartistry.com/blog/2017/2/1/dispatch-queues?rq=dispatch -#include "util/DispatchQueue.hh" +#include "DispatchQueue.hh" namespace sta { diff --git a/util/Error.cc b/util/Error.cc index 74c8d03e..ed1c16dd 100644 --- a/util/Error.cc +++ b/util/Error.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Error.hh" +#include "Error.hh" #include #include -#include "util/StringUtil.hh" +#include "StringUtil.hh" namespace sta { diff --git a/include/sta/util/FlexPragma.hh b/util/FlexPragma.hh similarity index 100% rename from include/sta/util/FlexPragma.hh rename to util/FlexPragma.hh diff --git a/util/Fuzzy.cc b/util/Fuzzy.cc index 54d6f6e8..b3529d06 100644 --- a/util/Fuzzy.cc +++ b/util/Fuzzy.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Fuzzy.hh" +#include "Fuzzy.hh" #include // max #include // abs -#include "util/MinMax.hh" // INF +#include "MinMax.hh" // INF namespace sta { diff --git a/util/Hash.cc b/util/Hash.cc index b202bb84..4b39456c 100644 --- a/util/Hash.cc +++ b/util/Hash.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Hash.hh" +#include "Hash.hh" #include diff --git a/util/Machine.cc b/util/Machine.cc index f89f0050..33e4390a 100644 --- a/util/Machine.cc +++ b/util/Machine.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Machine.hh" +#include "Machine.hh" #if defined(_WINDOWS) || defined(_WIN32) #include #include // GetSystemInfo -#include "util/StaConfig.hh" +#include "StaConfig.hh" namespace sta { @@ -97,8 +97,8 @@ memoryUsage() #include #include -#include "util/StaConfig.hh" -#include "util/StringUtil.hh" +#include "StaConfig.hh" +#include "StringUtil.hh" namespace sta { diff --git a/util/MinMax.cc b/util/MinMax.cc index fac6157c..c31c3903 100644 --- a/util/MinMax.cc +++ b/util/MinMax.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/MinMax.hh" +#include "MinMax.hh" #include -#include "util/StringUtil.hh" +#include "StringUtil.hh" namespace sta { diff --git a/util/PatternMatch.cc b/util/PatternMatch.cc index 2002cea4..d5e9c4c7 100644 --- a/util/PatternMatch.cc +++ b/util/PatternMatch.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/PatternMatch.hh" +#include "PatternMatch.hh" #include #include #include #include -#include "util/StringUtil.hh" +#include "StringUtil.hh" namespace sta { diff --git a/util/Report.cc b/util/Report.cc index 16fb9aa0..7c1617d5 100644 --- a/util/Report.cc +++ b/util/Report.cc @@ -14,12 +14,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Report.hh" +#include "Report.hh" #include // min -#include "util/Error.hh" -#include "util/Machine.hh" +#include "Error.hh" +#include "Machine.hh" namespace sta { diff --git a/util/ReportStd.cc b/util/ReportStd.cc index 3954f159..0012bfae 100644 --- a/util/ReportStd.cc +++ b/util/ReportStd.cc @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/ReportStd.hh" +#include "ReportStd.hh" #include #include -#include "util/DisallowCopyAssign.hh" -#include "util/Report.hh" +#include "DisallowCopyAssign.hh" +#include "Report.hh" namespace sta { diff --git a/util/ReportTcl.cc b/util/ReportTcl.cc index 466bd652..5c02796d 100644 --- a/util/ReportTcl.cc +++ b/util/ReportTcl.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/ReportTcl.hh" +#include "ReportTcl.hh" #include #include diff --git a/util/Stats.cc b/util/Stats.cc index 41a7de62..5b647f63 100644 --- a/util/Stats.cc +++ b/util/Stats.cc @@ -14,11 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/Stats.hh" +#include "Stats.hh" -#include "util/StringUtil.hh" -#include "util/Debug.hh" -#include "util/Machine.hh" +#include "StringUtil.hh" +#include "Debug.hh" +#include "Machine.hh" namespace sta { diff --git a/util/StringSeq.cc b/util/StringSeq.cc index 76d71dde..ffba2268 100644 --- a/util/StringSeq.cc +++ b/util/StringSeq.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringSeq.hh" +#include "StringSeq.hh" namespace sta { diff --git a/util/StringSet.cc b/util/StringSet.cc index 2d0cc52a..ecacba9a 100644 --- a/util/StringSet.cc +++ b/util/StringSet.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringSet.hh" +#include "StringSet.hh" namespace sta { diff --git a/util/StringUtil.cc b/util/StringUtil.cc index 1d3cbd38..151b9a08 100644 --- a/util/StringUtil.cc +++ b/util/StringUtil.cc @@ -14,14 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/StringUtil.hh" +#include "StringUtil.hh" #include #include #include -#include "util/Mutex.hh" -#include "util/Machine.hh" +#include "Mutex.hh" +#include "Machine.hh" namespace sta { diff --git a/util/TokenParser.cc b/util/TokenParser.cc index 4bf06d78..df7ca666 100644 --- a/util/TokenParser.cc +++ b/util/TokenParser.cc @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "util/TokenParser.hh" +#include "TokenParser.hh" #include #include diff --git a/verilog/Verilog.i b/verilog/Verilog.i index 1f0347fc..b34f6c3e 100644 --- a/verilog/Verilog.i +++ b/verilog/Verilog.i @@ -20,7 +20,7 @@ #include "verilog/VerilogReader.hh" #include "verilog/VerilogWriter.hh" -#include "search/Sta.hh" +#include "Sta.hh" using sta::Sta; using sta::NetworkReader; diff --git a/verilog/VerilogLex.ll b/verilog/VerilogLex.ll index 87f455a6..e464295b 100644 --- a/verilog/VerilogLex.ll +++ b/verilog/VerilogLex.ll @@ -17,8 +17,8 @@ // along with this program. If not, see . #include "util/FlexPragma.hh" -#include "util/Debug.hh" -#include "network/VerilogNamespace.hh" +#include "Debug.hh" +#include "VerilogNamespace.hh" #include "verilog/VerilogReaderPvt.hh" #include "VerilogParse.hh" diff --git a/verilog/VerilogParse.yy b/verilog/VerilogParse.yy index 8e30ac97..471349f9 100644 --- a/verilog/VerilogParse.yy +++ b/verilog/VerilogParse.yy @@ -18,7 +18,7 @@ #include -#include "network/PortDirection.hh" +#include "PortDirection.hh" #include "verilog/VerilogReaderPvt.hh" #include "verilog/VerilogReader.hh" diff --git a/verilog/VerilogReader.cc b/verilog/VerilogReader.cc index 1ff1c829..867a4343 100644 --- a/verilog/VerilogReader.cc +++ b/verilog/VerilogReader.cc @@ -18,15 +18,15 @@ #include -#include "util/DisallowCopyAssign.hh" -#include "util/Debug.hh" -#include "util/Report.hh" -#include "util/Error.hh" -#include "util/Stats.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "network/VerilogNamespace.hh" +#include "DisallowCopyAssign.hh" +#include "Debug.hh" +#include "Report.hh" +#include "Error.hh" +#include "Stats.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "VerilogNamespace.hh" #include "verilog/VerilogReaderPvt.hh" extern int diff --git a/verilog/VerilogReaderPvt.hh b/verilog/VerilogReaderPvt.hh index 7856b95f..33f83b69 100644 --- a/verilog/VerilogReaderPvt.hh +++ b/verilog/VerilogReaderPvt.hh @@ -16,13 +16,13 @@ #pragma once -#include "util/DisallowCopyAssign.hh" -#include "util/Zlib.hh" -#include "util/Vector.hh" -#include "util/Map.hh" -#include "util/StringSeq.hh" -#include "util/StringSet.hh" -#include "network/NetworkClass.hh" +#include "DisallowCopyAssign.hh" +#include "Zlib.hh" +#include "Vector.hh" +#include "Map.hh" +#include "StringSeq.hh" +#include "StringSet.hh" +#include "NetworkClass.hh" // Global namespace. #define YY_INPUT(buf,result,max_size) \ diff --git a/verilog/VerilogWriter.cc b/verilog/VerilogWriter.cc index a0fbe61a..f70acdb6 100644 --- a/verilog/VerilogWriter.cc +++ b/verilog/VerilogWriter.cc @@ -18,12 +18,12 @@ #include -#include "util/Error.hh" -#include "liberty/Liberty.hh" -#include "network/PortDirection.hh" -#include "network/Network.hh" -#include "network/NetworkCmp.hh" -#include "network/VerilogNamespace.hh" +#include "Error.hh" +#include "Liberty.hh" +#include "PortDirection.hh" +#include "Network.hh" +#include "NetworkCmp.hh" +#include "VerilogNamespace.hh" namespace sta {