Merge pull request #743 from os-fpga/restored_timing_logic_level_patch

restored timing logic-level patch

Author: serge-dsa

CMakeLists.txt

@@ -261,12 +261,12 @@ file(COPY ${ENCRYPTION_CONFIG_PATH}/config.txt
 #          ${LIB_RRG_DEST_DIR}/src/io)
 
 # Logical Levels
-#message(STATUS "NOTE: PATCHING TimingReporter")
-#FILE(COPY ${TATUM_SRC_DIR}/TimingReporter.hpp
-#          ${TATUM_SRC_DIR}/TimingReporter.cpp
-#          DESTINATION
-#          ${OPENFPGA_DEST_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/libtatum/libtatum/tatum
-#)
+message(STATUS "NOTE: PATCHING TimingReporter")
+FILE(COPY ${TATUM_SRC_DIR}/TimingReporter.hpp
+          ${TATUM_SRC_DIR}/TimingReporter.cpp
+          DESTINATION
+          ${OPENFPGA_DEST_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/libtatum/libtatum/tatum
+)
 
 ## Logical Levels
 FILE(COPY ${UTIL_SRC_DIR}/rsbe_utils.cpp
@@ -277,10 +277,10 @@ FILE(COPY ${UTIL_SRC_DIR}/rsbe_utils.cpp
 message(STATUS "NOTE: ADDED to VPR src/util: rsbe_utils.cpp,h")
 
 # Logical Levels
-#FILE(COPY ${ANALYSIS_SRC_DIR}/timing_reports.cpp
-#          DESTINATION
-#          ${VPR_DEST_DIR}/src/analysis
-#)
+FILE(COPY ${ANALYSIS_SRC_DIR}/timing_reports.cpp
+          DESTINATION
+          ${VPR_DEST_DIR}/src/analysis
+)
 
 message(STATUS "NOTE: DONE PATCHING\n")
 

include/base_fix/PATCHED/vpr_context.h

@@ -714,6 +714,9 @@ class VprContext : public Context {
     ServerContext& mutable_server() { return server_; }
 #endif /* NO_SERVER */
 
+    const rsbe::Levelized& logic_levels() const { return logic_levels_; }
+    rsbe::Levelized& mutable_logic_levels() { return logic_levels_; }
+
   private:
     DeviceContext device_;
 

include/tatum_fix/TimingReporter.cpp

@@ -99,6 +99,15 @@ void TimingReporter::report_timing_setup(std::ostream& os,
     report_timing(os, paths, num_logic_levels);
 }
 
+void TimingReporter::report_timing_setup(std::vector<tatum::TimingPath>& paths,
+                                         std::ostream& os,
+                                         const SetupTimingAnalyzer& setup_analyzer,
+                                         size_t npaths, const int num_logic_levels) const {
+    paths = path_collector_.collect_worst_setup_timing_paths(timing_graph_, setup_analyzer, npaths);
+
+    report_timing(os, paths, num_logic_levels);
+}
+
 void TimingReporter::report_timing_hold(std::string filename, 
                                          const HoldTimingAnalyzer& hold_analyzer,
                                          size_t npaths, const int num_logic_levels) const {
@@ -114,6 +123,15 @@ void TimingReporter::report_timing_hold(std::ostream& os,
     report_timing(os, paths, num_logic_levels);
 }
 
+void TimingReporter::report_timing_hold(std::vector<tatum::TimingPath>& paths,
+                                         std::ostream& os,
+                                         const HoldTimingAnalyzer& hold_analyzer,
+                                         size_t npaths, const int num_logic_levels) const {
+    paths = path_collector_.collect_worst_hold_timing_paths(timing_graph_, hold_analyzer, npaths);
+
+    report_timing(os, paths, num_logic_levels);
+}
+
 void TimingReporter::report_skew_setup(std::string filename, 
                                          const SetupTimingAnalyzer& setup_analyzer,
                                          size_t nworst) const {

include/tatum_fix/TimingReporter.hpp

@@ -64,9 +64,11 @@ class TimingReporter {
     public:
         void report_timing_setup(std::string filename, const tatum::SetupTimingAnalyzer& setup_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
         void report_timing_setup(std::ostream& os, const tatum::SetupTimingAnalyzer& setup_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
+        void report_timing_setup(std::vector<tatum::TimingPath>& paths, std::ostream& os, const tatum::SetupTimingAnalyzer& setup_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
 
         void report_timing_hold(std::string filename, const tatum::HoldTimingAnalyzer& hold_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
         void report_timing_hold(std::ostream& os, const tatum::HoldTimingAnalyzer& hold_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
+        void report_timing_hold(std::vector<tatum::TimingPath>& paths, std::ostream& os, const tatum::HoldTimingAnalyzer& hold_analyzer, size_t npaths=REPORT_TIMING_DEFAULT_NPATHS, const int num_logic_levels=0) const;
 
         void report_skew_setup(std::string filename, const tatum::SetupTimingAnalyzer& setup_analyzer, size_t nworst=REPORT_TIMING_DEFAULT_NPATHS) const;
         void report_skew_setup(std::ostream& os, const tatum::SetupTimingAnalyzer& setup_analyzer, size_t nworst=REPORT_TIMING_DEFAULT_NPATHS) const;