[vpr] categorize files to rr_graph_type & rr_graph_cost in librrgraph

Author: oscarcheng105

libs/libarchfpga/src/base_cost_type.h

@@ -1,13 +1,9 @@
 #ifndef CHECK_RR_GRAPH_H
 #define CHECK_RR_GRAPH_H
 
-#include "physical_types.h"
-#include "rr_graph_type.h"
 #include "device_grid.h"
-#include "route_type.h"
 #include "rr_graph_view.h"
-#include "chan_width.h"
-
+#include "rr_graph_type.h"
 
 void check_rr_graph(const RRGraphView& rr_graph,
                     const std::vector<t_physical_tile_type>& types,

libs/libarchfpga/src/chan_width.h

@@ -1,7 +1,7 @@
 #ifndef GET_PARALLEL_SEGS_H
 #define GET_PARALLEL_SEGS_H
 
-#include "unified_to_parallel_seg_index.h"
+#include "rr_graph_type.h"
 #include "physical_types.h"
 
 std::vector<t_segment_inf> get_parallel_segs(const std::vector<t_segment_inf>& segment_inf,

libs/libarchfpga/src/cost_indices.h

@@ -0,0 +1,23 @@
+#ifndef RR_GRAPH_COST_H
+#define RR_GRAPH_COST_H
+
+enum e_base_cost_type {
+    DELAY_NORMALIZED,
+    DELAY_NORMALIZED_LENGTH,
+    DELAY_NORMALIZED_FREQUENCY,
+    DELAY_NORMALIZED_LENGTH_FREQUENCY,
+    DELAY_NORMALIZED_LENGTH_BOUNDED,
+    DEMAND_ONLY,
+    DEMAND_ONLY_NORMALIZED_LENGTH
+};
+
+///@brief Index of the SOURCE, SINK, OPIN, IPIN, etc. member of device_ctx.rr_indexed_data.
+enum e_cost_indices {
+    SOURCE_COST_INDEX = 0,
+    SINK_COST_INDEX,
+    OPIN_COST_INDEX,
+    IPIN_COST_INDEX,
+    CHANX_COST_INDEX_START
+};
+
+#endif

libs/libarchfpga/src/route_type.h

@@ -6,6 +6,7 @@
 
 #include "vtr_vector.h"
 #include "physical_types.h"
+#include "rr_graph_storage_utils.h"
 #include "rr_node_types.h"
 #include "rr_graph_fwd.h"
 #include "rr_node_fwd.h"
@@ -14,7 +15,6 @@
 #include "vtr_memory.h"
 #include "vtr_strong_id_range.h"
 #include "vtr_array_view.h"
-#include "rr_graph_utils.h"
 
 /* Main structure describing one routing resource node.  Everything in       *
  * this structure should describe the graph -- information needed only       *

libs/libarchfpga/src/unified_to_parallel_seg_index.h

@@ -0,0 +1,27 @@
+#ifndef RR_GRAPH_STORAGE_UTILS_H
+#define RR_GRAPH_STORAGE_UTILS_H
+
+// Make room in a vector, with amortized O(1) time by using a pow2 growth pattern.
+//
+// This enables potentially random insertion into a vector with amortized O(1)
+// time.
+
+template<typename T>
+void make_room_in_vector(T* vec, size_t elem_position) {
+    if (elem_position < vec->size()) {
+        return;
+    }
+
+    size_t capacity = std::max(vec->capacity(), size_t(16));
+    while (elem_position >= capacity) {
+        capacity *= 2;
+    }
+
+    if (capacity >= vec->capacity()) {
+        vec->reserve(capacity);
+    }
+
+    vec->resize(elem_position + 1);
+}
+
+#endif

libs/librrgraph/src/base/check_rr_graph.h

@@ -1,6 +1,24 @@
 #ifndef GRAPH_TYPE_H
 #define GRAPH_TYPE_H
 
+#include <vector>
+#include "physical_types.h"
+
+struct t_chan_width {
+    int max = 0;
+    int x_max = 0;
+    int y_max = 0;
+    int x_min = 0;
+    int y_min = 0;
+    std::vector<int> x_list;
+    std::vector<int> y_list;
+};
+
+enum e_route_type {
+    GLOBAL,
+    DETAILED
+};
+
 enum e_graph_type {
     GRAPH_GLOBAL, /* One node per channel with wire capacity > 1 and full connectivity */
     GRAPH_BIDIR,  /* Detailed bidirectional graph */
@@ -10,4 +28,9 @@ enum e_graph_type {
 };
 typedef enum e_graph_type t_graph_type;
 
+/* This map is used to get indices w.r.t segment_inf_x or segment_inf_y based on parallel_axis of a segment, 
+ * from indices w.r.t the **unified** segment vector, segment_inf in devices context which stores all segments 
+ * regardless of their axis. (see get_parallel_segs for more details)*/
+typedef std::unordered_multimap<size_t, std::pair<size_t, e_parallel_axis>> t_unified_to_parallel_seg_index;
+
 #endif

libs/librrgraph/src/base/get_parallel_segs.h

@@ -1,3 +1,4 @@
+
 /****************************************************************************
  * This file include most-utilized functions that manipulate on the
  * RRGraph object
@@ -6,7 +7,7 @@
 #include <random>
 #include <algorithm>
 
-#include "rr_graph_util.h"
+#include "rr_graph_utils.h"
 
 #include "vtr_memory.h"
 #include "vtr_time.h"
@@ -118,5 +119,4 @@ vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView&
         });
 
     return node_fan_in_list;
-}
-
+}

libs/librrgraph/src/base/rr_graph_cost.h

@@ -1,26 +1,24 @@
 #ifndef RR_GRAPH_UTILS_H
 #define RR_GRAPH_UTILS_H
 
-// Make room in a vector, with amortized O(1) time by using a pow2 growth pattern.
-//
-// This enables potentially random insertion into a vector with amortized O(1)
-// time.
-template<typename T>
-void make_room_in_vector(T* vec, size_t elem_position) {
-    if (elem_position < vec->size()) {
-        return;
-    }
+/* Include header files which include data structures used by
+ * the function declaration
+ */
+#include <vector>
+#include "rr_graph_fwd.h"
+#include "rr_node_types.h"
+#include "rr_graph_view.h"
 
-    size_t capacity = std::max(vec->capacity(), size_t(16));
-    while (elem_position >= capacity) {
-        capacity *= 2;
-    }
+/* Get node-to-node switches in a RRGraph */
+std::vector<RRSwitchId> find_rr_graph_switches(const RRGraph& rr_graph,
+                                               const RRNodeId& from_node,
+                                               const RRNodeId& to_node);
 
-    if (capacity >= vec->capacity()) {
-        vec->reserve(capacity);
-    }
+// This function generates and returns a vector indexed by RRNodeId
+// containing a list of fan-in edges for each node.
+vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView& rr_graph);
 
-    vec->resize(elem_position + 1);
-}
+int seg_index_of_cblock(const RRGraphView& rr_graph, t_rr_type from_rr_type, int to_node);
+int seg_index_of_sblock(const RRGraphView& rr_graph, int from_node, int to_node);
 
-#endif
+#endif

libs/librrgraph/src/base/rr_graph_storage.h

@@ -4,14 +4,13 @@
 #define RR_GRAPH_READER_H
 
 #include "rr_graph_type.h"
-#include "device_grid.h"
-#include "physical_types.h"
-#include "base_cost_type.h"
-#include "chan_width.h"
-#include "rr_node.h"
+#include "rr_graph_cost.h"
 #include "rr_graph_builder.h"
 #include "rr_graph_view.h"
 #include "rr_graph_fwd.h"
+#include "rr_node.h"
+#include "device_grid.h"
+#include "physical_types.h"
 
 
 void load_rr_file(RRGraphBuilder* rr_graph_builder,

libs/librrgraph/src/base/rr_graph_storage_utils.h

@@ -7,20 +7,17 @@
 #include "rr_graph_uxsdcxx_interface.h"
 
 #include "rr_node.h"
-#include "rr_rc_data.h"
-#include "rr_metadata.h"
+#include "rr_graph_type.h"
+#include "rr_graph_cost.h"
 #include "rr_graph_view.h"
 #include "rr_graph_builder.h"
+#include "rr_rc_data.h"
+#include "rr_metadata.h"
 
 #include "check_rr_graph.h"
 #include "read_xml_arch_file.h"
 
 #include "device_grid.h"
-#include "chan_width.h"
-#include "base_cost_type.h"
-#include "unified_to_parallel_seg_index.h"
-#include "rr_graph_type.h"
-#include "cost_indices.h"
 #include "alloc_and_load_rr_indexed_data.h"
 #include "get_parallel_segs.h"
 

libs/librrgraph/src/base/rr_graph_type.h

@@ -6,14 +6,13 @@
 #ifndef RR_GRAPH_WRITER_H
 #define RR_GRAPH_WRITER_H
 
-#include "physical_types.h"
-#include "chan_width.h"
 #include "rr_node.h"
+#include "rr_graph_type.h"
 #include "rr_graph_builder.h"
 #include "rr_graph_view.h"
 #include "rr_graph_fwd.h"
-#include "chan_width.h"
 #include "device_grid.h"
+#include "physical_types.h"
 
 void write_rr_graph(RRGraphBuilder* rr_graph_builder,
                     RRGraphView* rr_graph,

libs/librrgraph/src/base/rr_graph_util.h

@@ -13,11 +13,11 @@
 
 #include "vpr_error.h"
 
-#include "rr_graph_util.h"
+#include "rr_graph_utils.h"
 #include "read_xml_arch_file.h"
 
-#include "base_cost_type.h"
-#include "cost_indices.h"
+#include "rr_graph_cost.h"
+#include "rr_graph_type.h"
 
 #include "histogram.h"
 

libs/librrgraph/src/base/rr_graph_util.cpp renamed to libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -3,7 +3,7 @@
 
 #include "rr_graph_view.h"
 #include "rr_node.h"
-#include "base_cost_type.h"
+#include "rr_graph_cost.h"
 #include "device_grid.h"
 
 void alloc_and_load_rr_indexed_data(const RRGraphView& rr_graph,