check_route: move option within check route function

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

vpr/src/base/vpr_api.cpp

@@ -710,13 +710,7 @@ RouteStatus vpr_route_flow(t_vpr_setup& vpr_setup, const t_arch& arch) {
         std::string graphics_msg;
         if (route_status.success()) {
             //Sanity check the routing
-            if (router_opts.check_route == e_check_route_option::QUICK) {
-                check_route(router_opts.route_type, /*quick=*/true);
-            } else if (router_opts.check_route == e_check_route_option::FULL) {
-                check_route(router_opts.route_type, /*quick=*/false);
-            } else {
-                VTR_LOG_WARN("The user disabled the check route step.");
-            }
+            check_route(router_opts.route_type, router_opts.check_route);
             get_serial_num();
 
             //Update status

vpr/src/route/check_route.cpp

@@ -34,13 +34,18 @@ static void check_net_for_stubs(ClusterNetId net);
 
 /************************ Subroutine definitions ****************************/
 
-void check_route(enum e_route_type route_type, bool quick) {
+void check_route(enum e_route_type route_type, e_check_route_option check_route_option) {
     /* This routine checks that a routing:  (1) Describes a properly         *
      * connected path for each net, (2) this path connects all the           *
      * pins spanned by that net, and (3) that no routing resources are       *
      * oversubscribed (the occupancy of everything is recomputed from        *
      * scratch).                                                             */
 
+    if (check_route_option == e_check_route_option::OFF) {
+        VTR_LOG_WARN("The user disabled the check route step.");
+        return;
+    }
+
     int max_pins, inode, prev_node;
     unsigned int ipin;
     bool valid, connects;
@@ -160,8 +165,10 @@ void check_route(enum e_route_type route_type, bool quick) {
 
     } /* End for each net */
 
-    if (!quick) {
+    if (check_route_option == e_check_route_option::FULL) {
         check_all_non_configurable_edges();
+    } else {
+        VTR_ASSERT(check_route_option == e_check_route_option::QUICK);
     }
 
     VTR_LOG("Completed routing consistency check successfully.\n");

vpr/src/route/check_route.h

@@ -1,9 +1,10 @@
 #ifndef VPR_CHECK_ROUTE_H
 #define VPR_CHECK_ROUTE_H
 #include "physical_types.h"
+#include "vpr_types.h"
 #include "route_common.h"
 
-void check_route(enum e_route_type route_type, bool quick);
+void check_route(enum e_route_type route_type, e_check_route_option check_route_option);
 
 void recompute_occupancy_from_scratch();