Throw error right after encountering negative slack

Author: jmah76

vpr/src/timing/timing_fail_error.cpp

@@ -9,35 +9,10 @@
 #include "timing_util.h"
 #include "timing_fail_error.h"
 
-/* True if negative final slack. */
-static bool failed_timing = false;
-
+/* Sets terminate_if_timing_fails in the timing context if the user has indicated
+ * terminate_if_timing_fails option should be on.
+ */
 void set_terminate_if_timing_fails(bool cmd_opt_terminate_if_timing_fails) {
     auto& timing_ctx = g_vpr_ctx.mutable_timing();
     timing_ctx.terminate_if_timing_fails = cmd_opt_terminate_if_timing_fails;
 }
-
-/* Checks if slack is negative, if routing is finished, and if user wants VPR flow to fail if their
- * design doesn't meet timingconstraints. If both conditions are true, failed_timing is set to True.
- */
-void check_if_failed_timing_constraints(double& slack, std::string prefix) {
-    // The error should only be thrown after routing. Checking that prefix == "Final" ensures that
-    // only negative slacks found after routing are considered.
-    auto& timing_ctx = g_vpr_ctx.timing();
-
-    if (timing_ctx.terminate_if_timing_fails && slack < 0 && prefix == "Final ") {
-        failed_timing = true;
-    }
-    return;
-}
-
-/* Throws an error if slack is negative and if user wants VPR flow to fail if their design doesn't meet timing
- * constraints. Called by print_timing_stats in main.cpp.
- */
-void error_if_timing_failed() {
-    if (failed_timing) {
-        std::string msg = "\nDesign did not meet timing constraints.\nTiming failed and terminate_if_timing_fails set -- exiting";
-        VPR_FATAL_ERROR(VPR_ERROR_TIMING, msg.c_str());
-    }
-    return;
-}

vpr/src/timing/timing_fail_error.h

@@ -7,14 +7,6 @@
 #include "tatum/timing_paths.hpp"
 #include "timing_util.h"
 
-/* Checks if slack is negative and if user wants VPR flow to fail if their desisn doesn't meet timing
- * constraints. If both conditions are true, the function adds details about the negative slack to a string
- * that will be printed when VPR throws an error.
- */
-void check_if_failed_timing_constraints(double& slack, std::string prefix);
-
-void error_if_timing_failed();
-
 /* Represents whether or not VPR should fail if timing constraints aren't met. */
 void set_terminate_if_timing_fails(bool cmd_opt_terminate_if_timing_fails);
 

vpr/src/timing/timing_util.cpp

@@ -417,8 +417,14 @@ void print_setup_timing_summary(const tatum::TimingConstraints& constraints,
 
     VTR_LOG("\n");
 
-    check_if_failed_timing_constraints(setup_worst_neg_slack, prefix);
-    check_if_failed_timing_constraints(setup_total_neg_slack, prefix);
+    /* If the terminate_if_timing fails option is on, this checks if slack is negative and if user wants VPR
+     * flow to fail if their design doesn't meet timing constraints. If both conditions are true, the function
+     * adds details about the negative slack to a string that will be printed when VPR throws an error.
+     */
+    if (timing_ctx.terminate_if_timing_fails && (setup_worst_neg_slack < 0 || setup_total_neg_slack < 0) && prefix == "Final ") {
+        std::string msg = "\nDesign did not meet timing constraints.\nTiming failed and terminate_if_timing_fails set -- exiting";
+        VPR_FATAL_ERROR(VPR_ERROR_TIMING, msg.c_str());
+    }
 }
 
 /*
@@ -597,7 +603,9 @@ std::vector<HistogramBucket> create_hold_slack_histogram(const tatum::HoldTiming
 }
 
 void print_hold_timing_summary(const tatum::TimingConstraints& constraints, const tatum::HoldTimingAnalyzer& hold_analyzer, std::string prefix) {
-    auto hold_worst_neg_slack = sec_to_nanosec(find_hold_worst_negative_slack(hold_analyzer));
+     auto& timing_ctx = g_vpr_ctx.timing();
+
+	auto hold_worst_neg_slack = sec_to_nanosec(find_hold_worst_negative_slack(hold_analyzer));
     auto hold_total_neg_slack = sec_to_nanosec(find_hold_total_negative_slack(hold_analyzer));
 
     VTR_LOG("%shold Worst Negative Slack (hWNS): %g ns\n", prefix.c_str(), hold_worst_neg_slack);
@@ -646,8 +654,14 @@ void print_hold_timing_summary(const tatum::TimingConstraints& constraints, cons
     }
     VTR_LOG("\n");
 
-    check_if_failed_timing_constraints(hold_worst_neg_slack, prefix);
-    check_if_failed_timing_constraints(hold_total_neg_slack, prefix);
+    /* If the terminate_if_timing fails option is on, this checks if slack is negative and if user wants VPR
+     * flow to fail if their design doesn't meet timing constraints. If both conditions are true, the function
+     * adds details about the negative slack to a string that will be printed when VPR throws an error.
+     */
+    if (timing_ctx.terminate_if_timing_fails && (hold_worst_neg_slack < 0 || hold_total_neg_slack < 0) && prefix == "Final ") {
+         std::string msg = "\nDesign did not meet timing constraints.\nTiming failed and terminate_if_timing_fails set -- exiting";
+         VPR_FATAL_ERROR(VPR_ERROR_TIMING, msg.c_str());
+     }
 }
 
 /*

vpr/src/util/vpr_utils.cpp

@@ -2022,5 +2022,4 @@ void print_timing_stats(std::string name,
             current.num_full_hold_updates - past.num_full_hold_updates,
             current.num_full_setup_hold_updates - past.num_full_setup_hold_updates);
 
-    error_if_timing_failed();
 }