making formatting changes

Srivat97 · Srivat97 · commit 7c841f59b330 · 2022-06-26T22:08:05.000-04:00
diff --git a/libs/libarchfpga/src/read_xml_arch_file.cpp b/libs/libarchfpga/src/read_xml_arch_file.cpp
@@ -4957,9 +4957,9 @@ static bool parse_noc_router_connection_list(pugi::xml_node router_tag, const pu
         }
 
         // make sure that the current router isn't connected to itself
-        if (router_id == converted_connection){
+        if (router_id == converted_connection) {
             archfpga_throw(loc_data.filename_c_str(), loc_data.line(router_tag),
-                          "The router with id:%d was added to its own connection list. A router cannot connect to itself.", router_id);
+                           "The router with id:%d was added to its own connection list. A router cannot connect to itself.", router_id);
         }
 
         // if we are here then a legal router id was supplied, so store it
diff --git a/vpr/src/base/noc_link.h b/vpr/src/base/noc_link.h
@@ -43,10 +43,9 @@
 
 class NocLink {
   private:
-
     // the two routers that are connected by this link
     NocRouterId source_router; /*!< The router which has this link as an outgoing edge*/
-    NocRouterId sink_router; /*!< The router which uses this link as an incoming edge*/
+    NocRouterId sink_router;   /*!< The router which uses this link as an incoming edge*/
 
     double bandwidth_usage; /*!< Represents the bandwidth of the data being transmitted on the link. Units in bps*/
 
diff --git a/vpr/src/base/noc_router.cpp b/vpr/src/base/noc_router.cpp
@@ -27,7 +27,7 @@ ClusterBlockId NocRouter::get_router_block_ref(void) const {
 }
 
 // setters
-void NocRouter::set_router_block_ref(ClusterBlockId router_block_ref_id){
+void NocRouter::set_router_block_ref(ClusterBlockId router_block_ref_id) {
     router_block_ref = router_block_ref_id;
     return;
 }
diff --git a/vpr/src/base/noc_router.h b/vpr/src/base/noc_router.h
@@ -46,7 +46,7 @@ class NocRouter {
     int router_grid_position_x; /*<! Represents the horizontal grid position on the device the physical router tile is located*/
     int router_grid_position_y; /*<! Represents the vertical grid position on the device the physical router is located*/
 
-    ClusterBlockId router_block_ref;/*<! A unique identifier that represents a router block in the clustered netlist that is placed on the physical router*/
+    ClusterBlockId router_block_ref; /*<! A unique identifier that represents a router block in the clustered netlist that is placed on the physical router*/
 
   public:
     NocRouter(int id, int grid_position_x, int grid_position_y);
diff --git a/vpr/src/base/noc_storage.cpp b/vpr/src/base/noc_storage.cpp
@@ -1,7 +1,6 @@
 
 #include "noc_storage.h"
 
-
 NocStorage::NocStorage() {
     clear_noc();
 }
@@ -79,17 +78,17 @@ void NocStorage::add_link(NocRouterId source, NocRouterId sink) {
     return;
 }
 
-void NocStorage::set_noc_link_bandwidth(double link_bandwidth){
+void NocStorage::set_noc_link_bandwidth(double link_bandwidth) {
     noc_link_bandwidth = link_bandwidth;
     return;
 }
 
-void NocStorage::set_noc_link_latency(double link_latency){
+void NocStorage::set_noc_link_latency(double link_latency) {
     noc_link_latency = link_latency;
     return;
 }
 
-void NocStorage::set_noc_router_latency(double router_latency){
+void NocStorage::set_noc_router_latency(double router_latency) {
     noc_router_latency = router_latency;
     return;
 }
@@ -148,7 +147,6 @@ NocLinkId NocStorage::get_parallel_link(NocLinkId current_link) const {
 }
 
 void NocStorage::echo_noc(char* file_name) const {
-
     FILE* fp;
     fp = vtr::fopen(file_name, "w");
 
@@ -184,10 +182,9 @@ void NocStorage::echo_noc(char* file_name) const {
 
         // go through the outgoing links of the current router and print the connecting router
         for (auto link_id = router_connections.begin(); link_id != router_connections.end(); link_id++) {
-
             const NocRouterId connecting_router_id = get_single_noc_link(*link_id).get_sink_router();
-        
-            fprintf(fp, " %d",  get_single_noc_router(connecting_router_id).get_router_user_id());
+
+            fprintf(fp, " %d", get_single_noc_router(connecting_router_id).get_router_user_id());
         }
 
         fprintf(fp, "\n\n");
@@ -196,5 +193,4 @@ void NocStorage::echo_noc(char* file_name) const {
     fclose(fp);
 
     return;
-
 }
diff --git a/vpr/src/base/noc_storage.h b/vpr/src/base/noc_storage.h
@@ -52,7 +52,6 @@ constexpr NocLinkId INVALID_LINK_ID(-1);
 
 class NocStorage {
   private:
- 
     vtr::vector<NocRouterId, NocRouter> router_storage; /*<! Contains all the routers in the NoC*/
 
     // list of outgoing links for each router
@@ -64,8 +63,7 @@ class NocStorage {
      */
     vtr::vector<NocRouterId, std::vector<NocLinkId>> router_link_list;
 
-    vtr::vector<NocLinkId, NocLink> link_storage;/*<! Contains all the links in the NoC*/
-
+    vtr::vector<NocLinkId, NocLink> link_storage; /*<! Contains all the links in the NoC*/
 
     /**
      * @brief The user provides an ID for the router when describing the NoC
@@ -172,9 +170,8 @@ class NocStorage {
 
     double get_noc_router_latency(void) const;
 
-
     // getters for  routers
-    
+
     /**
      * @brief Given a unique router identifier, get the corresponding router
      * within the NoC. The router cannot be modified, so the intended use
diff --git a/vpr/src/base/setup_noc.cpp b/vpr/src/base/setup_noc.cpp
@@ -9,7 +9,6 @@
 #include "vtr_math.h"
 #include "echo_files.h"
 
-
 void setup_noc(const t_arch& arch) {
     // variable to store all the noc router tiles within the FPGA device
     // physical routers
@@ -119,7 +118,7 @@ void generate_noc(const t_arch& arch, NocContext& noc_ctx, std::vector<t_noc_rou
 }
 
 void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::vector<t_noc_router_tile_position>& noc_router_tiles) {
-    // keep track of the shortest distance between a user described router (noc description in the arch file) and a physical router on the FPGA 
+    // keep track of the shortest distance between a user described router (noc description in the arch file) and a physical router on the FPGA
     double shortest_distance;
     double curr_calculated_distance;
     // stores the index of a physical router within the noc_router_tiles that is closest to a given user described router
@@ -140,7 +139,7 @@ void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::v
     int error_case_physical_router_index_1;
     int error_case_physical_router_index_2;
 
-    // keep track of the router assignments (store the user router id that was assigned to each physical router tile) 
+    // keep track of the router assignments (store the user router id that was assigned to each physical router tile)
     // this is used in error checking, after determining the closest physical router for a user described router in the arch file, the datastructure below can be used to check if that physical router was already assigned previously
     std::vector<int> router_assignments;
     router_assignments.resize(noc_router_tiles.size(), PHYSICAL_ROUTER_NOT_ASSIGNED);
@@ -245,4 +244,3 @@ void create_noc_links(const t_noc_inf* noc_info, NocStorage* noc_model) {
 
     return;
 }
-
diff --git a/vpr/src/base/setup_noc.h b/vpr/src/base/setup_noc.h
@@ -8,7 +8,6 @@
  *
  */
 
-
 /**
  * @file 
  * @brief This is the setup_noc header file. The main purpose of 
diff --git a/vpr/src/base/vpr_context.h b/vpr/src/base/vpr_context.h
@@ -427,7 +427,6 @@ struct NocContext : public Context {
      * The NoC model is created once from the architecture file description. 
      */
     NocStorage noc_model;
-
 };
 
 /**
diff --git a/vpr/src/draw/draw_noc.cpp b/vpr/src/draw/draw_noc.cpp
@@ -363,7 +363,7 @@ NocLinkType determine_noc_link_type(ezgl::point2d link_start_point, ezgl::point2
     // get the dot product of the two connecting line
     double dot_product_of_link_and_horizontal_line = (x_coord_end - x_coord_start) * (x_coord_horziontal_end - x_coord_horizontal_start) + (y_coord_end - y_coord_start) * (y_coord_horizontal_end - y_coord_horizontal_start);
     // calculate the angle
-    double angle = acos(dot_product_of_link_and_horizontal_line /(link_magnitude * HORIZONTAL_LINE_LENGTH));
+    double angle = acos(dot_product_of_link_and_horizontal_line / (link_magnitude * HORIZONTAL_LINE_LENGTH));
 
     // the angle is in the first or fourth quandrant of the unit circle
     if ((angle > 0) && (angle < (PI_RADIAN / 2))) {
diff --git a/vpr/src/draw/draw_noc.h b/vpr/src/draw/draw_noc.h
@@ -212,7 +212,6 @@ void determine_direction_to_shift_noc_links(vtr::vector<NocLinkId, NocLinkShift>
  */
 NocLinkType determine_noc_link_type(ezgl::point2d link_start_point, ezgl::point2d link_end_point);
 
-
 /**
  * @brief Given the starting and end coordinates of a line that represents a
  *        NoC link, the line shifted to a new set of coordinates based on its
diff --git a/vpr/src/draw/draw_toggle_functions.cpp b/vpr/src/draw/draw_toggle_functions.cpp
@@ -378,8 +378,7 @@ void toggle_router_expansion_costs(GtkWidget* /*widget*/, gint /*response_id*/,
     application.refresh_drawing();
 }
 
-void toggle_noc_display(GtkWidget* /*widget*/, gint /*response_id*/, gpointer /*data*/)
-{
+void toggle_noc_display(GtkWidget* /*widget*/, gint /*response_id*/, gpointer /*data*/) {
     /* this is the callback function for runtime created toggle_noc_display button
      * which is written in button.cpp                                         */
     t_draw_state* draw_state = get_draw_state_vars();
diff --git a/vpr/test/packing_pin_util.rpt b/vpr/test/packing_pin_util.rpt
@@ -0,0 +1,33 @@
+#Packing pin usage report
+Type: io
+	Input Pin Usage:
+		Max: 1.00 (0.50)
+		Avg: 0.50 (0.25)
+		Min: 0.00 (0.00)
+		Histogram:
+		[        0:      0.2) 1 ( 50.0%) |**************************************************
+		[      0.2:      0.4) 0 (  0.0%) |
+		[      0.4:      0.6) 0 (  0.0%) |
+		[      0.6:      0.8) 0 (  0.0%) |
+		[      0.8:        1) 1 ( 50.0%) |**************************************************
+		[        1:      1.2) 0 (  0.0%) |
+		[      1.2:      1.4) 0 (  0.0%) |
+		[      1.4:      1.6) 0 (  0.0%) |
+		[      1.6:      1.8) 0 (  0.0%) |
+		[      1.8:        2) 0 (  0.0%) |
+	Output Pin Usage:
+		Max: 1.00 (1.00)
+		Avg: 0.50 (0.50)
+		Min: 0.00 (0.00)
+		Histogram:
+		[        0:      0.1) 1 ( 50.0%) |**************************************************
+		[      0.1:      0.2) 0 (  0.0%) |
+		[      0.2:      0.3) 0 (  0.0%) |
+		[      0.3:      0.4) 0 (  0.0%) |
+		[      0.4:      0.5) 0 (  0.0%) |
+		[      0.5:      0.6) 0 (  0.0%) |
+		[      0.6:      0.7) 0 (  0.0%) |
+		[      0.7:      0.8) 0 (  0.0%) |
+		[      0.8:      0.9) 0 (  0.0%) |
+		[      0.9:        1) 1 ( 50.0%) |**************************************************
+
diff --git a/vpr/test/pre_pack.report_timing.setup.rpt b/vpr/test/pre_pack.report_timing.setup.rpt
@@ -0,0 +1,31 @@
+#Timing report of worst 1 path(s)
+# Unit scale: 1e-09 seconds
+# Output precision: 3
+
+#Path 1
+Startpoint: di.inpad[0] (.input clocked by virtual_io_clock)
+Endpoint  : out:do.outpad[0] (.output clocked by virtual_io_clock)
+Path Type : setup
+
+Point                                                             Incr      Path
+--------------------------------------------------------------------------------
+clock virtual_io_clock (rise edge)                               0.000     0.000
+clock source latency                                             0.000     0.000
+input external delay                                             0.000     0.000
+di.inpad[0] (.input)                                             0.000     0.000
+out:do.outpad[0] (.output)                                       1.338     1.338
+data arrival time                                                          1.338
+
+clock virtual_io_clock (rise edge)                               0.000     0.000
+clock source latency                                             0.000     0.000
+clock uncertainty                                                0.000     0.000
+output external delay                                            0.000     0.000
+data required time                                                         0.000
+--------------------------------------------------------------------------------
+data required time                                                         0.000
+data arrival time                                                         -1.338
+--------------------------------------------------------------------------------
+slack (VIOLATED)                                                          -1.338
+
+
+#End of timing report
diff --git a/vpr/test/test_noc_storage.cpp b/vpr/test/test_noc_storage.cpp
@@ -53,7 +53,6 @@ TEST_CASE("test_adding_routers_to_noc_storage", "[vpr_noc]") {
         converted_id = (NocRouterId)router_number;
         NocRouter router_to_verify = test_noc.get_single_noc_router(converted_id);
 
-
         // compare all the router properties
         REQUIRE(golden_set[router_number].get_router_user_id() == router_to_verify.get_router_user_id());
 
@@ -163,21 +162,19 @@ TEST_CASE("test_add_link", "[vpr_noc]") {
 
     // verify that the links were added properly to the NoC
     for (int link_number = 0; link_number < total_num_of_links; link_number++) {
-        
         // converting current link to the index used by the NocStorage class
         link_id = (NocLinkId)link_number;
         // using the link index, get it from the NoC
         NocLink current_link_to_test = test_noc.get_single_noc_link(link_id);
 
         // now get the source and sink routers of the test link
-        NocRouter test_link_source_router =  test_noc.get_single_noc_router(current_link_to_test.get_source_router());
-        NocRouter test_link_sink_router =  test_noc.get_single_noc_router(current_link_to_test.get_sink_router());
+        NocRouter test_link_source_router = test_noc.get_single_noc_router(current_link_to_test.get_source_router());
+        NocRouter test_link_sink_router = test_noc.get_single_noc_router(current_link_to_test.get_sink_router());
 
         // now get the source and sink routers of the golde link
         NocRouter golden_link_source_router = test_noc.get_single_noc_router(golden_set[link_number].get_source_router());
         NocRouter golden_link_sink_router = test_noc.get_single_noc_router(golden_set[link_number].get_sink_router());
 
-
         // verify the test link by checking that the source and sink routers match the golden reference link
         REQUIRE(golden_link_source_router.get_router_user_id() == test_link_source_router.get_router_user_id());
         REQUIRE(golden_link_sink_router.get_router_user_id() == test_link_sink_router.get_router_user_id());
diff --git a/vpr/test/test_setup_noc.cpp b/vpr/test/test_setup_noc.cpp
@@ -683,16 +683,13 @@ TEST_CASE("test_create_noc_links", "[vpr_setup_noc]") {
         router_connection = noc_info.router_list[router_id - 1].connection_list.begin();
 
         for (auto noc_link = noc_model.get_noc_router_connections(current_source_router_id).begin(); noc_link != noc_model.get_noc_router_connections(current_source_router_id).begin(); noc_link++) {
-            
             // get the connecting link
             NocLink connecting_link = noc_model.get_single_noc_link(*noc_link);
-            
+
             // get the destination router
             current_destination_router_id = connecting_link.get_sink_router();
             NocRouter current_destination_router = noc_model.get_single_noc_router(current_destination_router_id);
 
-
-
             REQUIRE((current_destination_router.get_router_user_id()) == (*router_connection));
 
             router_connection++;

Original file line number	Diff line number	Diff line change
`@@ -4957,9 +4957,9 @@ static bool parse_noc_router_connection_list(pugi::xml_node router_tag, const pu`
`4957`	`4957`	`}`
`4958`	`4958`
`4959`	`4959`	`// make sure that the current router isn't connected to itself`
`4960`		`- if (router_id == converted_connection){`
	`4960`	`+ if (router_id == converted_connection) {`
`4961`	`4961`	`archfpga_throw(loc_data.filename_c_str(), loc_data.line(router_tag),`
`4962`		`- "The router with id:%d was added to its own connection list. A router cannot connect to itself.", router_id);`
	`4962`	`+ "The router with id:%d was added to its own connection list. A router cannot connect to itself.", router_id);`
`4963`	`4963`	`}`
`4964`	`4964`
`4965`	`4965`	`// if we are here then a legal router id was supplied, so store it`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ ClusterBlockId NocRouter::get_router_block_ref(void) const {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// setters`
`30`		`-void NocRouter::set_router_block_ref(ClusterBlockId router_block_ref_id){`
	`30`	`+void NocRouter::set_router_block_ref(ClusterBlockId router_block_ref_id) {`
`31`	`31`	`router_block_ref = router_block_ref_id;`
`32`	`32`	`return;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`
`2`	`2`	`#include "noc_storage.h"`
`3`	`3`
`4`		`-`
`5`	`4`	`NocStorage::NocStorage() {`
`6`	`5`	`clear_noc();`
`7`	`6`	`}`
`@@ -79,17 +78,17 @@ void NocStorage::add_link(NocRouterId source, NocRouterId sink) {`
`79`	`78`	`return;`
`80`	`79`	`}`
`81`	`80`
`82`		`-void NocStorage::set_noc_link_bandwidth(double link_bandwidth){`
	`81`	`+void NocStorage::set_noc_link_bandwidth(double link_bandwidth) {`
`83`	`82`	`noc_link_bandwidth = link_bandwidth;`
`84`	`83`	`return;`
`85`	`84`	`}`
`86`	`85`
`87`		`-void NocStorage::set_noc_link_latency(double link_latency){`
	`86`	`+void NocStorage::set_noc_link_latency(double link_latency) {`
`88`	`87`	`noc_link_latency = link_latency;`
`89`	`88`	`return;`
`90`	`89`	`}`
`91`	`90`
`92`		`-void NocStorage::set_noc_router_latency(double router_latency){`
	`91`	`+void NocStorage::set_noc_router_latency(double router_latency) {`
`93`	`92`	`noc_router_latency = router_latency;`
`94`	`93`	`return;`
`95`	`94`	`}`
`@@ -148,7 +147,6 @@ NocLinkId NocStorage::get_parallel_link(NocLinkId current_link) const {`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`void NocStorage::echo_noc(char* file_name) const {`
`151`		`-`
`152`	`150`	`FILE* fp;`
`153`	`151`	`fp = vtr::fopen(file_name, "w");`
`154`	`152`
`@@ -184,10 +182,9 @@ void NocStorage::echo_noc(char* file_name) const {`
`184`	`182`
`185`	`183`	`// go through the outgoing links of the current router and print the connecting router`
`186`	`184`	`for (auto link_id = router_connections.begin(); link_id != router_connections.end(); link_id++) {`
`187`		`-`
`188`	`185`	`const NocRouterId connecting_router_id = get_single_noc_link(*link_id).get_sink_router();`
`189`		`-`
`190`		`- fprintf(fp, " %d", get_single_noc_router(connecting_router_id).get_router_user_id());`
	`186`	`+`
	`187`	`+ fprintf(fp, " %d", get_single_noc_router(connecting_router_id).get_router_user_id());`
`191`	`188`	`}`
`192`	`189`
`193`	`190`	`fprintf(fp, "\n\n");`
`@@ -196,5 +193,4 @@ void NocStorage::echo_noc(char* file_name) const {`
`196`	`193`	`fclose(fp);`
`197`	`194`
`198`	`195`	`return;`
`199`		`-`
`200`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`*`
`9`	`9`	`*/`
`10`	`10`
`11`		`-`
`12`	`11`	`/**`
`13`	`12`	`* @file`
`14`	`13`	`* @brief This is the setup_noc header file. The main purpose of`