Skip to content

restored timing logic-level patch #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")

Expand Down
3 changes: 3 additions & 0 deletions include/base_fix/PATCHED/vpr_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_;

Expand Down
18 changes: 18 additions & 0 deletions include/tatum_fix/TimingReporter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions include/tatum_fix/TimingReporter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading