diff --git a/.gitignore b/.gitignore index b69228f4..93c46a79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,26 @@ -*.o -*.a -*.lo -*.la -*.gcov -*.gcda -*.gcno *.rej *.orig TAGS *~ \#*# .#* -.~lock.*# +.~lock.*\.*# .DS_Store Makefile +gmon.out -/build -/pvt +build +pvt -# /util/ -/util/StaConfig.hh +util/StaConfig.hh -# /app/ -/app/sta -/app/sta.exe -/app/sta.dSYM +app/sta +app/libOpenSTA.* +app/sta.exe +app/sta.dSYM -# /doc/ -/doc/._Sta.docx -/doc/.~lock.Sta.doc# -/doc/.~lock.Sta.odt# +doc/._Sta.docx -# /tcl/ -/tcl/history.tcl -/tcl/init.tcl - -# /test/ -/test/gmon.out -/test/results +test/results # ngspice turd -/test/b3v3_1check.log - -/test_native +test/b3v3_1check.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 05d4f612..39af48af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,198 +208,189 @@ set(STA_SOURCE verilog/VerilogWriter.cc ) -set(STA_HEADERS - include/sta/Sta.hh - - app/StaMain.hh - - dcalc/ArcDelayCalc.hh +set(STA_PVT_HEADERS dcalc/Arnoldi.hh dcalc/ArnoldiDelayCalc.hh dcalc/ArnoldiReduce.hh - dcalc/DelayCalc.hh - dcalc/DcalcAnalysisPt.hh dcalc/DmpCeff.hh dcalc/DmpDelayCalc.hh - dcalc/GraphDelayCalc.hh dcalc/GraphDelayCalc1.hh dcalc/LumpedCapDelayCalc.hh dcalc/NetCaps.hh dcalc/RCDelayCalc.hh dcalc/SimpleRCDelayCalc.hh dcalc/UnitDelayCalc.hh - - graph/Delay.hh - graph/DelayFloat.hh - graph/DelayNormal1.hh - graph/DelayNormal2.hh - graph/Graph.hh - graph/GraphClass.hh - graph/GraphCmp.hh - graph/VertexId.hh - - liberty/EquivCells.hh - liberty/FuncExpr.hh - liberty/InternalPower.hh - liberty/LeakagePower.hh - liberty/Liberty.hh + liberty/LibertyBuilder.hh - liberty/LibertyClass.hh liberty/LibertyExpr.hh liberty/LibertyParser.hh liberty/LibertyReader.hh liberty/LibertyReaderPvt.hh - liberty/LinearModel.hh - liberty/Sequential.hh - liberty/TableModel.hh - liberty/TimingArc.hh - liberty/TimingModel.hh - liberty/TimingRole.hh - liberty/Transition.hh - liberty/Units.hh - liberty/Wireload.hh - - network/ConcreteLibrary.hh - network/ConcreteNetwork.hh - network/HpinDrvrLoad.hh - network/MakeConcreteNetwork.hh - network/Network.hh - network/NetworkClass.hh - network/NetworkCmp.hh - network/ParseBus.hh - network/PortDirection.hh - network/SdcNetwork.hh - network/VerilogNamespace.hh - + parasitics/ConcreteParasitics.hh parasitics/ConcreteParasiticsPvt.hh parasitics/EstimateParasitics.hh - parasitics/MakeConcreteParasitics.hh - parasitics/NullParasitics.hh - parasitics/Parasitics.hh - parasitics/ParasiticsClass.hh parasitics/ReduceParasitics.hh parasitics/SpefNamespace.hh parasitics/SpefReader.hh - - sdc/Clock.hh - sdc/ClockGatingCheck.hh - sdc/ClockGroups.hh - sdc/ClockInsertion.hh - sdc/ClockLatency.hh - sdc/CycleAccting.hh - sdc/DataCheck.hh - sdc/DeratingFactors.hh - sdc/DisabledPorts.hh - sdc/ExceptionPath.hh - sdc/InputDrive.hh - sdc/MinMaxValues.hh - sdc/PinPair.hh - sdc/PortDelay.hh - sdc/PortExtCap.hh - sdc/RiseFallMinMax.hh - sdc/RiseFallValues.hh - sdc/Sdc.hh - sdc/SdcClass.hh - sdc/SdcCmdComment.hh - sdc/WriteSdc.hh - sdc/WriteSdcPvt.hh - + sdf/ReportAnnotation.hh sdf/Sdf.hh sdf/SdfReader.hh sdf/SdfWriter.hh - search/Bfs.hh search/CheckMaxSkews.hh search/CheckMinPeriods.hh search/CheckMinPulseWidths.hh search/CheckSlewLimits.hh search/CheckTiming.hh - search/ClkInfo.hh search/ClkSkew.hh - search/Corner.hh search/Crpr.hh search/FindRegister.hh search/GatedClk.hh search/Genclks.hh search/Latches.hh search/Levelize.hh - search/Path.hh - search/PathAnalysisPt.hh - search/PathEnd.hh - search/PathEnum.hh search/PathEnumed.hh - search/PathExpanded.hh - search/PathRef.hh - search/PathGroup.hh + search/PathEnum.hh search/PathVertex.hh search/PathVertexRep.hh - search/Power.hh - search/Property.hh + search/PathRef.hh search/ReportPath.hh - search/Search.hh - search/SearchClass.hh - search/SearchPred.hh search/Sim.hh search/StaState.hh search/Tag.hh search/TagGroup.hh - search/VertexVisitor.hh - search/VisitPathEnds.hh search/VisitPathGroupVertices.hh search/WorstSlack.hh - search/WritePathSpice.hh - - util/ArrayTable.hh - util/Debug.hh - util/DispatchQueue.hh - util/DisallowCopyAssign.hh - util/EnumNameMap.hh - util/Error.hh - util/Fuzzy.hh - util/Hash.hh - util/HashSet.hh - util/Iterator.hh - util/Machine.hh - util/Map.hh - util/MinMax.hh - util/Mutex.hh - util/ObjectId.hh - util/ObjectTable.hh - util/PatternMatch.hh - util/Report.hh - util/ReportStd.hh - util/ReportTcl.hh - util/Set.hh + util/StaConfig.hh - util/Stats.hh - util/StringSeq.hh - util/StringSet.hh - util/StringUtil.hh - util/TokenParser.hh - util/UnorderedMap.hh - util/UnorderedSet.hh - util/Vector.hh - util/Zlib.hh - + util/Machine.hh + verilog/VerilogReaderPvt.hh verilog/VerilogReader.hh verilog/VerilogWriter.hh ) -set(STA_INCLUDE_DIRS - app - dcalc - graph - liberty - network - parasitics - sdc - sdf - search - util - verilog +set(STA_PUBLIC_HEADERS + include/sta/app/StaMain.hh + + include/sta/dcalc/ArcDelayCalc.hh + include/sta/dcalc/DelayCalc.hh + include/sta/dcalc/GraphDelayCalc.hh + include/sta/dcalc/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/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/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/parasitics/MakeConcreteParasitics.hh + include/sta/parasitics/NullParasitics.hh + include/sta/parasitics/Parasitics.hh + include/sta/parasitics/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/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/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 ) # Source files. @@ -509,6 +500,7 @@ set_property(SOURCE ${STA_SWIG_FILE} ${STA_HOME}/tcl/NetworkEdit.i ${STA_HOME}/sdf/Sdf.i ${STA_HOME}/parasitics/Parasitics.i + ${STA_HOME}/dcalc/DelayCalc.i ) swig_add_library(sta_swig @@ -522,6 +514,15 @@ swig_link_libraries(sta_swig OpenSTA ) +target_include_directories(sta_swig + PUBLIC + include/sta + + PRIVATE + ${STA_HOME} + ${STA_INCLUDE_DIRS} +) + ################################################################ set(STA_TCL_INIT ${CMAKE_CURRENT_BINARY_DIR}/StaTclInitVar.cc) @@ -636,11 +637,10 @@ add_library(OpenSTA target_include_directories(OpenSTA PUBLIC - include + include/sta + ${STA_HOME} PRIVATE - ${STA_HOME} - ${STA_INCLUDE_DIRS} ${CUDD_INCLUDE} ${TCL_INCLUDE_PATH} ) @@ -701,11 +701,11 @@ install(TARGETS sta DESTINATION bin) install(TARGETS OpenSTA DESTINATION lib) # include -install(FILES ${STA_HEADERS} DESTINATION include/opensta) +install(FILES ${STA_PUBLIC_HEADERS} DESTINATION include/sta) ################################################################ -add_custom_target(tags etags -o TAGS ${STA_SOURCE} ${STA_HEADERS} ${STA_TCL_FILES} ${SWIG_TCL_FILES} +add_custom_target(tags etags -o TAGS ${STA_SOURCE} ${STA_PUBLIC_HEADERS} ${STA_PVT_HEADERS} ${SWIG_TCL_FILES} WORKING_DIRECTORY ${STA_HOME} - DEPENDS ${STA_SOURCE} ${STA_HEADERS} ${STA_TCL_FILES} ${SWIG_TCL_FILES} + DEPENDS ${STA_SOURCE} ${STA_PUBLIC_HEADERS} ${STA_PVT_HEADERS} ${STA_TCL_FILES} ${SWIG_TCL_FILES} ) diff --git a/README.md b/README.md index 1a2bc8b7..06e2a5b0 100644 --- a/README.md +++ b/README.md @@ -147,12 +147,6 @@ To install in a different directory with CMake use: cmake .. -DCMAKE_INSTALL_PREFIX= ``` -Alternatively, you can use the `DESTDIR` variable with make. - -``` -make DESTDIR= install -``` - If you make changes to `CMakeLists.txt` you may need to clean out existing CMake cached variable values by deleting all of the files in the build directory. diff --git a/app/Main.cc b/app/Main.cc index a57a113e..aefb7c71 100644 --- a/app/Main.cc +++ b/app/Main.cc @@ -14,13 +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 #include -#include "Machine.hh" -#include "StaConfig.hh" // STA_VERSION -#include "StringUtil.hh" -#include "Sta.hh" -#include "StaMain.hh" + +#include "util/StaConfig.hh" // STA_VERSION +#include "util/StringUtil.hh" +#include "search/Sta.hh" namespace sta { diff --git a/app/StaMain.cc b/app/StaMain.cc index 90056d60..d6d2bff3 100644 --- a/app/StaMain.cc +++ b/app/StaMain.cc @@ -14,13 +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 #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "Vector.hh" -#include "Sta.hh" -#include "StaMain.hh" + +#include "util/StringUtil.hh" +#include "util/Vector.hh" +#include "search/Sta.hh" namespace sta { diff --git a/dcalc/ArcDelayCalc.cc b/dcalc/ArcDelayCalc.cc index bbe82f42..575698e7 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 "Machine.hh" -#include "TimingModel.hh" -#include "TimingArc.hh" -#include "GraphDelayCalc.hh" -#include "ArcDelayCalc.hh" +#include "dcalc/ArcDelayCalc.hh" + +#include "liberty/TimingModel.hh" +#include "liberty/TimingArc.hh" +#include "dcalc/GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/Arnoldi.hh b/dcalc/Arnoldi.hh index 9299c913..4f52eafb 100644 --- a/dcalc/Arnoldi.hh +++ b/dcalc/Arnoldi.hh @@ -20,7 +20,7 @@ #pragma once -#include "ConcreteParasiticsPvt.hh" +#include "parasitics/ConcreteParasiticsPvt.hh" namespace sta { diff --git a/dcalc/ArnoldiDelayCalc.cc b/dcalc/ArnoldiDelayCalc.cc index edf5d3a7..75cd4df6 100644 --- a/dcalc/ArnoldiDelayCalc.cc +++ b/dcalc/ArnoldiDelayCalc.cc @@ -18,28 +18,29 @@ // // Author: W. Scott +#include "ArnoldiDelayCalc.hh" + #include #include // abs -#include "Machine.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" -#include "ArnoldiDelayCalc.hh" + +#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" namespace sta { diff --git a/dcalc/ArnoldiDelayCalc.hh b/dcalc/ArnoldiDelayCalc.hh index 6acd90c7..5ed4d0a1 100644 --- a/dcalc/ArnoldiDelayCalc.hh +++ b/dcalc/ArnoldiDelayCalc.hh @@ -18,6 +18,9 @@ namespace sta { +class ArcDelayCalc; +class StaState; + ArcDelayCalc * makeArnoldiDelayCalc(StaState *sta); diff --git a/dcalc/ArnoldiReduce.cc b/dcalc/ArnoldiReduce.cc index 1ac6411a..37f30904 100644 --- a/dcalc/ArnoldiReduce.cc +++ b/dcalc/ArnoldiReduce.cc @@ -18,19 +18,20 @@ // // Author: W. Scott +#include "ArnoldiReduce.hh" + #include #include #include #include -#include "Machine.hh" -#include "Debug.hh" -#include "Units.hh" -#include "MinMax.hh" -#include "Sdc.hh" -#include "Network.hh" -#include "ArnoldiReduce.hh" -#include "Arnoldi.hh" -#include "ConcreteParasiticsPvt.hh" + +#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 "parasitics/ConcreteParasiticsPvt.hh" namespace sta { diff --git a/dcalc/ArnoldiReduce.hh b/dcalc/ArnoldiReduce.hh index a0f0647a..1a41ff9d 100644 --- a/dcalc/ArnoldiReduce.hh +++ b/dcalc/ArnoldiReduce.hh @@ -20,14 +20,18 @@ #pragma once -#include "Map.hh" -#include "NetworkClass.hh" -#include "ParasiticsClass.hh" +#include "util/Map.hh" +#include "liberty/Transition.hh" +#include "network/NetworkClass.hh" +#include "parasitics/ParasiticsClass.hh" +#include "sdc/SdcClass.hh" +#include "search/StaState.hh" namespace sta { class ConcreteParasiticNetwork; class ConcreteParasiticNode; +class Corner; class rcmodel; struct ts_edge; diff --git a/dcalc/DcalcAnalysisPt.cc b/dcalc/DcalcAnalysisPt.cc index 5cdc6ba3..007a2fec 100644 --- a/dcalc/DcalcAnalysisPt.cc +++ b/dcalc/DcalcAnalysisPt.cc @@ -14,10 +14,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringUtil.hh" -#include "Corner.hh" -#include "DcalcAnalysisPt.hh" +#include "util/StringUtil.hh" +#include "dcalc/DcalcAnalysisPt.hh" +#include "search/Corner.hh" namespace sta { diff --git a/dcalc/DelayCalc.cc b/dcalc/DelayCalc.cc index c54ec91a..8f1c3b94 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 "Machine.hh" -#include "Map.hh" -#include "StringUtil.hh" -#include "UnitDelayCalc.hh" -#include "LumpedCapDelayCalc.hh" -#include "SimpleRCDelayCalc.hh" -#include "DmpDelayCalc.hh" -#include "ArnoldiDelayCalc.hh" -#include "DelayCalc.hh" +#include "dcalc/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" namespace sta { diff --git a/dcalc/DelayCalc.i b/dcalc/DelayCalc.i index c85f2d95..99c65bd5 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 "Sta.hh" +#include "search/Sta.hh" %} diff --git a/dcalc/DmpCeff.cc b/dcalc/DmpCeff.cc index 115231b3..25718bd3 100644 --- a/dcalc/DmpCeff.cc +++ b/dcalc/DmpCeff.cc @@ -22,21 +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 // abs, min #include // sqrt -#include "Machine.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" -#include "DmpCeff.hh" + +#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" namespace sta { diff --git a/dcalc/DmpCeff.hh b/dcalc/DmpCeff.hh index eda5d71a..ae94afa3 100644 --- a/dcalc/DmpCeff.hh +++ b/dcalc/DmpCeff.hh @@ -16,8 +16,8 @@ #pragma once -#include "LibertyClass.hh" -#include "RCDelayCalc.hh" +#include "liberty/LibertyClass.hh" +#include "dcalc/RCDelayCalc.hh" namespace sta { @@ -25,6 +25,7 @@ class DmpAlg; class DmpCap; class DmpPi; class DmpZeroC2; +class GateTableModel; // Delay calculator using Dartu/Menezes/Pileggi effective capacitance // algorithm for RSPF loads. diff --git a/dcalc/DmpDelayCalc.cc b/dcalc/DmpDelayCalc.cc index 844a4753..641a3135 100644 --- a/dcalc/DmpDelayCalc.cc +++ b/dcalc/DmpDelayCalc.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 "Machine.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" #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" + namespace sta { // PiElmore parasitic delay calculator using Dartu/Menezes/Pileggi diff --git a/dcalc/DmpDelayCalc.hh b/dcalc/DmpDelayCalc.hh index a95b28d4..33083bde 100644 --- a/dcalc/DmpDelayCalc.hh +++ b/dcalc/DmpDelayCalc.hh @@ -18,6 +18,9 @@ namespace sta { +class ArcDelayCalc; +class StaState; + ArcDelayCalc * makeDmpCeffElmoreDelayCalc(StaState *sta); ArcDelayCalc * diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc index 4f0729d9..53db1c39 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 "Machine.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Graph.hh" -#include "Sdc.hh" -#include "Corner.hh" -#include "GraphDelayCalc.hh" +#include "dcalc/GraphDelayCalc.hh" + +#include "liberty/Liberty.hh" +#include "network/Network.hh" +#include "graph/Graph.hh" +#include "sdc/Sdc.hh" +#include "search/Corner.hh" namespace sta { diff --git a/dcalc/GraphDelayCalc1.cc b/dcalc/GraphDelayCalc1.cc index 9e9a6eeb..a3f6c7bf 100644 --- a/dcalc/GraphDelayCalc1.cc +++ b/dcalc/GraphDelayCalc1.cc @@ -14,28 +14,27 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "Debug.hh" -#include "Stats.hh" -#include "Mutex.hh" -#include "MinMax.hh" -#include "PortDirection.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "InputDrive.hh" -#include "Sdc.hh" -#include "Corner.hh" -#include "Graph.hh" -#include "Levelize.hh" -#include "SearchPred.hh" -#include "Bfs.hh" -#include "Parasitics.hh" -#include "ArcDelayCalc.hh" -#include "DcalcAnalysisPt.hh" -#include "NetCaps.hh" -#include "GraphDelayCalc1.hh" +#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 "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" namespace sta { diff --git a/dcalc/GraphDelayCalc1.hh b/dcalc/GraphDelayCalc1.hh index 44d4c6f3..52bf7dfd 100644 --- a/dcalc/GraphDelayCalc1.hh +++ b/dcalc/GraphDelayCalc1.hh @@ -17,7 +17,8 @@ #pragma once #include -#include "GraphDelayCalc.hh" + +#include "dcalc/GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/LumpedCapDelayCalc.cc b/dcalc/LumpedCapDelayCalc.cc index 133bc2b8..4ba9c764 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 "Machine.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" -#include "LumpedCapDelayCalc.hh" +#include "dcalc/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" namespace sta { diff --git a/dcalc/LumpedCapDelayCalc.hh b/dcalc/LumpedCapDelayCalc.hh index 1ea0f70c..ee6fc806 100644 --- a/dcalc/LumpedCapDelayCalc.hh +++ b/dcalc/LumpedCapDelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "ArcDelayCalc.hh" +#include "dcalc/ArcDelayCalc.hh" namespace sta { diff --git a/dcalc/NetCaps.cc b/dcalc/NetCaps.cc index eb3c5295..b244fb04 100644 --- a/dcalc/NetCaps.cc +++ b/dcalc/NetCaps.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "NetCaps.hh" +#include "dcalc/NetCaps.hh" namespace sta { diff --git a/dcalc/NetCaps.hh b/dcalc/NetCaps.hh index 288a124b..4a2673a0 100644 --- a/dcalc/NetCaps.hh +++ b/dcalc/NetCaps.hh @@ -16,7 +16,7 @@ #pragma once -#include "DisallowCopyAssign.hh" +#include "util/DisallowCopyAssign.hh" namespace sta { diff --git a/dcalc/RCDelayCalc.cc b/dcalc/RCDelayCalc.cc index 9887e940..eac281f8 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 "Machine.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "Parasitics.hh" -#include "GraphDelayCalc.hh" -#include "RCDelayCalc.hh" +#include "dcalc/RCDelayCalc.hh" + +#include "liberty/Liberty.hh" +#include "network/Network.hh" +#include "sdc/Sdc.hh" +#include "parasitics/Parasitics.hh" +#include "dcalc/GraphDelayCalc.hh" namespace sta { diff --git a/dcalc/SimpleRCDelayCalc.cc b/dcalc/SimpleRCDelayCalc.cc index 9bf4718d..3dbd7079 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 "Machine.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "Parasitics.hh" -#include "DcalcAnalysisPt.hh" -#include "SimpleRCDelayCalc.hh" +#include "dcalc/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" namespace sta { diff --git a/dcalc/UnitDelayCalc.cc b/dcalc/UnitDelayCalc.cc index be3588f9..b97b81a8 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 "Machine.hh" -#include "Units.hh" -#include "UnitDelayCalc.hh" +#include "dcalc/UnitDelayCalc.hh" + +#include "liberty/Units.hh" namespace sta { diff --git a/dcalc/UnitDelayCalc.hh b/dcalc/UnitDelayCalc.hh index 446ea1bd..bf12ac58 100644 --- a/dcalc/UnitDelayCalc.hh +++ b/dcalc/UnitDelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "ArcDelayCalc.hh" +#include "dcalc/ArcDelayCalc.hh" namespace sta { diff --git a/graph/DelayFloat.cc b/graph/DelayFloat.cc index f10b655e..dae4ac94 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 "StaConfig.hh" -#include "Machine.hh" -#include "Fuzzy.hh" -#include "Units.hh" -#include "StaState.hh" -#include "Delay.hh" +#include "graph/Delay.hh" + +#include "util/StaConfig.hh" +#include "util/Fuzzy.hh" +#include "liberty/Units.hh" +#include "search/StaState.hh" // Non-SSTA compilation. #if !SSTA diff --git a/graph/DelayNormal1.cc b/graph/DelayNormal1.cc index 81a0f48c..0dded0b8 100644 --- a/graph/DelayNormal1.cc +++ b/graph/DelayNormal1.cc @@ -14,15 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "StaConfig.hh" +#include "graph/Delay.hh" + #include // sqrt -#include "Machine.hh" -#include "Error.hh" -#include "StringUtil.hh" -#include "Fuzzy.hh" -#include "Units.hh" -#include "StaState.hh" -#include "Delay.hh" + +#include "util/StaConfig.hh" +#include "util/Error.hh" +#include "util/StringUtil.hh" +#include "util/Fuzzy.hh" +#include "liberty/Units.hh" +#include "search/StaState.hh" // SSTA compilation. #if (SSTA == 1) diff --git a/graph/DelayNormal2.cc b/graph/DelayNormal2.cc index e660bf81..ca3bed6f 100644 --- a/graph/DelayNormal2.cc +++ b/graph/DelayNormal2.cc @@ -14,15 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "StaConfig.hh" +#include "graph/Delay.hh" + #include // sqrt -#include "Machine.hh" -#include "Error.hh" -#include "StringUtil.hh" -#include "Fuzzy.hh" -#include "Units.hh" -#include "StaState.hh" -#include "Delay.hh" + +#include "util/StaConfig.hh" +#include "util/Error.hh" +#include "util/StringUtil.hh" +#include "util/Fuzzy.hh" +#include "liberty/Units.hh" +#include "search/StaState.hh" // SSTA compilation. #if (SSTA == 2) diff --git a/graph/Graph.cc b/graph/Graph.cc index ca9bdecd..6164e8e1 100644 --- a/graph/Graph.cc +++ b/graph/Graph.cc @@ -14,20 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Stats.hh" -#include "Error.hh" -#include "Debug.hh" -#include "MinMax.hh" -#include "PortDirection.hh" -#include "Transition.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "DcalcAnalysisPt.hh" -#include "Graph.hh" +#include "graph/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" namespace sta { diff --git a/graph/GraphCmp.cc b/graph/GraphCmp.cc index b779ceb9..170201ae 100644 --- a/graph/GraphCmp.cc +++ b/graph/GraphCmp.cc @@ -14,12 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringUtil.hh" -#include "Network.hh" -#include "NetworkCmp.hh" -#include "Graph.hh" -#include "GraphCmp.hh" +#include "util/StringUtil.hh" +#include "network/Network.hh" +#include "network/NetworkCmp.hh" +#include "graph/Graph.hh" +#include "graph/GraphCmp.hh" namespace sta { diff --git a/app/StaMain.hh b/include/sta/app/StaMain.hh similarity index 100% rename from app/StaMain.hh rename to include/sta/app/StaMain.hh diff --git a/dcalc/ArcDelayCalc.hh b/include/sta/dcalc/ArcDelayCalc.hh similarity index 95% rename from dcalc/ArcDelayCalc.hh rename to include/sta/dcalc/ArcDelayCalc.hh index cd3b0007..bd77f776 100644 --- a/dcalc/ArcDelayCalc.hh +++ b/include/sta/dcalc/ArcDelayCalc.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "Delay.hh" -#include "StaState.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "graph/Delay.hh" +#include "search/StaState.hh" namespace sta { diff --git a/dcalc/DcalcAnalysisPt.hh b/include/sta/dcalc/DcalcAnalysisPt.hh similarity index 90% rename from dcalc/DcalcAnalysisPt.hh rename to include/sta/dcalc/DcalcAnalysisPt.hh index 57c5cabd..5d42ec52 100644 --- a/dcalc/DcalcAnalysisPt.hh +++ b/include/sta/dcalc/DcalcAnalysisPt.hh @@ -16,14 +16,14 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "MinMax.hh" -#include "LibertyClass.hh" -#include "SdcClass.hh" -#include "ParasiticsClass.hh" -#include "GraphClass.hh" -#include "StaState.hh" +#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" namespace sta { diff --git a/dcalc/DelayCalc.hh b/include/sta/dcalc/DelayCalc.hh similarity index 97% rename from dcalc/DelayCalc.hh rename to include/sta/dcalc/DelayCalc.hh index 501a5d75..3c49d9fd 100644 --- a/dcalc/DelayCalc.hh +++ b/include/sta/dcalc/DelayCalc.hh @@ -16,7 +16,7 @@ #pragma once -#include "StringSeq.hh" +#include "util/StringSeq.hh" namespace sta { diff --git a/dcalc/GraphDelayCalc.hh b/include/sta/dcalc/GraphDelayCalc.hh similarity index 97% rename from dcalc/GraphDelayCalc.hh rename to include/sta/dcalc/GraphDelayCalc.hh index c8707431..4ee9e71e 100644 --- a/dcalc/GraphDelayCalc.hh +++ b/include/sta/dcalc/GraphDelayCalc.hh @@ -17,11 +17,10 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "GraphClass.hh" -#include "Delay.hh" -#include "DcalcAnalysisPt.hh" +#include "util/DisallowCopyAssign.hh" +#include "graph/GraphClass.hh" +#include "dcalc/DcalcAnalysisPt.hh" +#include "search/StaState.hh" namespace sta { diff --git a/graph/Delay.hh b/include/sta/graph/Delay.hh similarity index 88% rename from graph/Delay.hh rename to include/sta/graph/Delay.hh index 06ca2929..0039366a 100644 --- a/graph/Delay.hh +++ b/include/sta/graph/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 "StaConfig.hh" +#include "util/StaConfig.hh" #pragma once #if (SSTA == 1) // Delays are Normal PDFs. - #include "DelayNormal1.hh" + #include "graph/DelayNormal1.hh" #elif (SSTA == 2) // Delays are Normal PDFs with early/late sigma. - #include "DelayNormal2.hh" + #include "graph/DelayNormal2.hh" #else // Delays are floats. - #include "DelayFloat.hh" + #include "graph/DelayFloat.hh" #endif namespace sta { diff --git a/graph/DelayFloat.hh b/include/sta/graph/DelayFloat.hh similarity index 97% rename from graph/DelayFloat.hh rename to include/sta/graph/DelayFloat.hh index 896145d3..b86d78a1 100644 --- a/graph/DelayFloat.hh +++ b/include/sta/graph/DelayFloat.hh @@ -16,8 +16,8 @@ #pragma once -#include "MinMax.hh" -#include "Fuzzy.hh" +#include "util/MinMax.hh" +#include "util/Fuzzy.hh" // Delay values defined as floats. diff --git a/graph/DelayNormal1.hh b/include/sta/graph/DelayNormal1.hh similarity index 99% rename from graph/DelayNormal1.hh rename to include/sta/graph/DelayNormal1.hh index 19f20810..f4cb7c07 100644 --- a/graph/DelayNormal1.hh +++ b/include/sta/graph/DelayNormal1.hh @@ -16,7 +16,7 @@ #pragma once -#include "MinMax.hh" +#include "util/MinMax.hh" namespace sta { diff --git a/graph/DelayNormal2.hh b/include/sta/graph/DelayNormal2.hh similarity index 99% rename from graph/DelayNormal2.hh rename to include/sta/graph/DelayNormal2.hh index 73b07419..ec5bfe54 100644 --- a/graph/DelayNormal2.hh +++ b/include/sta/graph/DelayNormal2.hh @@ -16,7 +16,7 @@ #pragma once -#include "MinMax.hh" +#include "util/MinMax.hh" namespace sta { diff --git a/graph/Graph.hh b/include/sta/graph/Graph.hh similarity index 97% rename from graph/Graph.hh rename to include/sta/graph/Graph.hh index 07aea687..b151907e 100644 --- a/graph/Graph.hh +++ b/include/sta/graph/Graph.hh @@ -16,20 +16,21 @@ #pragma once -#include "Mutex.hh" -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "Map.hh" -#include "Vector.hh" -#include "ObjectTable.hh" -#include "ArrayTable.hh" -#include "StaState.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "Delay.hh" -#include "GraphClass.hh" -#include "VertexId.hh" -#include "PathVertexRep.hh" +#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" namespace sta { diff --git a/graph/GraphClass.hh b/include/sta/graph/GraphClass.hh similarity index 92% rename from graph/GraphClass.hh rename to include/sta/graph/GraphClass.hh index d7654415..a133a771 100644 --- a/graph/GraphClass.hh +++ b/include/sta/graph/GraphClass.hh @@ -16,11 +16,11 @@ #pragma once -#include "ObjectId.hh" -#include "Set.hh" -#include "Vector.hh" -#include "MinMax.hh" -#include "Transition.hh" +#include "util/ObjectId.hh" +#include "util/Set.hh" +#include "util/Vector.hh" +#include "util/MinMax.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/graph/GraphCmp.hh b/include/sta/graph/GraphCmp.hh similarity index 92% rename from graph/GraphCmp.hh rename to include/sta/graph/GraphCmp.hh index a21618a8..028a1bfb 100644 --- a/graph/GraphCmp.hh +++ b/include/sta/graph/GraphCmp.hh @@ -16,9 +16,9 @@ #pragma once -#include "NetworkClass.hh" -#include "NetworkCmp.hh" -#include "GraphClass.hh" +#include "network/NetworkClass.hh" +#include "network/NetworkCmp.hh" +#include "graph/GraphClass.hh" namespace sta { diff --git a/graph/VertexId.hh b/include/sta/graph/VertexId.hh similarity index 94% rename from graph/VertexId.hh rename to include/sta/graph/VertexId.hh index 9f1d3b48..c367c6f0 100644 --- a/graph/VertexId.hh +++ b/include/sta/graph/VertexId.hh @@ -9,7 +9,7 @@ #ifndef STA_VERTEX_ID_H #define STA_VERTEX_ID_H -#include "ObjectId.hh" +#include "util/ObjectId.hh" // VertexId typedef for Networks to get/set on pins. diff --git a/liberty/EquivCells.hh b/include/sta/liberty/EquivCells.hh similarity index 95% rename from liberty/EquivCells.hh rename to include/sta/liberty/EquivCells.hh index ec66da38..2c13f4a0 100644 --- a/liberty/EquivCells.hh +++ b/include/sta/liberty/EquivCells.hh @@ -16,10 +16,10 @@ #pragma once -#include "Vector.hh" -#include "Map.hh" -#include "UnorderedMap.hh" -#include "LibertyClass.hh" +#include "util/Vector.hh" +#include "util/Map.hh" +#include "util/UnorderedMap.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/liberty/FuncExpr.hh b/include/sta/liberty/FuncExpr.hh similarity index 95% rename from liberty/FuncExpr.hh rename to include/sta/liberty/FuncExpr.hh index 113bd72f..a03a9261 100644 --- a/liberty/FuncExpr.hh +++ b/include/sta/liberty/FuncExpr.hh @@ -16,10 +16,10 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Set.hh" -#include "NetworkClass.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Set.hh" +#include "network/NetworkClass.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/liberty/InternalPower.hh b/include/sta/liberty/InternalPower.hh similarity index 96% rename from liberty/InternalPower.hh rename to include/sta/liberty/InternalPower.hh index 26729e29..312fcffa 100644 --- a/liberty/InternalPower.hh +++ b/include/sta/liberty/InternalPower.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Transition.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/LibertyClass.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/liberty/LeakagePower.hh b/include/sta/liberty/LeakagePower.hh similarity index 95% rename from liberty/LeakagePower.hh rename to include/sta/liberty/LeakagePower.hh index 9f362150..231303c9 100644 --- a/liberty/LeakagePower.hh +++ b/include/sta/liberty/LeakagePower.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/liberty/Liberty.hh b/include/sta/liberty/Liberty.hh similarity index 99% rename from liberty/Liberty.hh rename to include/sta/liberty/Liberty.hh index a64ad727..1e8b1902 100644 --- a/liberty/Liberty.hh +++ b/include/sta/liberty/Liberty.hh @@ -16,14 +16,14 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Transition.hh" -#include "MinMax.hh" -#include "MinMaxValues.hh" -#include "RiseFallValues.hh" -#include "RiseFallMinMax.hh" -#include "ConcreteLibrary.hh" -#include "LibertyClass.hh" +#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" namespace sta { diff --git a/liberty/LibertyClass.hh b/include/sta/liberty/LibertyClass.hh similarity index 98% rename from liberty/LibertyClass.hh rename to include/sta/liberty/LibertyClass.hh index d8e7580b..3feee2cc 100644 --- a/liberty/LibertyClass.hh +++ b/include/sta/liberty/LibertyClass.hh @@ -16,9 +16,9 @@ #pragma once -#include "Vector.hh" -#include "Map.hh" -#include "Set.hh" +#include "util/Vector.hh" +#include "util/Map.hh" +#include "util/Set.hh" namespace sta { diff --git a/liberty/LinearModel.hh b/include/sta/liberty/LinearModel.hh similarity index 97% rename from liberty/LinearModel.hh rename to include/sta/liberty/LinearModel.hh index 505da764..20a21b17 100644 --- a/liberty/LinearModel.hh +++ b/include/sta/liberty/LinearModel.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "TimingModel.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/TimingModel.hh" namespace sta { diff --git a/liberty/Sequential.hh b/include/sta/liberty/Sequential.hh similarity index 95% rename from liberty/Sequential.hh rename to include/sta/liberty/Sequential.hh index 8b00c7ee..df928d9e 100644 --- a/liberty/Sequential.hh +++ b/include/sta/liberty/Sequential.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/liberty/TableModel.hh b/include/sta/liberty/TableModel.hh similarity index 98% rename from liberty/TableModel.hh rename to include/sta/liberty/TableModel.hh index 12f88caf..fc4b156d 100644 --- a/liberty/TableModel.hh +++ b/include/sta/liberty/TableModel.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "Vector.hh" -#include "Transition.hh" -#include "LibertyClass.hh" -#include "TimingModel.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "util/Vector.hh" +#include "liberty/Transition.hh" +#include "liberty/LibertyClass.hh" +#include "liberty/TimingModel.hh" namespace sta { diff --git a/liberty/TimingArc.hh b/include/sta/liberty/TimingArc.hh similarity index 98% rename from liberty/TimingArc.hh rename to include/sta/liberty/TimingArc.hh index ce1a2fc9..daa51956 100644 --- a/liberty/TimingArc.hh +++ b/include/sta/liberty/TimingArc.hh @@ -16,10 +16,10 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Transition.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "liberty/Transition.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/liberty/TimingModel.hh b/include/sta/liberty/TimingModel.hh similarity index 97% rename from liberty/TimingModel.hh rename to include/sta/liberty/TimingModel.hh index 51dcca41..c12f4023 100644 --- a/liberty/TimingModel.hh +++ b/include/sta/liberty/TimingModel.hh @@ -17,8 +17,8 @@ #pragma once #include -#include "Delay.hh" -#include "LibertyClass.hh" +#include "graph/Delay.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/liberty/TimingRole.hh b/include/sta/liberty/TimingRole.hh similarity index 97% rename from liberty/TimingRole.hh rename to include/sta/liberty/TimingRole.hh index 720c51c1..ee199667 100644 --- a/liberty/TimingRole.hh +++ b/include/sta/liberty/TimingRole.hh @@ -16,10 +16,10 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "Map.hh" -#include "StringUtil.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "util/Map.hh" +#include "util/StringUtil.hh" namespace sta { diff --git a/liberty/Transition.hh b/include/sta/liberty/Transition.hh similarity index 98% rename from liberty/Transition.hh rename to include/sta/liberty/Transition.hh index 2ea093ab..7273318c 100644 --- a/liberty/Transition.hh +++ b/include/sta/liberty/Transition.hh @@ -18,10 +18,10 @@ #include #include -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "Map.hh" -#include "StringUtil.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Iterator.hh" +#include "util/Map.hh" +#include "util/StringUtil.hh" namespace sta { diff --git a/liberty/Units.hh b/include/sta/liberty/Units.hh similarity index 100% rename from liberty/Units.hh rename to include/sta/liberty/Units.hh diff --git a/liberty/Wireload.hh b/include/sta/liberty/Wireload.hh similarity index 96% rename from liberty/Wireload.hh rename to include/sta/liberty/Wireload.hh index b5a25bf0..a4d1c4f6 100644 --- a/liberty/Wireload.hh +++ b/include/sta/liberty/Wireload.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/network/ConcreteLibrary.hh b/include/sta/network/ConcreteLibrary.hh similarity index 98% rename from network/ConcreteLibrary.hh rename to include/sta/network/ConcreteLibrary.hh index 68a277a7..440bf93e 100644 --- a/network/ConcreteLibrary.hh +++ b/include/sta/network/ConcreteLibrary.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Map.hh" -#include "StringUtil.hh" -#include "NetworkClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "util/Map.hh" +#include "util/StringUtil.hh" +#include "network/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/network/ConcreteNetwork.hh b/include/sta/network/ConcreteNetwork.hh similarity index 98% rename from network/ConcreteNetwork.hh rename to include/sta/network/ConcreteNetwork.hh index 7b418772..8fdeb547 100644 --- a/network/ConcreteNetwork.hh +++ b/include/sta/network/ConcreteNetwork.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Map.hh" -#include "Set.hh" -#include "StringUtil.hh" -#include "Network.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Map.hh" +#include "util/Set.hh" +#include "util/StringUtil.hh" +#include "network/Network.hh" +#include "liberty/LibertyClass.hh" namespace sta { diff --git a/network/HpinDrvrLoad.hh b/include/sta/network/HpinDrvrLoad.hh similarity index 95% rename from network/HpinDrvrLoad.hh rename to include/sta/network/HpinDrvrLoad.hh index 8d3ff877..22dfc05a 100644 --- a/network/HpinDrvrLoad.hh +++ b/include/sta/network/HpinDrvrLoad.hh @@ -16,8 +16,9 @@ #pragma once -#include "Set.hh" -#include "NetworkClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Set.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/network/MakeConcreteNetwork.hh b/include/sta/network/MakeConcreteNetwork.hh similarity index 100% rename from network/MakeConcreteNetwork.hh rename to include/sta/network/MakeConcreteNetwork.hh diff --git a/network/Network.hh b/include/sta/network/Network.hh similarity index 99% rename from network/Network.hh rename to include/sta/network/Network.hh index 35e58138..5af0914f 100644 --- a/network/Network.hh +++ b/include/sta/network/Network.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Map.hh" -#include "StringUtil.hh" -#include "LibertyClass.hh" -#include "VertexId.hh" -#include "NetworkClass.hh" -#include "StaState.hh" +#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" namespace sta { diff --git a/network/NetworkClass.hh b/include/sta/network/NetworkClass.hh similarity index 96% rename from network/NetworkClass.hh rename to include/sta/network/NetworkClass.hh index aa77c906..b4a20a6b 100644 --- a/network/NetworkClass.hh +++ b/include/sta/network/NetworkClass.hh @@ -16,9 +16,9 @@ #pragma once -#include "Set.hh" -#include "Vector.hh" -#include "Iterator.hh" +#include "util/Set.hh" +#include "util/Vector.hh" +#include "util/Iterator.hh" namespace sta { diff --git a/network/NetworkCmp.hh b/include/sta/network/NetworkCmp.hh similarity index 96% rename from network/NetworkCmp.hh rename to include/sta/network/NetworkCmp.hh index cc1b0356..0875ff46 100644 --- a/network/NetworkCmp.hh +++ b/include/sta/network/NetworkCmp.hh @@ -16,8 +16,8 @@ #pragma once -#include "LibertyClass.hh" -#include "NetworkClass.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/network/ParseBus.hh b/include/sta/network/ParseBus.hh similarity index 100% rename from network/ParseBus.hh rename to include/sta/network/ParseBus.hh diff --git a/network/PortDirection.hh b/include/sta/network/PortDirection.hh similarity index 97% rename from network/PortDirection.hh rename to include/sta/network/PortDirection.hh index fe019b4a..a0cc9bb5 100644 --- a/network/PortDirection.hh +++ b/include/sta/network/PortDirection.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/network/SdcNetwork.hh b/include/sta/network/SdcNetwork.hh similarity index 99% rename from network/SdcNetwork.hh rename to include/sta/network/SdcNetwork.hh index 7042a5f4..438029e0 100644 --- a/network/SdcNetwork.hh +++ b/include/sta/network/SdcNetwork.hh @@ -17,8 +17,9 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "Network.hh" + +#include "util/DisallowCopyAssign.hh" +#include "network/Network.hh" namespace sta { diff --git a/network/VerilogNamespace.hh b/include/sta/network/VerilogNamespace.hh similarity index 100% rename from network/VerilogNamespace.hh rename to include/sta/network/VerilogNamespace.hh diff --git a/parasitics/MakeConcreteParasitics.hh b/include/sta/parasitics/MakeConcreteParasitics.hh similarity index 100% rename from parasitics/MakeConcreteParasitics.hh rename to include/sta/parasitics/MakeConcreteParasitics.hh diff --git a/parasitics/NullParasitics.hh b/include/sta/parasitics/NullParasitics.hh similarity index 99% rename from parasitics/NullParasitics.hh rename to include/sta/parasitics/NullParasitics.hh index 7456111f..8648c746 100644 --- a/parasitics/NullParasitics.hh +++ b/include/sta/parasitics/NullParasitics.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Parasitics.hh" +#include "util/DisallowCopyAssign.hh" +#include "parasitics/Parasitics.hh" namespace sta { diff --git a/parasitics/Parasitics.hh b/include/sta/parasitics/Parasitics.hh similarity index 98% rename from parasitics/Parasitics.hh rename to include/sta/parasitics/Parasitics.hh index 4ae0419e..7e195489 100644 --- a/parasitics/Parasitics.hh +++ b/include/sta/parasitics/Parasitics.hh @@ -17,12 +17,12 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" -#include "ParasiticsClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "search/StaState.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" +#include "parasitics/ParasiticsClass.hh" namespace sta { diff --git a/parasitics/ParasiticsClass.hh b/include/sta/parasitics/ParasiticsClass.hh similarity index 100% rename from parasitics/ParasiticsClass.hh rename to include/sta/parasitics/ParasiticsClass.hh diff --git a/sdc/Clock.hh b/include/sta/sdc/Clock.hh similarity index 97% rename from sdc/Clock.hh rename to include/sta/sdc/Clock.hh index d38c65ee..754887a5 100644 --- a/sdc/Clock.hh +++ b/include/sta/sdc/Clock.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" -#include "SdcClass.hh" -#include "SdcCmdComment.hh" -#include "GraphClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "sdc/RiseFallMinMax.hh" +#include "sdc/SdcClass.hh" +#include "sdc/SdcCmdComment.hh" +#include "graph/GraphClass.hh" namespace sta { diff --git a/sdc/ClockGatingCheck.hh b/include/sta/sdc/ClockGatingCheck.hh similarity index 91% rename from sdc/ClockGatingCheck.hh rename to include/sta/sdc/ClockGatingCheck.hh index a049c73b..77c0c527 100644 --- a/sdc/ClockGatingCheck.hh +++ b/include/sta/sdc/ClockGatingCheck.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "SdcClass.hh" -#include "RiseFallMinMax.hh" +#include "util/DisallowCopyAssign.hh" +#include "sdc/SdcClass.hh" +#include "sdc/RiseFallMinMax.hh" namespace sta { diff --git a/sdc/ClockGroups.hh b/include/sta/sdc/ClockGroups.hh similarity index 95% rename from sdc/ClockGroups.hh rename to include/sta/sdc/ClockGroups.hh index ed154b7f..014d564a 100644 --- a/sdc/ClockGroups.hh +++ b/include/sta/sdc/ClockGroups.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "SdcCmdComment.hh" -#include "SdcClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "sdc/SdcCmdComment.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/ClockInsertion.hh b/include/sta/sdc/ClockInsertion.hh similarity index 89% rename from sdc/ClockInsertion.hh rename to include/sta/sdc/ClockInsertion.hh index 1b6ff7da..d5a00920 100644 --- a/sdc/ClockInsertion.hh +++ b/include/sta/sdc/ClockInsertion.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" -#include "Transition.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" +#include "sdc/RiseFallMinMax.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/sdc/ClockLatency.hh b/include/sta/sdc/ClockLatency.hh similarity index 88% rename from sdc/ClockLatency.hh rename to include/sta/sdc/ClockLatency.hh index 7d1f964f..077749ad 100644 --- a/sdc/ClockLatency.hh +++ b/include/sta/sdc/ClockLatency.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" -#include "Transition.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "network/NetworkClass.hh" +#include "liberty/Transition.hh" +#include "sdc/SdcClass.hh" +#include "sdc/RiseFallMinMax.hh" namespace sta { diff --git a/sdc/CycleAccting.hh b/include/sta/sdc/CycleAccting.hh similarity index 94% rename from sdc/CycleAccting.hh rename to include/sta/sdc/CycleAccting.hh index de746e5b..7c0969fd 100644 --- a/sdc/CycleAccting.hh +++ b/include/sta/sdc/CycleAccting.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "StaState.hh" -#include "SdcClass.hh" -#include "TimingRole.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/TimingRole.hh" +#include "search/StaState.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/DataCheck.hh b/include/sta/sdc/DataCheck.hh similarity index 89% rename from sdc/DataCheck.hh rename to include/sta/sdc/DataCheck.hh index e880471e..eb5cdd28 100644 --- a/sdc/DataCheck.hh +++ b/include/sta/sdc/DataCheck.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "NetworkCmp.hh" -#include "SdcClass.hh" +#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" namespace sta { diff --git a/sdc/DeratingFactors.hh b/include/sta/sdc/DeratingFactors.hh similarity index 94% rename from sdc/DeratingFactors.hh rename to include/sta/sdc/DeratingFactors.hh index bb5b9f65..b6797440 100644 --- a/sdc/DeratingFactors.hh +++ b/include/sta/sdc/DeratingFactors.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "LibertyClass.hh" -#include "SdcClass.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/LibertyClass.hh" +#include "sdc/SdcClass.hh" +#include "sdc/RiseFallMinMax.hh" namespace sta { diff --git a/sdc/DisabledPorts.hh b/include/sta/sdc/DisabledPorts.hh similarity index 95% rename from sdc/DisabledPorts.hh rename to include/sta/sdc/DisabledPorts.hh index 1503508a..743d6b51 100644 --- a/sdc/DisabledPorts.hh +++ b/include/sta/sdc/DisabledPorts.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Map.hh" -#include "NetworkClass.hh" -#include "LibertyClass.hh" -#include "SdcClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Map.hh" +#include "network/NetworkClass.hh" +#include "liberty/LibertyClass.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/ExceptionPath.hh b/include/sta/sdc/ExceptionPath.hh similarity index 99% rename from sdc/ExceptionPath.hh rename to include/sta/sdc/ExceptionPath.hh index c04629ad..e7b77d55 100644 --- a/sdc/ExceptionPath.hh +++ b/include/sta/sdc/ExceptionPath.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Error.hh" -#include "Set.hh" -#include "SdcCmdComment.hh" -#include "SdcClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Error.hh" +#include "util/Set.hh" +#include "sdc/SdcCmdComment.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/InputDrive.hh b/include/sta/sdc/InputDrive.hh similarity index 95% rename from sdc/InputDrive.hh rename to include/sta/sdc/InputDrive.hh index 79988674..50c5629c 100644 --- a/sdc/InputDrive.hh +++ b/include/sta/sdc/InputDrive.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "MinMax.hh" -#include "RiseFallMinMax.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "sdc/RiseFallMinMax.hh" namespace sta { diff --git a/sdc/MinMaxValues.hh b/include/sta/sdc/MinMaxValues.hh similarity index 98% rename from sdc/MinMaxValues.hh rename to include/sta/sdc/MinMaxValues.hh index 5a47635e..60592704 100644 --- a/sdc/MinMaxValues.hh +++ b/include/sta/sdc/MinMaxValues.hh @@ -16,8 +16,8 @@ #pragma once -#include "MinMax.hh" -#include "Error.hh" +#include "util/MinMax.hh" +#include "util/Error.hh" namespace sta { diff --git a/sdc/PinPair.hh b/include/sta/sdc/PinPair.hh similarity index 93% rename from sdc/PinPair.hh rename to include/sta/sdc/PinPair.hh index eea20583..bdcb2759 100644 --- a/sdc/PinPair.hh +++ b/include/sta/sdc/PinPair.hh @@ -16,9 +16,9 @@ #pragma once -#include "Hash.hh" -#include "Set.hh" -#include "NetworkClass.hh" +#include "util/Hash.hh" +#include "util/Set.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/sdc/PortDelay.hh b/include/sta/sdc/PortDelay.hh similarity index 96% rename from sdc/PortDelay.hh rename to include/sta/sdc/PortDelay.hh index b481cb0e..45d23459 100644 --- a/sdc/PortDelay.hh +++ b/include/sta/sdc/PortDelay.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "RiseFallMinMax.hh" -#include "SdcClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "sdc/RiseFallMinMax.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/PortExtCap.hh b/include/sta/sdc/PortExtCap.hh similarity index 90% rename from sdc/PortExtCap.hh rename to include/sta/sdc/PortExtCap.hh index e611af60..bfddb9ea 100644 --- a/sdc/PortExtCap.hh +++ b/include/sta/sdc/PortExtCap.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "Transition.hh" -#include "RiseFallMinMax.hh" -#include "MinMaxValues.hh" -#include "NetworkClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/Transition.hh" +#include "sdc/RiseFallMinMax.hh" +#include "sdc/MinMaxValues.hh" +#include "network/NetworkClass.hh" namespace sta { diff --git a/sdc/RiseFallMinMax.hh b/include/sta/sdc/RiseFallMinMax.hh similarity index 95% rename from sdc/RiseFallMinMax.hh rename to include/sta/sdc/RiseFallMinMax.hh index 896a7e42..0c5415d6 100644 --- a/sdc/RiseFallMinMax.hh +++ b/include/sta/sdc/RiseFallMinMax.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Transition.hh" -#include "MinMax.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/MinMax.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/sdc/RiseFallValues.hh b/include/sta/sdc/RiseFallValues.hh similarity index 95% rename from sdc/RiseFallValues.hh rename to include/sta/sdc/RiseFallValues.hh index 0cb092ee..daf96885 100644 --- a/sdc/RiseFallValues.hh +++ b/include/sta/sdc/RiseFallValues.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Transition.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/sdc/Sdc.hh b/include/sta/sdc/Sdc.hh similarity index 99% rename from sdc/Sdc.hh rename to include/sta/sdc/Sdc.hh index 76d85132..65aed99c 100644 --- a/sdc/Sdc.hh +++ b/include/sta/sdc/Sdc.hh @@ -17,22 +17,23 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "StringUtil.hh" -#include "StringSet.hh" -#include "Map.hh" -#include "HashSet.hh" -#include "UnorderedMap.hh" -#include "MinMax.hh" -#include "RiseFallValues.hh" -#include "StaState.hh" -#include "NetworkClass.hh" -#include "LibertyClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" -#include "Clock.hh" -#include "DataCheck.hh" -#include "CycleAccting.hh" + +#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" namespace sta { diff --git a/sdc/SdcClass.hh b/include/sta/sdc/SdcClass.hh similarity index 93% rename from sdc/SdcClass.hh rename to include/sta/sdc/SdcClass.hh index be2f0284..3ec41039 100644 --- a/sdc/SdcClass.hh +++ b/include/sta/sdc/SdcClass.hh @@ -16,13 +16,13 @@ #pragma once -#include "Map.hh" -#include "Set.hh" -#include "Vector.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "MinMaxValues.hh" -#include "PinPair.hh" +#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" namespace sta { diff --git a/sdc/SdcCmdComment.hh b/include/sta/sdc/SdcCmdComment.hh similarity index 100% rename from sdc/SdcCmdComment.hh rename to include/sta/sdc/SdcCmdComment.hh diff --git a/sdc/WriteSdc.hh b/include/sta/sdc/WriteSdc.hh similarity index 94% rename from sdc/WriteSdc.hh rename to include/sta/sdc/WriteSdc.hh index 24627d80..2242be50 100644 --- a/sdc/WriteSdc.hh +++ b/include/sta/sdc/WriteSdc.hh @@ -16,8 +16,8 @@ #pragma once -#include "NetworkClass.hh" -#include "SdcClass.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" namespace sta { diff --git a/sdc/WriteSdcPvt.hh b/include/sta/sdc/WriteSdcPvt.hh similarity index 99% rename from sdc/WriteSdcPvt.hh rename to include/sta/sdc/WriteSdcPvt.hh index 83ee4d2e..8ca21f77 100644 --- a/sdc/WriteSdcPvt.hh +++ b/include/sta/sdc/WriteSdcPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "DisallowCopyAssign.hh" +#include "util/DisallowCopyAssign.hh" namespace sta { diff --git a/search/Bfs.hh b/include/sta/search/Bfs.hh similarity index 96% rename from search/Bfs.hh rename to include/sta/search/Bfs.hh index 410f3513..73e14071 100644 --- a/search/Bfs.hh +++ b/include/sta/search/Bfs.hh @@ -17,12 +17,13 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "Set.hh" -#include "StaState.hh" -#include "GraphClass.hh" -#include "VertexVisitor.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/Iterator.hh" +#include "util/Set.hh" +#include "graph/GraphClass.hh" +#include "search/VertexVisitor.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/ClkInfo.hh b/include/sta/search/ClkInfo.hh similarity index 96% rename from search/ClkInfo.hh rename to include/sta/search/ClkInfo.hh index 97bd678f..d225a9f1 100644 --- a/search/ClkInfo.hh +++ b/include/sta/search/ClkInfo.hh @@ -16,10 +16,10 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Transition.hh" -#include "SearchClass.hh" -#include "PathVertexRep.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/Transition.hh" +#include "search/SearchClass.hh" +#include "search/PathVertexRep.hh" namespace sta { diff --git a/search/Corner.hh b/include/sta/search/Corner.hh similarity index 96% rename from search/Corner.hh rename to include/sta/search/Corner.hh index 98045abe..72f1b42b 100644 --- a/search/Corner.hh +++ b/include/sta/search/Corner.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "MinMax.hh" -#include "Vector.hh" -#include "StringSet.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" -#include "StaState.hh" +#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" namespace sta { diff --git a/search/Path.hh b/include/sta/search/Path.hh similarity index 94% rename from search/Path.hh rename to include/sta/search/Path.hh index 9ff19b14..50a5ddfe 100644 --- a/search/Path.hh +++ b/include/sta/search/Path.hh @@ -16,15 +16,15 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" -#include "MinMax.hh" -#include "Transition.hh" -#include "Delay.hh" -#include "StaState.hh" -#include "SearchClass.hh" +#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" namespace sta { diff --git a/search/PathAnalysisPt.hh b/include/sta/search/PathAnalysisPt.hh similarity index 92% rename from search/PathAnalysisPt.hh rename to include/sta/search/PathAnalysisPt.hh index d5e45500..8bd05ec7 100644 --- a/search/PathAnalysisPt.hh +++ b/include/sta/search/PathAnalysisPt.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "MinMax.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Iterator.hh" +#include "util/MinMax.hh" +#include "sdc/SdcClass.hh" +#include "search/SearchClass.hh" namespace sta { diff --git a/search/PathEnd.hh b/include/sta/search/PathEnd.hh similarity index 98% rename from search/PathEnd.hh rename to include/sta/search/PathEnd.hh index 8c2cb82b..b363fe94 100644 --- a/search/PathEnd.hh +++ b/include/sta/search/PathEnd.hh @@ -17,14 +17,15 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "LibertyClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" -#include "PathRef.hh" -#include "Crpr.hh" -#include "StaState.hh" + +#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" namespace sta { diff --git a/search/PathExpanded.hh b/include/sta/search/PathExpanded.hh similarity index 93% rename from search/PathExpanded.hh rename to include/sta/search/PathExpanded.hh index 55569466..a75693e5 100644 --- a/search/PathExpanded.hh +++ b/include/sta/search/PathExpanded.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" -#include "TimingArc.hh" -#include "StaState.hh" +#include "util/DisallowCopyAssign.hh" +#include "liberty/TimingArc.hh" +#include "graph/GraphClass.hh" +#include "search/SearchClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/PathGroup.hh b/include/sta/search/PathGroup.hh similarity index 96% rename from search/PathGroup.hh rename to include/sta/search/PathGroup.hh index 35ed4272..ce8d739e 100644 --- a/search/PathGroup.hh +++ b/include/sta/search/PathGroup.hh @@ -16,11 +16,14 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Map.hh" -#include "Vector.hh" -#include "StaState.hh" -#include "SearchClass.hh" +#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" namespace sta { diff --git a/search/Power.hh b/include/sta/search/Power.hh similarity index 99% rename from search/Power.hh rename to include/sta/search/Power.hh index 97daa64c..da09c5d9 100644 --- a/search/Power.hh +++ b/include/sta/search/Power.hh @@ -16,7 +16,7 @@ #pragma once -#include "sta/Sta.hh" +#include "search/Sta.hh" namespace sta { diff --git a/search/Property.hh b/include/sta/search/Property.hh similarity index 96% rename from search/Property.hh rename to include/sta/search/Property.hh index 0621cda9..fc078785 100644 --- a/search/Property.hh +++ b/include/sta/search/Property.hh @@ -17,17 +17,18 @@ #pragma once #include -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "SearchClass.hh" -#include "SdcClass.hh" + +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "search/SearchClass.hh" +#include "sdc/SdcClass.hh" +#include "search/Power.hh" namespace sta { using std::string; class Sta; -class PwrActivity; // Adding a new property type // value union diff --git a/search/Search.hh b/include/sta/search/Search.hh similarity index 98% rename from search/Search.hh rename to include/sta/search/Search.hh index c1b841c9..8745dfc1 100644 --- a/search/Search.hh +++ b/include/sta/search/Search.hh @@ -17,18 +17,19 @@ #pragma once #include -#include "MinMax.hh" -#include "StaState.hh" -#include "HashSet.hh" -#include "Transition.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "Delay.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" -#include "SearchPred.hh" -#include "VertexVisitor.hh" + +#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" namespace sta { diff --git a/search/SearchClass.hh b/include/sta/search/SearchClass.hh similarity index 92% rename from search/SearchClass.hh rename to include/sta/search/SearchClass.hh index 4a847367..e0653874 100644 --- a/search/SearchClass.hh +++ b/include/sta/search/SearchClass.hh @@ -16,18 +16,19 @@ #pragma once -#include "Vector.hh" -#include "Set.hh" -#include "Map.hh" -#include "UnorderedMap.hh" -#include "StringSet.hh" -#include "Delay.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" +#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" namespace sta { class Search; +class Corner; class Path; class PathRep; class PathVertex; diff --git a/search/SearchPred.hh b/include/sta/search/SearchPred.hh similarity index 96% rename from search/SearchPred.hh rename to include/sta/search/SearchPred.hh index ab82c0a6..95b8d3f9 100644 --- a/search/SearchPred.hh +++ b/include/sta/search/SearchPred.hh @@ -16,10 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "network/NetworkClass.hh" +#include "graph/GraphClass.hh" +#include "liberty/LibertyClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/include/sta/Sta.hh b/include/sta/search/Sta.hh similarity index 99% rename from include/sta/Sta.hh rename to include/sta/search/Sta.hh index 033669e6..bca0b525 100644 --- a/include/sta/Sta.hh +++ b/include/sta/search/Sta.hh @@ -17,6 +17,7 @@ #pragma once #include + #include "util/Machine.hh" #include "util/DisallowCopyAssign.hh" #include "util/StringSeq.hh" diff --git a/search/VertexVisitor.hh b/include/sta/search/VertexVisitor.hh similarity index 93% rename from search/VertexVisitor.hh rename to include/sta/search/VertexVisitor.hh index 5b705b01..8b6d7d3c 100644 --- a/search/VertexVisitor.hh +++ b/include/sta/search/VertexVisitor.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "network/NetworkClass.hh" +#include "graph/GraphClass.hh" namespace sta { diff --git a/search/VisitPathEnds.hh b/include/sta/search/VisitPathEnds.hh similarity index 97% rename from search/VisitPathEnds.hh rename to include/sta/search/VisitPathEnds.hh index 54813658..e5fdb831 100644 --- a/search/VisitPathEnds.hh +++ b/include/sta/search/VisitPathEnds.hh @@ -16,9 +16,10 @@ #pragma once -#include "SdcClass.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" +#include "sdc/SdcClass.hh" +#include "graph/GraphClass.hh" +#include "search/SearchClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/WritePathSpice.hh b/include/sta/search/WritePathSpice.hh similarity index 97% rename from search/WritePathSpice.hh rename to include/sta/search/WritePathSpice.hh index 4b0a31c3..de2b7ad2 100644 --- a/search/WritePathSpice.hh +++ b/include/sta/search/WritePathSpice.hh @@ -18,6 +18,9 @@ namespace sta { +class Path; +class StaState; + // Write a spice deck for path. // Throws FileNotReadable, FileNotWritable, SubcktEndsMissing void diff --git a/util/ArrayTable.hh b/include/sta/util/ArrayTable.hh similarity index 100% rename from util/ArrayTable.hh rename to include/sta/util/ArrayTable.hh diff --git a/util/Debug.hh b/include/sta/util/Debug.hh similarity index 100% rename from util/Debug.hh rename to include/sta/util/Debug.hh diff --git a/util/DisallowCopyAssign.hh b/include/sta/util/DisallowCopyAssign.hh similarity index 100% rename from util/DisallowCopyAssign.hh rename to include/sta/util/DisallowCopyAssign.hh diff --git a/util/DispatchQueue.hh b/include/sta/util/DispatchQueue.hh similarity index 100% rename from util/DispatchQueue.hh rename to include/sta/util/DispatchQueue.hh diff --git a/util/EnumNameMap.hh b/include/sta/util/EnumNameMap.hh similarity index 100% rename from util/EnumNameMap.hh rename to include/sta/util/EnumNameMap.hh diff --git a/util/Error.hh b/include/sta/util/Error.hh similarity index 100% rename from util/Error.hh rename to include/sta/util/Error.hh diff --git a/util/FlexPragma.hh b/include/sta/util/FlexPragma.hh similarity index 100% rename from util/FlexPragma.hh rename to include/sta/util/FlexPragma.hh diff --git a/util/Fuzzy.hh b/include/sta/util/Fuzzy.hh similarity index 100% rename from util/Fuzzy.hh rename to include/sta/util/Fuzzy.hh diff --git a/util/Hash.hh b/include/sta/util/Hash.hh similarity index 88% rename from util/Hash.hh rename to include/sta/util/Hash.hh index 402c5152..b54112b6 100644 --- a/util/Hash.hh +++ b/include/sta/util/Hash.hh @@ -51,4 +51,10 @@ nextMersenne(size_t n) size_t hashString(const char *str); +#if __WORDSIZE == 64 + #define hashPtr(ptr) (reinterpret_cast(ptr) >> 3) +#else + #define hashPtr(ptr) (reinterpret_cast(ptr) >> 2) +#endif + } // namespace diff --git a/util/HashMap.hh b/include/sta/util/HashMap.hh similarity index 100% rename from util/HashMap.hh rename to include/sta/util/HashMap.hh diff --git a/util/HashSet.hh b/include/sta/util/HashSet.hh similarity index 100% rename from util/HashSet.hh rename to include/sta/util/HashSet.hh diff --git a/util/Iterator.hh b/include/sta/util/Iterator.hh similarity index 100% rename from util/Iterator.hh rename to include/sta/util/Iterator.hh diff --git a/util/Map.hh b/include/sta/util/Map.hh similarity index 100% rename from util/Map.hh rename to include/sta/util/Map.hh diff --git a/util/MinMax.hh b/include/sta/util/MinMax.hh similarity index 100% rename from util/MinMax.hh rename to include/sta/util/MinMax.hh diff --git a/util/Mutex.hh b/include/sta/util/Mutex.hh similarity index 100% rename from util/Mutex.hh rename to include/sta/util/Mutex.hh diff --git a/util/ObjectId.hh b/include/sta/util/ObjectId.hh similarity index 100% rename from util/ObjectId.hh rename to include/sta/util/ObjectId.hh diff --git a/util/ObjectTable.hh b/include/sta/util/ObjectTable.hh similarity index 100% rename from util/ObjectTable.hh rename to include/sta/util/ObjectTable.hh diff --git a/util/PatternMatch.hh b/include/sta/util/PatternMatch.hh similarity index 100% rename from util/PatternMatch.hh rename to include/sta/util/PatternMatch.hh diff --git a/util/Report.hh b/include/sta/util/Report.hh similarity index 100% rename from util/Report.hh rename to include/sta/util/Report.hh diff --git a/util/ReportStd.hh b/include/sta/util/ReportStd.hh similarity index 100% rename from util/ReportStd.hh rename to include/sta/util/ReportStd.hh diff --git a/util/ReportTcl.hh b/include/sta/util/ReportTcl.hh similarity index 100% rename from util/ReportTcl.hh rename to include/sta/util/ReportTcl.hh diff --git a/util/Set.hh b/include/sta/util/Set.hh similarity index 100% rename from util/Set.hh rename to include/sta/util/Set.hh diff --git a/util/Stats.hh b/include/sta/util/Stats.hh similarity index 100% rename from util/Stats.hh rename to include/sta/util/Stats.hh diff --git a/util/StringSeq.hh b/include/sta/util/StringSeq.hh similarity index 100% rename from util/StringSeq.hh rename to include/sta/util/StringSeq.hh diff --git a/util/StringSet.hh b/include/sta/util/StringSet.hh similarity index 100% rename from util/StringSet.hh rename to include/sta/util/StringSet.hh diff --git a/util/StringUtil.hh b/include/sta/util/StringUtil.hh similarity index 100% rename from util/StringUtil.hh rename to include/sta/util/StringUtil.hh diff --git a/util/TokenParser.hh b/include/sta/util/TokenParser.hh similarity index 100% rename from util/TokenParser.hh rename to include/sta/util/TokenParser.hh diff --git a/util/UnorderedMap.hh b/include/sta/util/UnorderedMap.hh similarity index 100% rename from util/UnorderedMap.hh rename to include/sta/util/UnorderedMap.hh diff --git a/util/UnorderedSet.hh b/include/sta/util/UnorderedSet.hh similarity index 100% rename from util/UnorderedSet.hh rename to include/sta/util/UnorderedSet.hh diff --git a/util/Vector.hh b/include/sta/util/Vector.hh similarity index 100% rename from util/Vector.hh rename to include/sta/util/Vector.hh diff --git a/util/Zlib.hh b/include/sta/util/Zlib.hh similarity index 96% rename from util/Zlib.hh rename to include/sta/util/Zlib.hh index 30dcba0b..85101d6f 100644 --- a/util/Zlib.hh +++ b/include/sta/util/Zlib.hh @@ -19,7 +19,7 @@ // The zlib package is optional. // Define stdio based macros if it is missing. -#include "StaConfig.hh" // ZLIB +#include "util/StaConfig.hh" // ZLIB #ifdef ZLIB_FOUND diff --git a/liberty/EquivCells.cc b/liberty/EquivCells.cc index 0572dd72..2e13d7a4 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 "Machine.hh" -#include "Hash.hh" -#include "PortDirection.hh" -#include "Transition.hh" -#include "MinMax.hh" -#include "TimingRole.hh" -#include "FuncExpr.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "TableModel.hh" -#include "Sequential.hh" -#include "EquivCells.hh" +#include "liberty/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" namespace sta { diff --git a/liberty/FuncExpr.cc b/liberty/FuncExpr.cc index b51bd0fd..f8195346 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 "Machine.hh" -#include "StringUtil.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "FuncExpr.hh" +#include "liberty/FuncExpr.hh" + +#include "util/StringUtil.hh" +#include "liberty/Liberty.hh" +#include "network/Network.hh" namespace sta { diff --git a/liberty/InternalPower.cc b/liberty/InternalPower.cc index 9d3cfef7..f4195f6f 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 "Machine.hh" -#include "FuncExpr.hh" -#include "TableModel.hh" -#include "Liberty.hh" -#include "InternalPower.hh" +#include "liberty/InternalPower.hh" + +#include "liberty/FuncExpr.hh" +#include "liberty/TableModel.hh" +#include "liberty/Liberty.hh" namespace sta { diff --git a/liberty/LeakagePower.cc b/liberty/LeakagePower.cc index c42c96a1..d19bdd60 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 "Machine.hh" -#include "FuncExpr.hh" -#include "TableModel.hh" -#include "Liberty.hh" -#include "LeakagePower.hh" +#include "liberty/LeakagePower.hh" + +#include "liberty/FuncExpr.hh" +#include "liberty/TableModel.hh" +#include "liberty/Liberty.hh" namespace sta { diff --git a/liberty/Liberty.cc b/liberty/Liberty.cc index e01cd4c4..5c65bdc9 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 "Machine.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 "PortDirection.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 "Liberty.hh" +#include "liberty/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" namespace sta { diff --git a/liberty/LibertyBuilder.cc b/liberty/LibertyBuilder.cc index 370163e1..44a5ffa1 100644 --- a/liberty/LibertyBuilder.cc +++ b/liberty/LibertyBuilder.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 "Machine.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" #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" + namespace sta { LibertyCell * diff --git a/liberty/LibertyBuilder.hh b/liberty/LibertyBuilder.hh index 23006b39..39536b51 100644 --- a/liberty/LibertyBuilder.hh +++ b/liberty/LibertyBuilder.hh @@ -16,13 +16,18 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Transition.hh" -#include "LibertyClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "liberty/Transition.hh" +#include "liberty/LibertyClass.hh" +#include "network/ConcreteLibrary.hh" namespace sta { +class TimingArcAttrs; +class InternalPowerAttrs; +class LeakagePowerAttrs; + class LibertyBuilder { public: diff --git a/liberty/LibertyExpr.cc b/liberty/LibertyExpr.cc index 63eb765c..30f4472d 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 "Machine.hh" -#include "Report.hh" -#include "StringUtil.hh" -#include "FuncExpr.hh" -#include "Liberty.hh" -#include "LibertyExprPvt.hh" +#include "liberty/FuncExpr.hh" + +#include "util/Report.hh" +#include "util/StringUtil.hh" +#include "liberty/Liberty.hh" +#include "liberty/LibertyExprPvt.hh" extern int LibertyExprParse_parse(); diff --git a/liberty/LibertyExpr.hh b/liberty/LibertyExpr.hh index cf2a1030..eb91f701 100644 --- a/liberty/LibertyExpr.hh +++ b/liberty/LibertyExpr.hh @@ -16,13 +16,11 @@ #pragma once -#include "LibertyClass.hh" - namespace sta { class Report; -class LibertyCell; class FuncExpr; +class LibertyCell; FuncExpr * parseFuncExpr(const char *func, diff --git a/liberty/LibertyExprLex.ll b/liberty/LibertyExprLex.ll index c191eeec..707ec032 100644 --- a/liberty/LibertyExprLex.ll +++ b/liberty/LibertyExprLex.ll @@ -18,11 +18,10 @@ // Liberty function expression lexical analyzer -#include "Machine.hh" -#include "FlexPragma.hh" -#include "Debug.hh" -#include "StringUtil.hh" -#include "LibertyExprPvt.hh" +#include "util/FlexPragma.hh" +#include "util/Debug.hh" +#include "util/StringUtil.hh" +#include "liberty/LibertyExprPvt.hh" using sta::libexpr_parser; using sta::stringCopy; diff --git a/liberty/LibertyExprParse.yy b/liberty/LibertyExprParse.yy index 8f30b33d..da6846f6 100644 --- a/liberty/LibertyExprParse.yy +++ b/liberty/LibertyExprParse.yy @@ -18,10 +18,9 @@ // Liberty function expression parser. -#include "Machine.hh" -#include "FuncExpr.hh" -#include "LibertyExpr.hh" -#include "LibertyExprPvt.hh" +#include "liberty/FuncExpr.hh" +#include "liberty/LibertyExpr.hh" +#include "liberty/LibertyExprPvt.hh" int LibertyExprLex_lex(); #define LibertyExprParse_lex LibertyExprLex_lex diff --git a/liberty/LibertyExprPvt.hh b/liberty/LibertyExprPvt.hh index 205104e1..260ec9d9 100644 --- a/liberty/LibertyExprPvt.hh +++ b/liberty/LibertyExprPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "DisallowCopyAssign.hh" +#include "util/DisallowCopyAssign.hh" namespace sta { diff --git a/liberty/LibertyLex.ll b/liberty/LibertyLex.ll index 64239a31..1047ebb6 100644 --- a/liberty/LibertyLex.ll +++ b/liberty/LibertyLex.ll @@ -15,12 +15,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "FlexPragma.hh" #include #include -#include "Machine.hh" -#include "LibertyParser.hh" + +#include "util/FlexPragma.hh" +#include "liberty/LibertyParser.hh" #include "LibertyParse.hh" #define YY_NO_INPUT diff --git a/liberty/LibertyParse.yy b/liberty/LibertyParse.yy index 0eb77f37..3ad66412 100644 --- a/liberty/LibertyParse.yy +++ b/liberty/LibertyParse.yy @@ -17,9 +17,9 @@ #include #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "LibertyParser.hh" + +#include "util/StringUtil.hh" +#include "liberty/LibertyParser.hh" int LibertyLex_lex(); #define LibertyParse_lex LibertyLex_lex diff --git a/liberty/LibertyParser.cc b/liberty/LibertyParser.cc index c5e4dc2c..c106abbf 100644 --- a/liberty/LibertyParser.cc +++ b/liberty/LibertyParser.cc @@ -14,13 +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 #include -#include "Machine.hh" -#include "Report.hh" -#include "Error.hh" -#include "StringUtil.hh" -#include "LibertyParser.hh" + +#include "util/Report.hh" +#include "util/Error.hh" +#include "util/StringUtil.hh" // Global namespace diff --git a/liberty/LibertyParser.hh b/liberty/LibertyParser.hh index 6c959e17..d1f96140 100644 --- a/liberty/LibertyParser.hh +++ b/liberty/LibertyParser.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Map.hh" -#include "Set.hh" -#include "StringUtil.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "util/Map.hh" +#include "util/Set.hh" +#include "util/StringUtil.hh" namespace sta { diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc index 3fcc5870..b2c727d0 100644 --- a/liberty/LibertyReader.cc +++ b/liberty/LibertyReader.cc @@ -14,30 +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 #include -#include "Machine.hh" -#include "Report.hh" -#include "Debug.hh" -#include "TokenParser.hh" -#include "Network.hh" -#include "Units.hh" -#include "PortDirection.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 "ParseBus.hh" -#include "Liberty.hh" -#include "LibertyBuilder.hh" -#include "LibertyReader.hh" -#include "LibertyReaderPvt.hh" + +#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" namespace sta { diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh index c97e592e..a8bbd530 100644 --- a/liberty/LibertyReaderPvt.hh +++ b/liberty/LibertyReaderPvt.hh @@ -16,19 +16,19 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Map.hh" -#include "StringSeq.hh" -#include "Transition.hh" -#include "MinMax.hh" -#include "TimingArc.hh" -#include "InternalPower.hh" -#include "LeakagePower.hh" -#include "Liberty.hh" -#include "LibertyParser.hh" -#include "LibertyReader.hh" -#include "NetworkClass.hh" +#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" namespace sta { diff --git a/liberty/LinearModel.cc b/liberty/LinearModel.cc index d6a9f938..166450a9 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 "Machine.hh" -#include "Units.hh" -#include "Liberty.hh" -#include "LinearModel.hh" +#include "liberty/LinearModel.hh" + +#include "liberty/Units.hh" +#include "liberty/Liberty.hh" namespace sta { diff --git a/liberty/Sequential.cc b/liberty/Sequential.cc index 2fe7046c..ab41cf6e 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 "Machine.hh" -#include "FuncExpr.hh" -#include "Sequential.hh" +#include "liberty/Sequential.hh" + +#include "liberty/FuncExpr.hh" namespace sta { diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc index 2b4764cc..e2d5cb89 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 "Machine.hh" -#include "Report.hh" -#include "Error.hh" -#include "EnumNameMap.hh" -#include "Units.hh" -#include "Liberty.hh" -#include "TableModel.hh" +#include "liberty/TableModel.hh" + +#include "util/Report.hh" +#include "util/Error.hh" +#include "util/EnumNameMap.hh" +#include "liberty/Units.hh" +#include "liberty/Liberty.hh" namespace sta { diff --git a/liberty/TimingArc.cc b/liberty/TimingArc.cc index d6b77525..3f496c1f 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 "Machine.hh" -#include "EnumNameMap.hh" -#include "FuncExpr.hh" -#include "TimingRole.hh" -#include "Liberty.hh" -#include "TimingModel.hh" -#include "TimingArc.hh" +#include "liberty/TimingModel.hh" + +#include "util/EnumNameMap.hh" +#include "liberty/FuncExpr.hh" +#include "liberty/TimingRole.hh" +#include "liberty/Liberty.hh" +#include "liberty/TimingArc.hh" namespace sta { diff --git a/liberty/TimingRole.cc b/liberty/TimingRole.cc index 35de1a55..6a2cafaa 100644 --- a/liberty/TimingRole.cc +++ b/liberty/TimingRole.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "TimingRole.hh" +#include "liberty/TimingRole.hh" namespace sta { diff --git a/liberty/Transition.cc b/liberty/Transition.cc index 6ff179e2..bedcd270 100644 --- a/liberty/Transition.cc +++ b/liberty/Transition.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "Transition.hh" +#include "liberty/Transition.hh" namespace sta { diff --git a/liberty/Units.cc b/liberty/Units.cc index 0ced96c3..c6c9509e 100644 --- a/liberty/Units.cc +++ b/liberty/Units.cc @@ -14,12 +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 // abs #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "MinMax.hh" // INF -#include "Units.hh" + +#include "util/StringUtil.hh" +#include "util/MinMax.hh" // INF namespace sta { diff --git a/liberty/Wireload.cc b/liberty/Wireload.cc index 9c6281a5..eb36c90a 100644 --- a/liberty/Wireload.cc +++ b/liberty/Wireload.cc @@ -14,12 +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 -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "StringUtil.hh" -#include "Liberty.hh" -#include "Wireload.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/StringUtil.hh" +#include "liberty/Liberty.hh" namespace sta { diff --git a/network/ConcreteLibrary.cc b/network/ConcreteLibrary.cc index 697cf3ae..6477e6e1 100644 --- a/network/ConcreteLibrary.cc +++ b/network/ConcreteLibrary.cc @@ -14,13 +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 -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "PatternMatch.hh" -#include "PortDirection.hh" -#include "ParseBus.hh" -#include "ConcreteLibrary.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/PatternMatch.hh" +#include "network/PortDirection.hh" +#include "network/ParseBus.hh" namespace sta { diff --git a/network/ConcreteNetwork.cc b/network/ConcreteNetwork.cc index be2facce..5f6e5b70 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 "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "PatternMatch.hh" -#include "Report.hh" -#include "PortDirection.hh" -#include "ConcreteLibrary.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "ConcreteNetwork.hh" +#include "network/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" namespace sta { diff --git a/network/HpinDrvrLoad.cc b/network/HpinDrvrLoad.cc index d64d6730..c1d22564 100644 --- a/network/HpinDrvrLoad.cc +++ b/network/HpinDrvrLoad.cc @@ -14,10 +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 -#include "Machine.hh" -#include "Network.hh" -#include "HpinDrvrLoad.hh" + +#include "network/Network.hh" namespace sta { diff --git a/network/Network.cc b/network/Network.cc index fc55e2a4..891d6148 100644 --- a/network/Network.cc +++ b/network/Network.cc @@ -14,13 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "StringUtil.hh" -#include "PatternMatch.hh" -#include "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" + +#include "network/Network.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/StringUtil.hh" +#include "util/PatternMatch.hh" +#include "liberty/Liberty.hh" +#include "network/PortDirection.hh" namespace sta { diff --git a/network/NetworkCmp.cc b/network/NetworkCmp.cc index e9e03fc0..19e1144e 100644 --- a/network/NetworkCmp.cc +++ b/network/NetworkCmp.cc @@ -14,12 +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 -#include "Machine.hh" -#include "StringUtil.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "NetworkCmp.hh" + +#include "util/StringUtil.hh" +#include "liberty/Liberty.hh" +#include "network/Network.hh" namespace sta { diff --git a/network/ParseBus.cc b/network/ParseBus.cc index 785fc32c..64d60b68 100644 --- a/network/ParseBus.cc +++ b/network/ParseBus.cc @@ -14,12 +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 #include #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "ParseBus.hh" + +#include "util/StringUtil.hh" namespace sta { diff --git a/network/PortDirection.cc b/network/PortDirection.cc index 628cf4ad..56cf7b64 100644 --- a/network/PortDirection.cc +++ b/network/PortDirection.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "PortDirection.hh" +#include "network/PortDirection.hh" namespace sta { diff --git a/network/SdcNetwork.cc b/network/SdcNetwork.cc index f9393ca8..39c082ba 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 "Machine.hh" -#include "StringUtil.hh" -#include "PatternMatch.hh" -#include "ParseBus.hh" -#include "SdcNetwork.hh" +#include "network/SdcNetwork.hh" + +#include "util/StringUtil.hh" +#include "util/PatternMatch.hh" +#include "network/ParseBus.hh" namespace sta { diff --git a/network/VerilogNamespace.cc b/network/VerilogNamespace.cc index 78054c12..2435c887 100644 --- a/network/VerilogNamespace.cc +++ b/network/VerilogNamespace.cc @@ -14,11 +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 -#include "Machine.hh" -#include "StringUtil.hh" -#include "ParseBus.hh" -#include "VerilogNamespace.hh" + +#include "util/StringUtil.hh" +#include "network/ParseBus.hh" namespace sta { diff --git a/parasitics/ConcreteParasitics.cc b/parasitics/ConcreteParasitics.cc index cd0d22cc..92aeea42 100644 --- a/parasitics/ConcreteParasitics.cc +++ b/parasitics/ConcreteParasitics.cc @@ -14,26 +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 #include // max -#include "Machine.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 "ConcreteParasitics.hh" -#include "Parasitics.hh" -#include "Corner.hh" -#include "ConcreteParasiticsPvt.hh" + +#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" // 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 3d4817a8..23f83c29 100644 --- a/parasitics/ConcreteParasitics.hh +++ b/parasitics/ConcreteParasitics.hh @@ -17,11 +17,12 @@ #pragma once #include -#include "Map.hh" -#include "Set.hh" -#include "MinMax.hh" -#include "EstimateParasitics.hh" -#include "Parasitics.hh" + +#include "util/Map.hh" +#include "util/Set.hh" +#include "util/MinMax.hh" +#include "parasitics/EstimateParasitics.hh" +#include "parasitics/Parasitics.hh" namespace sta { diff --git a/parasitics/ConcreteParasiticsPvt.hh b/parasitics/ConcreteParasiticsPvt.hh index c44a2461..f70cf944 100644 --- a/parasitics/ConcreteParasiticsPvt.hh +++ b/parasitics/ConcreteParasiticsPvt.hh @@ -16,7 +16,7 @@ #pragma once -#include "Parasitics.hh" +#include "parasitics/Parasitics.hh" namespace sta { diff --git a/parasitics/EstimateParasitics.cc b/parasitics/EstimateParasitics.cc index 07e04349..ab7ac0c4 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 "Machine.hh" -#include "Wireload.hh" -#include "Liberty.hh" -#include "Parasitics.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "EstimateParasitics.hh" +#include "parasitics/EstimateParasitics.hh" + +#include "liberty/Wireload.hh" +#include "liberty/Liberty.hh" +#include "network/Network.hh" +#include "sdc/Sdc.hh" +#include "parasitics/Parasitics.hh" namespace sta { diff --git a/parasitics/EstimateParasitics.hh b/parasitics/EstimateParasitics.hh index 2483ef5b..88ec1723 100644 --- a/parasitics/EstimateParasitics.hh +++ b/parasitics/EstimateParasitics.hh @@ -16,13 +16,16 @@ #pragma once -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" -#include "ParasiticsClass.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" +#include "parasitics/ParasiticsClass.hh" namespace sta { +class Corner; +class StaState; + class EstimateParasitics { public: diff --git a/parasitics/NullParasitics.cc b/parasitics/NullParasitics.cc index cd1b2e75..92c23615 100644 --- a/parasitics/NullParasitics.cc +++ b/parasitics/NullParasitics.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "NullParasitics.hh" +#include "parasitics/NullParasitics.hh" namespace sta { diff --git a/parasitics/Parasitics.cc b/parasitics/Parasitics.cc index d2de4f23..20b45b7a 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 "Machine.hh" -#include "Error.hh" -#include "Debug.hh" -#include "Wireload.hh" -#include "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "ReduceParasitics.hh" -#include "Parasitics.hh" +#include "parasitics/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" namespace sta { diff --git a/parasitics/Parasitics.i b/parasitics/Parasitics.i index f0780c8c..fa6ad1db 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 "Sta.hh" +#include "search/Sta.hh" using sta::Sta; using sta::cmdLinkedNetwork; diff --git a/parasitics/ReduceParasitics.cc b/parasitics/ReduceParasitics.cc index 27ea5a4b..acebdfc6 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 "Machine.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" -#include "ReduceParasitics.hh" +#include "parasitics/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" namespace sta { diff --git a/parasitics/ReduceParasitics.hh b/parasitics/ReduceParasitics.hh index 487567d7..6d94150a 100644 --- a/parasitics/ReduceParasitics.hh +++ b/parasitics/ReduceParasitics.hh @@ -16,8 +16,12 @@ #pragma once +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" + namespace sta { +class Corner; class Parasitic; class ParasiticAnalysisPt; class StaState; diff --git a/parasitics/SpefLex.ll b/parasitics/SpefLex.ll index 2eb1aeb8..291e9925 100644 --- a/parasitics/SpefLex.ll +++ b/parasitics/SpefLex.ll @@ -16,13 +16,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "FlexPragma.hh" #include #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "SpefReaderPvt.hh" + +#include "util/FlexPragma.hh" +#include "util/StringUtil.hh" +#include "parasitics/SpefReaderPvt.hh" #include "SpefParse.hh" #define YY_NO_INPUT diff --git a/parasitics/SpefNamespace.cc b/parasitics/SpefNamespace.cc index 83662610..09299845 100644 --- a/parasitics/SpefNamespace.cc +++ b/parasitics/SpefNamespace.cc @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "parasitics/SpefNamespace.hh" + #include #include -#include "Machine.hh" namespace sta { diff --git a/parasitics/SpefParse.yy b/parasitics/SpefParse.yy index d7261eb9..6afda474 100755 --- a/parasitics/SpefParse.yy +++ b/parasitics/SpefParse.yy @@ -17,10 +17,10 @@ // along with this program. If not, see . #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "StringSeq.hh" -#include "SpefReaderPvt.hh" + +#include "util/StringUtil.hh" +#include "util/StringSeq.hh" +#include "parasitics/SpefReaderPvt.hh" int SpefLex_lex(); #define SpefParse_lex SpefLex_lex diff --git a/parasitics/SpefReader.cc b/parasitics/SpefReader.cc index 65ffc47d..b490d2a6 100644 --- a/parasitics/SpefReader.cc +++ b/parasitics/SpefReader.cc @@ -14,22 +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 -#include "Machine.hh" -#include "Zlib.hh" -#include "Report.hh" -#include "Debug.hh" -#include "StringUtil.hh" -#include "Map.hh" -#include "PortDirection.hh" -#include "Transition.hh" -#include "Network.hh" -#include "Liberty.hh" -#include "Sdc.hh" -#include "Parasitics.hh" -#include "SpefReaderPvt.hh" -#include "SpefNamespace.hh" -#include "SpefReader.hh" + +#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" int SpefParse_parse(); diff --git a/parasitics/SpefReader.hh b/parasitics/SpefReader.hh index e03f0aa0..11707982 100644 --- a/parasitics/SpefReader.hh +++ b/parasitics/SpefReader.hh @@ -16,14 +16,19 @@ #pragma once -#include "Zlib.hh" +#include "util/Zlib.hh" +#include "util/MinMax.hh" +#include "parasitics/ParasiticsClass.hh" namespace sta { +class Report; class Network; class Parasitics; class ParasiticAnalysisPt; class Instance; +class Corner; +class OperatingConditions; // Read a file single value parasitics into analysis point ap. // In a Spef file with triplet values the first value is used. diff --git a/parasitics/SpefReaderPvt.hh b/parasitics/SpefReaderPvt.hh index 3008230a..816c4425 100644 --- a/parasitics/SpefReaderPvt.hh +++ b/parasitics/SpefReaderPvt.hh @@ -16,11 +16,11 @@ #pragma once -#include "Zlib.hh" -#include "Map.hh" -#include "StringSeq.hh" -#include "NetworkClass.hh" -#include "ParasiticsClass.hh" +#include "util/Zlib.hh" +#include "util/Map.hh" +#include "util/StringSeq.hh" +#include "network/NetworkClass.hh" +#include "parasitics/ParasiticsClass.hh" // Global namespace. #define YY_INPUT(buf,result,max_size) \ diff --git a/sdc/Clock.cc b/sdc/Clock.cc index 051d62d6..7b76ae5f 100644 --- a/sdc/Clock.cc +++ b/sdc/Clock.cc @@ -14,17 +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 -#include "Machine.hh" -#include "Error.hh" -#include "StringUtil.hh" -#include "Transition.hh" -#include "TimingRole.hh" -#include "MinMax.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "Clock.hh" + +#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" namespace sta { diff --git a/sdc/ClockGatingCheck.cc b/sdc/ClockGatingCheck.cc index 58076cbf..28db1ae5 100644 --- a/sdc/ClockGatingCheck.cc +++ b/sdc/ClockGatingCheck.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "ClockGatingCheck.hh" +#include "sdc/ClockGatingCheck.hh" namespace sta { diff --git a/sdc/ClockGroups.cc b/sdc/ClockGroups.cc index f3607db2..b27ddb16 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 "Machine.hh" -#include "StringUtil.hh" -#include "ClockGroups.hh" +#include "sdc/ClockGroups.hh" + +#include "util/StringUtil.hh" namespace sta { diff --git a/sdc/ClockInsertion.cc b/sdc/ClockInsertion.cc index e0059b44..7043b2ba 100644 --- a/sdc/ClockInsertion.cc +++ b/sdc/ClockInsertion.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "ClockInsertion.hh" +#include "sdc/ClockInsertion.hh" namespace sta { diff --git a/sdc/ClockLatency.cc b/sdc/ClockLatency.cc index c204aee0..c5916383 100644 --- a/sdc/ClockLatency.cc +++ b/sdc/ClockLatency.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "ClockLatency.hh" +#include "sdc/ClockLatency.hh" namespace sta { diff --git a/sdc/CycleAccting.cc b/sdc/CycleAccting.cc index 46cb304e..9b2d5cf2 100644 --- a/sdc/CycleAccting.cc +++ b/sdc/CycleAccting.cc @@ -14,15 +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 // ceil #include // max -#include "Machine.hh" -#include "Debug.hh" -#include "Fuzzy.hh" -#include "Units.hh" -#include "TimingRole.hh" -#include "Clock.hh" -#include "CycleAccting.hh" + +#include "util/Debug.hh" +#include "util/Fuzzy.hh" +#include "liberty/Units.hh" +#include "liberty/TimingRole.hh" +#include "sdc/Clock.hh" namespace sta { diff --git a/sdc/DataCheck.cc b/sdc/DataCheck.cc index daa6041b..8b1ba9a9 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 "Machine.hh" -#include "Clock.hh" -#include "DataCheck.hh" +#include "sdc/DataCheck.hh" + +#include "sdc/Clock.hh" namespace sta { diff --git a/sdc/DeratingFactors.cc b/sdc/DeratingFactors.cc index 62f8c2b6..54369bc3 100644 --- a/sdc/DeratingFactors.cc +++ b/sdc/DeratingFactors.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "DeratingFactors.hh" +#include "sdc/DeratingFactors.hh" namespace sta { diff --git a/sdc/DisabledPorts.cc b/sdc/DisabledPorts.cc index 69ada6b0..d50b3bbd 100644 --- a/sdc/DisabledPorts.cc +++ b/sdc/DisabledPorts.cc @@ -14,13 +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 -#include "Machine.hh" -#include "StringUtil.hh" -#include "TimingRole.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "DisabledPorts.hh" + +#include "util/StringUtil.hh" +#include "liberty/TimingRole.hh" +#include "liberty/Liberty.hh" +#include "network/Network.hh" namespace sta { diff --git a/sdc/ExceptionPath.cc b/sdc/ExceptionPath.cc index 8b91ef06..b832a08b 100644 --- a/sdc/ExceptionPath.cc +++ b/sdc/ExceptionPath.cc @@ -14,18 +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 -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Units.hh" -#include "Transition.hh" -#include "PortDirection.hh" -#include "TimingRole.hh" -#include "MinMax.hh" -#include "Network.hh" -#include "NetworkCmp.hh" -#include "Clock.hh" -#include "ExceptionPath.hh" + +#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" namespace sta { diff --git a/sdc/InputDrive.cc b/sdc/InputDrive.cc index 0a5e03b7..62ae07c2 100644 --- a/sdc/InputDrive.cc +++ b/sdc/InputDrive.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "InputDrive.hh" +#include "sdc/InputDrive.hh" namespace sta { diff --git a/sdc/PinPair.cc b/sdc/PinPair.cc index d87b4098..508bc805 100644 --- a/sdc/PinPair.cc +++ b/sdc/PinPair.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "PinPair.hh" +#include "sdc/PinPair.hh" namespace sta { diff --git a/sdc/PortDelay.cc b/sdc/PortDelay.cc index 8ef0177f..816c5ca4 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 "Machine.hh" -#include "Sdc.hh" -#include "Network.hh" -#include "PortDelay.hh" +#include "sdc/PortDelay.hh" + +#include "sdc/Sdc.hh" +#include "network/Network.hh" namespace sta { diff --git a/sdc/PortExtCap.cc b/sdc/PortExtCap.cc index fe9e549c..5d501bd4 100644 --- a/sdc/PortExtCap.cc +++ b/sdc/PortExtCap.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "PortExtCap.hh" +#include "sdc/PortExtCap.hh" namespace sta { diff --git a/sdc/RiseFallMinMax.cc b/sdc/RiseFallMinMax.cc index 5587449c..e1b8db99 100644 --- a/sdc/RiseFallMinMax.cc +++ b/sdc/RiseFallMinMax.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "RiseFallMinMax.hh" +#include "sdc/RiseFallMinMax.hh" namespace sta { diff --git a/sdc/RiseFallValues.cc b/sdc/RiseFallValues.cc index f919ee79..34c85a9d 100644 --- a/sdc/RiseFallValues.cc +++ b/sdc/RiseFallValues.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "RiseFallValues.hh" +#include "sdc/RiseFallValues.hh" namespace sta { diff --git a/sdc/Sdc.cc b/sdc/Sdc.cc index 0f3f3157..555ecaa8 100644 --- a/sdc/Sdc.cc +++ b/sdc/Sdc.cc @@ -14,40 +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 -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Stats.hh" -#include "Debug.hh" -#include "Mutex.hh" -#include "Report.hh" -#include "PatternMatch.hh" -#include "MinMax.hh" -#include "PortDirection.hh" -#include "RiseFallMinMax.hh" -#include "Transition.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.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 "Levelize.hh" -#include "HpinDrvrLoad.hh" -#include "Corner.hh" -#include "Sdc.hh" + +#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 "search/Levelize.hh" +#include "search/Corner.hh" namespace sta { diff --git a/sdc/SdcCmdComment.cc b/sdc/SdcCmdComment.cc index 72660db9..abae5a88 100644 --- a/sdc/SdcCmdComment.cc +++ b/sdc/SdcCmdComment.cc @@ -14,9 +14,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringUtil.hh" -#include "SdcCmdComment.hh" +#include "util/StringUtil.hh" +#include "sdc/SdcCmdComment.hh" namespace sta { diff --git a/sdc/WriteSdc.cc b/sdc/WriteSdc.cc index fc0c0d91..33888975 100644 --- a/sdc/WriteSdc.cc +++ b/sdc/WriteSdc.cc @@ -14,37 +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 #include #include -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Report.hh" -#include "Error.hh" -#include "Units.hh" -#include "StaState.hh" -#include "PortDirection.hh" -#include "RiseFallValues.hh" -#include "Transition.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "NetworkCmp.hh" -#include "PortDelay.hh" -#include "ExceptionPath.hh" -#include "PortExtCap.hh" -#include "DisabledPorts.hh" -#include "Wireload.hh" -#include "ClockGroups.hh" -#include "ClockInsertion.hh" -#include "ClockLatency.hh" -#include "InputDrive.hh" -#include "DataCheck.hh" -#include "DeratingFactors.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "GraphCmp.hh" -#include "WriteSdc.hh" -#include "WriteSdcPvt.hh" + +#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" namespace sta { diff --git a/sdf/ReportAnnotation.cc b/sdf/ReportAnnotation.cc index 6a0f3071..2cbe43f1 100644 --- a/sdf/ReportAnnotation.cc +++ b/sdf/ReportAnnotation.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 "Machine.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" -#include "ReportAnnotation.hh" +#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" namespace sta { diff --git a/sdf/ReportAnnotation.hh b/sdf/ReportAnnotation.hh index 46a6a2fa..ea79ecb2 100644 --- a/sdf/ReportAnnotation.hh +++ b/sdf/ReportAnnotation.hh @@ -18,6 +18,8 @@ namespace sta { +class StaState; + void reportAnnotatedDelay(bool report_cells, bool report_nets, diff --git a/sdf/Sdf.hh b/sdf/Sdf.hh index 2377b679..8f664a8f 100644 --- a/sdf/Sdf.hh +++ b/sdf/Sdf.hh @@ -16,16 +16,16 @@ #pragma once -#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" +#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" // Header for ReadSdf.cc to communicate with SdfLex.cc, SdfParse.cc diff --git a/sdf/Sdf.i b/sdf/Sdf.i index e4b6b042..379168a4 100644 --- a/sdf/Sdf.i +++ b/sdf/Sdf.i @@ -18,11 +18,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "SdfReader.hh" -#include "ReportAnnotation.hh" -#include "SdfWriter.hh" -#include "Search.hh" -#include "Sta.hh" +#include "sdf/SdfReader.hh" +#include "sdf/ReportAnnotation.hh" +#include "sdf/SdfWriter.hh" +#include "search/Search.hh" +#include "search/Sta.hh" using sta::Sta; using sta::cmdLinkedNetwork; diff --git a/sdf/SdfLex.ll b/sdf/SdfLex.ll index 01192e6d..8712956a 100644 --- a/sdf/SdfLex.ll +++ b/sdf/SdfLex.ll @@ -16,9 +16,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "FlexPragma.hh" -#include "Sdf.hh" +#include "util/FlexPragma.hh" +#include "sdf/Sdf.hh" #include "SdfParse.hh" #define YY_NO_INPUT diff --git a/sdf/SdfParse.yy b/sdf/SdfParse.yy index 7ce41350..f0638801 100644 --- a/sdf/SdfParse.yy +++ b/sdf/SdfParse.yy @@ -17,8 +17,8 @@ // along with this program. If not, see . #include -#include "Machine.hh" -#include "Sdf.hh" + +#include "sdf/Sdf.hh" int SdfLex_lex(); #define SdfParse_lex SdfLex_lex diff --git a/sdf/SdfReader.cc b/sdf/SdfReader.cc index 626d5e6b..cacdd4da 100644 --- a/sdf/SdfReader.cc +++ b/sdf/SdfReader.cc @@ -14,21 +14,22 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "sdf/SdfReader.hh" + #include #include -#include "Machine.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.hh" -#include "SdfReader.hh" + +#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 "sdf/Sdf.hh" extern int SdfParse_parse(); diff --git a/sdf/SdfReader.hh b/sdf/SdfReader.hh index 74fce818..e83ddb87 100644 --- a/sdf/SdfReader.hh +++ b/sdf/SdfReader.hh @@ -16,6 +16,8 @@ #pragma once +#include "sdc/SdcClass.hh" + namespace sta { class Report; @@ -23,6 +25,7 @@ class MinMax; class Network; class Graph; class Corner; +class StaState; // Sdf index is: // sdf_min = 0 diff --git a/sdf/SdfWriter.cc b/sdf/SdfWriter.cc index 88dad4de..def2cc2e 100644 --- a/sdf/SdfWriter.cc +++ b/sdf/SdfWriter.cc @@ -14,27 +14,28 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "sdf/SdfWriter.hh" + #include #include -#include "Machine.hh" -#include "Zlib.hh" -#include "StaConfig.hh" // STA_VERSION -#include "Fuzzy.hh" -#include "StringUtil.hh" -#include "MinMaxValues.hh" -#include "Units.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Sdc.hh" -#include "Network.hh" -#include "Graph.hh" -#include "StaState.hh" -#include "Corner.hh" -#include "DcalcAnalysisPt.hh" -#include "GraphDelayCalc1.hh" -#include "PathAnalysisPt.hh" -#include "SdfWriter.hh" + +#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" namespace sta { diff --git a/sdf/SdfWriter.hh b/sdf/SdfWriter.hh index 92eaf39c..8d45b0b3 100644 --- a/sdf/SdfWriter.hh +++ b/sdf/SdfWriter.hh @@ -19,6 +19,7 @@ namespace sta { class StaState; +class Corner; void writeSdf(const char *filename, diff --git a/search/Bfs.cc b/search/Bfs.cc index 97f13108..426a5e04 100644 --- a/search/Bfs.cc +++ b/search/Bfs.cc @@ -14,18 +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 -#include "Machine.hh" -#include "Report.hh" -#include "Debug.hh" -#include "Mutex.hh" -#include "DispatchQueue.hh" -#include "Network.hh" -#include "Graph.hh" -#include "Levelize.hh" -#include "Sdc.hh" -#include "SearchPred.hh" -#include "Bfs.hh" + +#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" namespace sta { diff --git a/search/CheckMaxSkews.cc b/search/CheckMaxSkews.cc index d4a47701..26b31afa 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 "Machine.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" -#include "CheckMaxSkews.hh" +#include "search/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" namespace sta { diff --git a/search/CheckMaxSkews.hh b/search/CheckMaxSkews.hh index a6f12e1d..9bdac387 100644 --- a/search/CheckMaxSkews.hh +++ b/search/CheckMaxSkews.hh @@ -16,12 +16,12 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" -#include "Delay.hh" -#include "PathRef.hh" +#include "util/DisallowCopyAssign.hh" +#include "graph/GraphClass.hh" +#include "graph/Delay.hh" +#include "search/StaState.hh" +#include "search/SearchClass.hh" +#include "search/PathRef.hh" namespace sta { diff --git a/search/CheckMinPeriods.cc b/search/CheckMinPeriods.cc index a12d4bb0..80c51170 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 "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Clock.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "DcalcAnalysisPt.hh" -#include "GraphDelayCalc.hh" -#include "Search.hh" -#include "CheckMinPeriods.hh" +#include "search/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" namespace sta { diff --git a/search/CheckMinPeriods.hh b/search/CheckMinPeriods.hh index 96f26972..d927a94b 100644 --- a/search/CheckMinPeriods.hh +++ b/search/CheckMinPeriods.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" -#include "Delay.hh" +#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" namespace sta { diff --git a/search/CheckMinPulseWidths.cc b/search/CheckMinPulseWidths.cc index 2c63f318..3b492a57 100644 --- a/search/CheckMinPulseWidths.cc +++ b/search/CheckMinPulseWidths.cc @@ -14,28 +14,28 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.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 "ClkInfo.hh" -#include "Tag.hh" -#include "PathVertex.hh" -#include "PathRef.hh" -#include "Corner.hh" -#include "DcalcAnalysisPt.hh" -#include "GraphDelayCalc.hh" -#include "PathAnalysisPt.hh" -#include "SearchPred.hh" -#include "PathEnd.hh" -#include "Search.hh" #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" + namespace sta { static void diff --git a/search/CheckMinPulseWidths.hh b/search/CheckMinPulseWidths.hh index 21a6104c..34403cfa 100644 --- a/search/CheckMinPulseWidths.hh +++ b/search/CheckMinPulseWidths.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" -#include "StaState.hh" -#include "PathRef.hh" +#include "util/DisallowCopyAssign.hh" +#include "sdc/SdcClass.hh" +#include "search/SearchClass.hh" +#include "search/StaState.hh" +#include "search/PathRef.hh" namespace sta { diff --git a/search/CheckSlewLimits.cc b/search/CheckSlewLimits.cc index 514a60aa..531317c3 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 "Machine.hh" -#include "Fuzzy.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "StaState.hh" -#include "DcalcAnalysisPt.hh" -#include "Corner.hh" -#include "GraphDelayCalc.hh" -#include "PathVertex.hh" -#include "Search.hh" -#include "CheckSlewLimits.hh" +#include "search/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" namespace sta { diff --git a/search/CheckSlewLimits.hh b/search/CheckSlewLimits.hh index f44f022a..ee4e6f09 100644 --- a/search/CheckSlewLimits.hh +++ b/search/CheckSlewLimits.hh @@ -16,16 +16,18 @@ #pragma once -#include "MinMax.hh" -#include "Transition.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "Delay.hh" +#include "util/MinMax.hh" +#include "liberty/Transition.hh" +#include "network/NetworkClass.hh" +#include "graph/GraphClass.hh" +#include "graph/Delay.hh" +#include "sdc/SdcClass.hh" namespace sta { class StaState; class DcalcAnalysisPt; +class Corner; class CheckSlewLimits { diff --git a/search/CheckTiming.cc b/search/CheckTiming.cc index 9d399e6b..3131cf70 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 "Machine.hh" -#include "Error.hh" -#include "PortDirection.hh" -#include "TimingRole.hh" -#include "Network.hh" -#include "NetworkCmp.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" -#include "CheckTiming.hh" +#include "search/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" namespace sta { diff --git a/search/CheckTiming.hh b/search/CheckTiming.hh index dcaa1885..0f634fa2 100644 --- a/search/CheckTiming.hh +++ b/search/CheckTiming.hh @@ -16,11 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "StringSeq.hh" -#include "NetworkClass.hh" -#include "StaState.hh" +#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" namespace sta { diff --git a/search/ClkInfo.cc b/search/ClkInfo.cc index 704ff6d0..74feaf79 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 "Machine.hh" -#include "Network.hh" -#include "Graph.hh" -#include "Sdc.hh" -#include "Corner.hh" -#include "Search.hh" -#include "Tag.hh" -#include "PathAnalysisPt.hh" -#include "ClkInfo.hh" +#include "search/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" namespace sta { diff --git a/search/ClkSkew.cc b/search/ClkSkew.cc index 4b1a852f..1d8609a7 100644 --- a/search/ClkSkew.cc +++ b/search/ClkSkew.cc @@ -14,25 +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 // abs -#include "Machine.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" -#include "ClkSkew.hh" + +#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" namespace sta { diff --git a/search/ClkSkew.hh b/search/ClkSkew.hh index 274e7755..11b26af1 100644 --- a/search/ClkSkew.hh +++ b/search/ClkSkew.hh @@ -16,8 +16,10 @@ #pragma once -#include "Map.hh" -#include "SdcClass.hh" +#include "util/Map.hh" +#include "sdc/SdcClass.hh" +#include "search/StaState.hh" +#include "search/SearchClass.hh" namespace sta { diff --git a/search/Corner.cc b/search/Corner.cc index ad1aba5d..b490449b 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 "Machine.hh" -#include "Sdc.hh" -#include "Parasitics.hh" -#include "DcalcAnalysisPt.hh" -#include "PathAnalysisPt.hh" -#include "Corner.hh" +#include "search/Corner.hh" + +#include "sdc/Sdc.hh" +#include "parasitics/Parasitics.hh" +#include "dcalc/DcalcAnalysisPt.hh" +#include "search/PathAnalysisPt.hh" namespace sta { diff --git a/search/Crpr.cc b/search/Crpr.cc index e19aa6e5..4660f8d3 100644 --- a/search/Crpr.cc +++ b/search/Crpr.cc @@ -14,26 +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 // abs #include -#include "Machine.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" -#include "Crpr.hh" + +#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" namespace sta { diff --git a/search/Crpr.hh b/search/Crpr.hh index 27f1a218..e9df6e92 100644 --- a/search/Crpr.hh +++ b/search/Crpr.hh @@ -16,9 +16,10 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "sdc/SdcClass.hh" +#include "search/StaState.hh" +#include "search/SearchClass.hh" namespace sta { diff --git a/search/FindRegister.cc b/search/FindRegister.cc index c5a5659e..0b4626f7 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 "Machine.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 "SearchPred.hh" -#include "Search.hh" -#include "Clock.hh" -#include "FindRegister.hh" +#include "search/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" namespace sta { diff --git a/search/FindRegister.hh b/search/FindRegister.hh index 818a9473..577277aa 100644 --- a/search/FindRegister.hh +++ b/search/FindRegister.hh @@ -16,10 +16,10 @@ #pragma once -#include "StaState.hh" -#include "LibertyClass.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" +#include "liberty/LibertyClass.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/GatedClk.cc b/search/GatedClk.cc index 07e3294e..7d6535d6 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 "Machine.hh" -#include "FuncExpr.hh" -#include "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Graph.hh" -#include "Sdc.hh" -#include "Search.hh" -#include "GatedClk.hh" +#include "search/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" namespace sta { diff --git a/search/GatedClk.hh b/search/GatedClk.hh index 2a1f6657..04b0d362 100644 --- a/search/GatedClk.hh +++ b/search/GatedClk.hh @@ -16,9 +16,10 @@ #pragma once -#include "SdcClass.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" +#include "sdc/SdcClass.hh" +#include "graph/GraphClass.hh" +#include "search/SearchClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/Genclks.cc b/search/Genclks.cc index 8786cc28..d3f4c987 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 "Machine.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" -#include "Genclks.hh" +#include "search/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" namespace sta { diff --git a/search/Genclks.hh b/search/Genclks.hh index c4b24f94..da29072b 100644 --- a/search/Genclks.hh +++ b/search/Genclks.hh @@ -16,12 +16,13 @@ #pragma once -#include "Map.hh" -#include "Transition.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" -#include "SearchClass.hh" +#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" namespace sta { diff --git a/search/Latches.cc b/search/Latches.cc index 8a92e429..32ecd656 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 "Machine.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 "Latches.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/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 "search/Latches.hh" namespace sta { diff --git a/search/Latches.hh b/search/Latches.hh index d12bfa62..fc937907 100644 --- a/search/Latches.hh +++ b/search/Latches.hh @@ -18,8 +18,9 @@ namespace sta { -#include "GraphClass.hh" -#include "SearchClass.hh" +#include "graph/GraphClass.hh" +#include "search/SearchClass.hh" +#include "search/StaState.hh" enum class LatchEnableState { enabled, open, closed }; diff --git a/search/Levelize.cc b/search/Levelize.cc index 6785439f..1069c29a 100644 --- a/search/Levelize.cc +++ b/search/Levelize.cc @@ -14,20 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include -#include "Machine.hh" -#include "Report.hh" -#include "Debug.hh" -#include "Stats.hh" -#include "TimingRole.hh" -#include "PortDirection.hh" -#include "Network.hh" -#include "Graph.hh" -#include "GraphCmp.hh" -#include "SearchPred.hh" -#include "Sdc.hh" #include "Levelize.hh" +#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" + namespace sta { using std::max; diff --git a/search/Levelize.hh b/search/Levelize.hh index c11285ff..11b9c9fa 100644 --- a/search/Levelize.hh +++ b/search/Levelize.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "StaState.hh" -#include "NetworkClass.hh" -#include "SdcClass.hh" -#include "GraphClass.hh" +#include "util/DisallowCopyAssign.hh" +#include "network/NetworkClass.hh" +#include "sdc/SdcClass.hh" +#include "graph/GraphClass.hh" +#include "search/StaState.hh" namespace sta { diff --git a/search/Path.cc b/search/Path.cc index acc80fd1..dc763ef3 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 "Machine.hh" -#include "TimingArc.hh" -#include "Network.hh" -#include "Graph.hh" -#include "Clock.hh" -#include "Tag.hh" -#include "Corner.hh" -#include "DcalcAnalysisPt.hh" -#include "PathAnalysisPt.hh" -#include "PathRef.hh" -#include "Path.hh" +#include "search/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" namespace sta { diff --git a/search/PathAnalysisPt.cc b/search/PathAnalysisPt.cc index feee04fa..3827441c 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 "Machine.hh" -#include "StringUtil.hh" -#include "Corner.hh" -#include "Search.hh" -#include "PathAnalysisPt.hh" +#include "search/PathAnalysisPt.hh" + +#include "util/StringUtil.hh" +#include "search/Corner.hh" +#include "search/Search.hh" namespace sta { diff --git a/search/PathEnd.cc b/search/PathEnd.cc index 68954cbd..fb166a62 100644 --- a/search/PathEnd.cc +++ b/search/PathEnd.cc @@ -14,28 +14,28 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.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 "PathEnd.hh" +#include "search/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" namespace sta { diff --git a/search/PathEnum.cc b/search/PathEnum.cc index 9ab1f8a0..7808d936 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 "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Debug.hh" -#include "Error.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" -#include "PathEnum.hh" -#include "Fuzzy.hh" +#include "search/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" namespace sta { diff --git a/search/PathEnum.hh b/search/PathEnum.hh index 247579b2..371e4a4d 100644 --- a/search/PathEnum.hh +++ b/search/PathEnum.hh @@ -17,12 +17,13 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "Iterator.hh" -#include "Vector.hh" -#include "StaState.hh" -#include "SearchClass.hh" -#include "Path.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/Iterator.hh" +#include "util/Vector.hh" +#include "search/StaState.hh" +#include "search/SearchClass.hh" +#include "search/Path.hh" namespace sta { diff --git a/search/PathEnumed.cc b/search/PathEnumed.cc index 574fef12..e9aec9c6 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 "Machine.hh" -#include "Set.hh" -#include "Graph.hh" -#include "Corner.hh" -#include "Search.hh" -#include "Tag.hh" -#include "PathRef.hh" -#include "PathEnumed.hh" +#include "search/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" namespace sta { diff --git a/search/PathEnumed.hh b/search/PathEnumed.hh index cf7fc518..d4707e65 100644 --- a/search/PathEnumed.hh +++ b/search/PathEnumed.hh @@ -16,8 +16,8 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Path.hh" +#include "util/DisallowCopyAssign.hh" +#include "search/Path.hh" namespace sta { diff --git a/search/PathExpanded.cc b/search/PathExpanded.cc index 4b0774cb..7a083b10 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 "Machine.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" -#include "PathExpanded.hh" +#include "search/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" namespace sta { diff --git a/search/PathGroup.cc b/search/PathGroup.cc index b7585c63..65cd8270 100644 --- a/search/PathGroup.cc +++ b/search/PathGroup.cc @@ -14,26 +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 #include -#include "Machine.hh" -#include "Stats.hh" -#include "Debug.hh" -#include "Mutex.hh" -#include "Fuzzy.hh" -#include "MinMax.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" -#include "DispatchQueue.hh" -#include "PathGroup.hh" + +#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" namespace sta { diff --git a/search/PathRef.cc b/search/PathRef.cc index 33579068..8cc2cbca 100644 --- a/search/PathRef.cc +++ b/search/PathRef.cc @@ -14,13 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "Graph.hh" -#include "TagGroup.hh" -#include "PathEnumed.hh" -#include "PathVertex.hh" -#include "Search.hh" -#include "PathRef.hh" +#include "search/PathRef.hh" + +#include "graph/Graph.hh" +#include "search/TagGroup.hh" +#include "search/PathEnumed.hh" +#include "search/PathVertex.hh" +#include "search/Search.hh" + namespace sta { diff --git a/search/PathRef.hh b/search/PathRef.hh index d7ef4f57..92572186 100644 --- a/search/PathRef.hh +++ b/search/PathRef.hh @@ -16,11 +16,11 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "SearchClass.hh" -#include "Path.hh" -#include "PathVertex.hh" +#include "util/DisallowCopyAssign.hh" +#include "util/Vector.hh" +#include "search/SearchClass.hh" +#include "search/Path.hh" +#include "search/PathVertex.hh" namespace sta { diff --git a/search/PathVertex.cc b/search/PathVertex.cc index f8cde386..d074b33a 100644 --- a/search/PathVertex.cc +++ b/search/PathVertex.cc @@ -14,22 +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 -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Fuzzy.hh" -#include "Graph.hh" -#include "ExceptionPath.hh" -#include "Sdc.hh" -#include "Corner.hh" -#include "GraphDelayCalc.hh" -#include "Tag.hh" -#include "TagGroup.hh" -#include "PathAnalysisPt.hh" -#include "PathRef.hh" -#include "PathVertexRep.hh" -#include "Search.hh" -#include "PathVertex.hh" + +#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" namespace sta { diff --git a/search/PathVertex.hh b/search/PathVertex.hh index 578639eb..5470a399 100644 --- a/search/PathVertex.hh +++ b/search/PathVertex.hh @@ -16,9 +16,9 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "SearchClass.hh" -#include "Path.hh" +#include "util/DisallowCopyAssign.hh" +#include "search/SearchClass.hh" +#include "search/Path.hh" namespace sta { diff --git a/search/PathVertexRep.cc b/search/PathVertexRep.cc index fc4ab6bd..afea247a 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 "Machine.hh" -#include "Graph.hh" -#include "SearchClass.hh" -#include "Tag.hh" -#include "TagGroup.hh" -#include "Search.hh" -#include "PathVertex.hh" -#include "PathVertexRep.hh" +#include "search/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" namespace sta { diff --git a/search/PathVertexRep.hh b/search/PathVertexRep.hh index 63fa6d7f..6011a244 100644 --- a/search/PathVertexRep.hh +++ b/search/PathVertexRep.hh @@ -16,7 +16,8 @@ #pragma once -#include "SearchClass.hh" +#include "sdc/SdcClass.hh" +#include "search/SearchClass.hh" namespace sta { diff --git a/search/Power.cc b/search/Power.cc index 0c9a82da..80fa7a19 100644 --- a/search/Power.cc +++ b/search/Power.cc @@ -14,34 +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 // max -#include "Machine.hh" -#include "Debug.hh" -#include "EnumNameMap.hh" -#include "Units.hh" -#include "Transition.hh" -#include "MinMax.hh" -#include "Clock.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 "Graph.hh" -#include "Corner.hh" -#include "Sdc.hh" -#include "DcalcAnalysisPt.hh" -#include "GraphDelayCalc.hh" -#include "PathVertex.hh" -#include "Levelize.hh" -#include "Sim.hh" -#include "Search.hh" -#include "Bfs.hh" -#include "Power.hh" + +#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" // Related liberty not supported: // library diff --git a/search/Property.cc b/search/Property.cc index 4226cc6d..d8b0515f 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 "Machine.hh" -#include "StringUtil.hh" -#include "MinMax.hh" -#include "Transition.hh" -#include "PortDirection.hh" -#include "Units.hh" -#include "TimingArc.hh" -#include "Liberty.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" -#include "Property.hh" +#include "search/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" namespace sta { diff --git a/search/ReportPath.cc b/search/ReportPath.cc index 71110744..b6ba9798 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 "Machine.hh" -#include "Report.hh" -#include "Error.hh" -#include "StringUtil.hh" -#include "Units.hh" -#include "Fuzzy.hh" -#include "TimingRole.hh" -#include "Transition.hh" -#include "PortDirection.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "PortDelay.hh" -#include "ExceptionPath.hh" -#include "InputDrive.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "ClkInfo.hh" -#include "Tag.hh" -#include "PathVertex.hh" -#include "DcalcAnalysisPt.hh" -#include "ArcDelayCalc.hh" -#include "GraphDelayCalc.hh" -#include "Parasitics.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" -#include "ReportPath.hh" +#include "search/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" namespace sta { diff --git a/search/ReportPath.hh b/search/ReportPath.hh index e41e58d5..52176c55 100644 --- a/search/ReportPath.hh +++ b/search/ReportPath.hh @@ -17,10 +17,11 @@ #pragma once #include -#include "DisallowCopyAssign.hh" -#include "StringSeq.hh" -#include "SearchClass.hh" -#include "PathEnd.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/StringSeq.hh" +#include "search/SearchClass.hh" +#include "search/PathEnd.hh" namespace sta { diff --git a/search/Search.cc b/search/Search.cc index 9bf9f165..7654de08 100644 --- a/search/Search.cc +++ b/search/Search.cc @@ -14,54 +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 #include // abs -#include "Machine.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 "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Graph.hh" -#include "GraphCmp.hh" -#include "Levelize.hh" -#include "PortDelay.hh" -#include "Clock.hh" -#include "CycleAccting.hh" -#include "ExceptionPath.hh" -#include "DataCheck.hh" -#include "Sdc.hh" -#include "SearchPred.hh" -#include "Bfs.hh" -#include "DcalcAnalysisPt.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" -#include "Search.hh" + +#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" namespace sta { diff --git a/search/SearchPred.cc b/search/SearchPred.cc index 0354e1a7..96c5c466 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 "Machine.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" -#include "SearchPred.hh" +#include "search/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" namespace sta { diff --git a/search/Sim.cc b/search/Sim.cc index 70e8bbfd..05fed82a 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 "Machine.hh" -#include "StaConfig.hh" // CUDD -#include "Error.hh" -#include "Mutex.hh" -#include "Debug.hh" -#include "Report.hh" -#include "Stats.hh" -#include "PortDirection.hh" -#include "FuncExpr.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "Sim.hh" +#include "search/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" #if CUDD // https://davidkebo.com/cudd diff --git a/search/Sim.hh b/search/Sim.hh index c25dd038..b7a333cd 100644 --- a/search/Sim.hh +++ b/search/Sim.hh @@ -18,13 +18,14 @@ #include #include -#include "StaConfig.hh" // CUDD -#include "DisallowCopyAssign.hh" -#include "Map.hh" -#include "StaState.hh" -#include "NetworkClass.hh" -#include "GraphClass.hh" -#include "SdcClass.hh" + +#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" struct DdNode; struct DdManager; diff --git a/search/Sta.cc b/search/Sta.cc index d70f4fae..f1900bfa 100644 --- a/search/Sta.cc +++ b/search/Sta.cc @@ -14,9 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "sta/Sta.hh" - -#include +#include "search/Sta.hh" #include "util/DispatchQueue.hh" #include "util/ReportTcl.hh" diff --git a/search/StaState.cc b/search/StaState.cc index 74b72275..ed2d0f32 100644 --- a/search/StaState.cc +++ b/search/StaState.cc @@ -14,12 +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 -#include "Machine.hh" -#include "Units.hh" -#include "Network.hh" -#include "DispatchQueue.hh" -#include "StaState.hh" + +#include "util/DispatchQueue.hh" +#include "liberty/Units.hh" +#include "network/Network.hh" namespace sta { diff --git a/search/StaState.hh b/search/StaState.hh index 03d1fa2c..92bb4765 100644 --- a/search/StaState.hh +++ b/search/StaState.hh @@ -16,7 +16,7 @@ #pragma once -#include "DisallowCopyAssign.hh" +#include "util/DisallowCopyAssign.hh" namespace sta { diff --git a/search/Tag.cc b/search/Tag.cc index e116556c..02a2f6e6 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 "Machine.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" -#include "Tag.hh" +#include "search/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" namespace sta { diff --git a/search/Tag.hh b/search/Tag.hh index 3539ff15..c7904e9d 100644 --- a/search/Tag.hh +++ b/search/Tag.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Vector.hh" -#include "Set.hh" -#include "SearchClass.hh" -#include "SdcClass.hh" -#include "Transition.hh" -#include "PathRef.hh" +#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" namespace sta { diff --git a/search/TagGroup.cc b/search/TagGroup.cc index 15259463..68762201 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 "Machine.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" -#include "TagGroup.hh" +#include "search/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" namespace sta { diff --git a/search/TagGroup.hh b/search/TagGroup.hh index c0cffac6..e5b61fa9 100644 --- a/search/TagGroup.hh +++ b/search/TagGroup.hh @@ -16,15 +16,15 @@ #pragma once -#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" +#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" namespace sta { diff --git a/search/VertexVisitor.cc b/search/VertexVisitor.cc index 6c3f44ca..ee2513ae 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 "Machine.hh" -#include "Error.hh" -#include "Graph.hh" -#include "VertexVisitor.hh" +#include "search/VertexVisitor.hh" + +#include "util/Error.hh" +#include "graph/Graph.hh" namespace sta { diff --git a/search/VisitPathEnds.cc b/search/VisitPathEnds.cc index e9fc567f..a6f27c8c 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 "Machine.hh" -#include "Debug.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "ExceptionPath.hh" -#include "PortDelay.hh" -#include "Sdc.hh" -#include "TimingArc.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" -#include "VisitPathEnds.hh" +#include "search/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" namespace sta { diff --git a/search/VisitPathGroupVertices.cc b/search/VisitPathGroupVertices.cc index 1b0762db..36b19a82 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 "Machine.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" -#include "VisitPathGroupVertices.hh" +#include "search/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" namespace sta { diff --git a/search/WorstSlack.cc b/search/WorstSlack.cc index 59e5bfa4..bafe9d67 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 "Machine.hh" -#include "Mutex.hh" -#include "Debug.hh" -#include "Report.hh" -#include "Graph.hh" -#include "Corner.hh" -#include "Search.hh" -#include "PathAnalysisPt.hh" -#include "WorstSlack.hh" +#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 "search/WorstSlack.hh" namespace sta { diff --git a/search/WorstSlack.hh b/search/WorstSlack.hh index 0d17cd7e..60c2bc1b 100644 --- a/search/WorstSlack.hh +++ b/search/WorstSlack.hh @@ -19,10 +19,11 @@ namespace sta { #include -#include "MinMax.hh" -#include "Vector.hh" -#include "GraphClass.hh" -#include "SearchClass.hh" + +#include "util/MinMax.hh" +#include "util/Vector.hh" +#include "graph/GraphClass.hh" +#include "search/SearchClass.hh" class StaState; class WorstSlack; diff --git a/search/WritePathSpice.cc b/search/WritePathSpice.cc index 5664ddf6..d8e151ed 100644 --- a/search/WritePathSpice.cc +++ b/search/WritePathSpice.cc @@ -14,33 +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 #include #include -#include "Machine.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" -#include "WritePathSpice.hh" + +#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" namespace sta { diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i index 8493b9ac..91fa287f 100644 --- a/tcl/StaTcl.i +++ b/tcl/StaTcl.i @@ -34,53 +34,50 @@ //////////////////////////////////////////////////////////////// #include -#include "Machine.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 "PortDirection.hh" -#include "FuncExpr.hh" -#include "Units.hh" -#include "MinMax.hh" -#include "Transition.hh" -#include "TimingRole.hh" -#include "TimingArc.hh" -#include "Liberty.hh" -#include "EquivCells.hh" -#include "Network.hh" -#include "Clock.hh" -#include "PortDelay.hh" -#include "ExceptionPath.hh" -#include "Sdc.hh" -#include "Graph.hh" -#include "Parasitics.hh" -#include "Wireload.hh" -#include "DelayCalc.hh" -#include "DcalcAnalysisPt.hh" -#include "Corner.hh" -#include "Tag.hh" -#include "PathVertex.hh" -#include "PathRef.hh" -#include "PathExpanded.hh" -#include "PathEnd.hh" -#include "PathGroup.hh" -#include "CheckTiming.hh" -#include "CheckMinPulseWidths.hh" -#include "Levelize.hh" -#include "Bfs.hh" -#include "Search.hh" -#include "SearchPred.hh" -#include "PathAnalysisPt.hh" -#include "ReportPath.hh" -#include "Power.hh" -#include "Property.hh" -#include "WritePathSpice.hh" -#include "Sta.hh" + +#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 "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 3d435227..81c2be21 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 "Machine.hh" -#include "Report.hh" -#include "Debug.hh" +#include "util/Debug.hh" + +#include "util/Report.hh" namespace sta { diff --git a/util/DispatchQueue.cc b/util/DispatchQueue.cc index d59fdf18..39e9509a 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 "DispatchQueue.hh" +#include "util/DispatchQueue.hh" namespace sta { diff --git a/util/Error.cc b/util/Error.cc index 0215781e..74c8d03e 100644 --- a/util/Error.cc +++ b/util/Error.cc @@ -14,11 +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 #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "Error.hh" + +#include "util/StringUtil.hh" namespace sta { diff --git a/util/Fuzzy.cc b/util/Fuzzy.cc index ed718ea7..54d6f6e8 100644 --- a/util/Fuzzy.cc +++ b/util/Fuzzy.cc @@ -14,10 +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 // max #include // abs -#include "Machine.hh" -#include "MinMax.hh" // INF + +#include "util/MinMax.hh" // INF namespace sta { diff --git a/util/Hash.cc b/util/Hash.cc index f33f007a..b202bb84 100644 --- a/util/Hash.cc +++ b/util/Hash.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/Hash.hh" + #include -#include "Machine.hh" -#include "Hash.hh" namespace sta { diff --git a/util/Machine.cc b/util/Machine.cc index 15654b29..f89f0050 100644 --- a/util/Machine.cc +++ b/util/Machine.cc @@ -14,12 +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" + #if defined(_WINDOWS) || defined(_WIN32) #include #include // GetSystemInfo -#include "Machine.hh" -#include "StaConfig.hh" + +#include "util/StaConfig.hh" namespace sta { @@ -94,9 +96,9 @@ memoryUsage() #include #include #include -#include "Machine.hh" -#include "StaConfig.hh" -#include "StringUtil.hh" + +#include "util/StaConfig.hh" +#include "util/StringUtil.hh" namespace sta { diff --git a/util/Machine.hh b/util/Machine.hh index 9889abe9..bb26047f 100644 --- a/util/Machine.hh +++ b/util/Machine.hh @@ -98,11 +98,5 @@ systemRunTime(); size_t memoryUsage(); -#if __WORDSIZE == 64 - #define hashPtr(ptr) (reinterpret_cast(ptr) >> 3) -#else - #define hashPtr(ptr) (reinterpret_cast(ptr) >> 2) -#endif - } // namespace sta diff --git a/util/MinMax.cc b/util/MinMax.cc index 68001227..fac6157c 100644 --- a/util/MinMax.cc +++ b/util/MinMax.cc @@ -14,10 +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 -#include "Machine.hh" -#include "StringUtil.hh" -#include "MinMax.hh" + +#include "util/StringUtil.hh" namespace sta { diff --git a/util/PatternMatch.cc b/util/PatternMatch.cc index 6fea5eed..2002cea4 100644 --- a/util/PatternMatch.cc +++ b/util/PatternMatch.cc @@ -14,13 +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 #include #include #include -#include "Machine.hh" -#include "StringUtil.hh" -#include "PatternMatch.hh" + +#include "util/StringUtil.hh" namespace sta { diff --git a/util/Report.cc b/util/Report.cc index 89b577a4..16fb9aa0 100644 --- a/util/Report.cc +++ b/util/Report.cc @@ -14,10 +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 // min -#include "Machine.hh" -#include "Error.hh" -#include "Report.hh" + +#include "util/Error.hh" +#include "util/Machine.hh" namespace sta { diff --git a/util/ReportStd.cc b/util/ReportStd.cc index 9ff40455..3954f159 100644 --- a/util/ReportStd.cc +++ b/util/ReportStd.cc @@ -14,12 +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 #include -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Report.hh" -#include "ReportStd.hh" + +#include "util/DisallowCopyAssign.hh" +#include "util/Report.hh" namespace sta { diff --git a/util/ReportTcl.cc b/util/ReportTcl.cc index 9c5dc2a6..466bd652 100644 --- a/util/ReportTcl.cc +++ b/util/ReportTcl.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 "util/ReportTcl.hh" + #include #include -#include "Machine.hh" -#include "ReportTcl.hh" namespace sta { diff --git a/util/Stats.cc b/util/Stats.cc index 19449f8d..41a7de62 100644 --- a/util/Stats.cc +++ b/util/Stats.cc @@ -14,10 +14,11 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringUtil.hh" -#include "Debug.hh" -#include "Stats.hh" +#include "util/Stats.hh" + +#include "util/StringUtil.hh" +#include "util/Debug.hh" +#include "util/Machine.hh" namespace sta { diff --git a/util/StringSeq.cc b/util/StringSeq.cc index 51806b52..76d71dde 100644 --- a/util/StringSeq.cc +++ b/util/StringSeq.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringSeq.hh" +#include "util/StringSeq.hh" namespace sta { diff --git a/util/StringSet.cc b/util/StringSet.cc index 286f23a2..2d0cc52a 100644 --- a/util/StringSet.cc +++ b/util/StringSet.cc @@ -14,8 +14,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "StringSet.hh" +#include "util/StringSet.hh" namespace sta { diff --git a/util/StringUtil.cc b/util/StringUtil.cc index a549e5f3..1d3cbd38 100644 --- a/util/StringUtil.cc +++ b/util/StringUtil.cc @@ -14,13 +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 #include #include -#include -#include "Machine.hh" -#include "Mutex.hh" -#include "StringUtil.hh" + +#include "util/Mutex.hh" +#include "util/Machine.hh" namespace sta { diff --git a/util/TokenParser.cc b/util/TokenParser.cc index 817ac073..4bf06d78 100644 --- a/util/TokenParser.cc +++ b/util/TokenParser.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 "util/TokenParser.hh" + #include #include -#include "Machine.hh" -#include "TokenParser.hh" namespace sta { diff --git a/verilog/Verilog.i b/verilog/Verilog.i index 34f7609a..1f0347fc 100644 --- a/verilog/Verilog.i +++ b/verilog/Verilog.i @@ -18,9 +18,9 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "VerilogReader.hh" -#include "VerilogWriter.hh" -#include "Sta.hh" +#include "verilog/VerilogReader.hh" +#include "verilog/VerilogWriter.hh" +#include "search/Sta.hh" using sta::Sta; using sta::NetworkReader; diff --git a/verilog/VerilogLex.ll b/verilog/VerilogLex.ll index 2d9e6fbe..87f455a6 100644 --- a/verilog/VerilogLex.ll +++ b/verilog/VerilogLex.ll @@ -16,11 +16,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "Machine.hh" -#include "FlexPragma.hh" -#include "Debug.hh" -#include "VerilogNamespace.hh" -#include "VerilogReaderPvt.hh" +#include "util/FlexPragma.hh" +#include "util/Debug.hh" +#include "network/VerilogNamespace.hh" +#include "verilog/VerilogReaderPvt.hh" #include "VerilogParse.hh" #define YY_NO_INPUT diff --git a/verilog/VerilogParse.yy b/verilog/VerilogParse.yy index a989296d..8e30ac97 100644 --- a/verilog/VerilogParse.yy +++ b/verilog/VerilogParse.yy @@ -17,10 +17,10 @@ // along with this program. If not, see . #include -#include "Machine.hh" -#include "PortDirection.hh" -#include "VerilogReaderPvt.hh" -#include "VerilogReader.hh" + +#include "network/PortDirection.hh" +#include "verilog/VerilogReaderPvt.hh" +#include "verilog/VerilogReader.hh" int VerilogLex_lex(); #define VerilogParse_lex VerilogLex_lex diff --git a/verilog/VerilogReader.cc b/verilog/VerilogReader.cc index 38082c5c..1ff1c829 100644 --- a/verilog/VerilogReader.cc +++ b/verilog/VerilogReader.cc @@ -14,19 +14,20 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "verilog/VerilogReader.hh" + #include -#include "Machine.hh" -#include "DisallowCopyAssign.hh" -#include "Debug.hh" -#include "Report.hh" -#include "Error.hh" -#include "Stats.hh" -#include "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "VerilogNamespace.hh" -#include "VerilogReaderPvt.hh" -#include "VerilogReader.hh" + +#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 "verilog/VerilogReaderPvt.hh" extern int VerilogParse_parse(); diff --git a/verilog/VerilogReaderPvt.hh b/verilog/VerilogReaderPvt.hh index 33f83b69..7856b95f 100644 --- a/verilog/VerilogReaderPvt.hh +++ b/verilog/VerilogReaderPvt.hh @@ -16,13 +16,13 @@ #pragma once -#include "DisallowCopyAssign.hh" -#include "Zlib.hh" -#include "Vector.hh" -#include "Map.hh" -#include "StringSeq.hh" -#include "StringSet.hh" -#include "NetworkClass.hh" +#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" // Global namespace. #define YY_INPUT(buf,result,max_size) \ diff --git a/verilog/VerilogWriter.cc b/verilog/VerilogWriter.cc index 48c79037..a0fbe61a 100644 --- a/verilog/VerilogWriter.cc +++ b/verilog/VerilogWriter.cc @@ -14,15 +14,16 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "verilog/VerilogWriter.hh" + #include -#include "Machine.hh" -#include "Error.hh" -#include "PortDirection.hh" -#include "Liberty.hh" -#include "Network.hh" -#include "NetworkCmp.hh" -#include "VerilogNamespace.hh" -#include "VerilogWriter.hh" + +#include "util/Error.hh" +#include "liberty/Liberty.hh" +#include "network/PortDirection.hh" +#include "network/Network.hh" +#include "network/NetworkCmp.hh" +#include "network/VerilogNamespace.hh" namespace sta {