[vpr] code cleanup

Author: oscarcheng105

libs/librrgraph/src/base/check_rr_graph.cpp

@@ -47,7 +47,7 @@ void check_rr_graph(const RRGraphView& rr_graph,
                     const DeviceGrid& grid,
                     const t_chan_width& chan_width,
                     const t_graph_type graph_type,
-                    int virtual_clock_network_root_idx) {
+                    const int virtual_clock_network_root_idx) {
     e_route_type route_type = DETAILED;
     if (graph_type == GRAPH_GLOBAL) {
         route_type = GLOBAL;
@@ -291,8 +291,8 @@ void check_rr_node(const RRGraphView& rr_graph,
                    const vtr::vector<RRIndexedDataId, t_rr_indexed_data>& rr_indexed_data,
                    const DeviceGrid& grid,
                    const t_chan_width& chan_width,
-                   enum e_route_type route_type, 
-                   int inode) {
+                   const enum e_route_type route_type, 
+                   const int inode) {
     /* This routine checks that the rr_node is inside the grid and has a valid
      * pin number, etc.
      */

libs/librrgraph/src/base/check_rr_graph.h

@@ -11,13 +11,13 @@ void check_rr_graph(const RRGraphView& rr_graph,
                     const DeviceGrid& grid,
                     const t_chan_width& chan_width,
                     const t_graph_type graph_type,
-                    int virtual_clock_network_root_idx);
+                    const int virtual_clock_network_root_idx);
 
 void check_rr_node(const RRGraphView& rr_graph,
                    const vtr::vector<RRIndexedDataId, t_rr_indexed_data>& rr_indexed_data,
                    const DeviceGrid& grid,
                    const t_chan_width& chan_width,
-                   enum e_route_type route_type, 
-                   int inode);
+                   const enum e_route_type route_type, 
+                   const int inode);
 
 #endif

libs/librrgraph/src/base/rr_graph_type.h

@@ -1,5 +1,5 @@
-#ifndef GRAPH_TYPE_H
-#define GRAPH_TYPE_H
+#ifndef RR_GRAPH_TYPE_H
+#define RR_GRAPH_TYPE_H
 
 #include <vector>
 #include "physical_types.h"

libs/librrgraph/src/io/rr_graph_writer.cpp

@@ -40,7 +40,7 @@ void write_rr_graph(RRGraphBuilder* rr_graph_builder,
                     const char* file_name,
                     const int virtual_clock_network_root_idx,
                     bool echo_enabled,
-                    const char* echo__file_name) {
+                    const char* echo_file_name) {
 
     RrGraphSerializer reader(
         /*graph_type=*/t_graph_type(),
@@ -51,7 +51,7 @@ void write_rr_graph(RRGraphBuilder* rr_graph_builder,
         /*read_rr_graph_filename=*/nullptr,
         /*read_edge_metadata=*/false,
         echo_enabled,
-        echo__file_name,
+        echo_file_name,
         chan_width,
         &rr_graph_builder->rr_nodes(),
         rr_graph_builder,

libs/librrgraph/src/io/rr_graph_writer.h

@@ -10,7 +10,6 @@
 #include "rr_graph_type.h"
 #include "rr_graph_builder.h"
 #include "rr_graph_view.h"
-#include "rr_graph_fwd.h"
 #include "device_grid.h"
 #include "physical_types.h"
 
@@ -27,6 +26,6 @@ void write_rr_graph(RRGraphBuilder* rr_graph_builder,
                     const char* file_name,
                     const int virtual_clock_network_root_idx,
                     bool echo_enabled,
-                    const char* echo__file_name);
+                    const char* echo_file_name);
 
 #endif

libs/librrgraph/src/utils/describe_rr_node.h

@@ -1,5 +1,5 @@
-#ifndef DESCRIBE_RR_NODE
-#define DESCRIBE_RR_NODE
+#ifndef DESCRIBE_RR_NODE_H
+#define DESCRIBE_RR_NODE_H
 
 #include <string>
 #include "rr_graph_view.h"

utils/fasm/src/fasm.cpp

@@ -635,7 +635,7 @@ void FasmWriterVisitor::walk_route_tree(const RRGraphBuilder& rr_graph_builder,
 
 void FasmWriterVisitor::walk_routing() {
     auto& route_ctx = g_vpr_ctx.mutable_routing();
-    auto& device_ctx = g_vpr_ctx.mutable_device();
+    const auto& device_ctx = g_vpr_ctx.device();
 
     for(const auto &trace : route_ctx.trace) {
       t_trace *head = trace.head;