Merge pull request #2524 from verilog-to-routing/run_flat_graphic_warning

Fix the crash in graphics when run-flat is used

Author: vaughnbetz

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -5,29 +5,28 @@
 
 #ifdef VTR_ENABLE_CAPNPROTO
 
-#include <algorithm>
-#include <kj/std/iostream.h>
-#include <limits>
-#include <map>
-#include <regex>
-#include <set>
-#include <stdlib.h>
-#include <string>
-#include <string.h>
-#include <zlib.h>
-#include <sstream>
-
-#include "vtr_assert.h"
-#include "vtr_digest.h"
-#include "vtr_log.h"
-#include "vtr_memory.h"
-#include "vtr_util.h"
-
-#include "arch_check.h"
-#include "arch_error.h"
-#include "arch_util.h"
-#include "arch_types.h"
-
+#    include <algorithm>
+#    include <kj/std/iostream.h>
+#    include <limits>
+#    include <map>
+#    include <regex>
+#    include <set>
+#    include <stdlib.h>
+#    include <string>
+#    include <string.h>
+#    include <zlib.h>
+#    include <sstream>
+
+#    include "vtr_assert.h"
+#    include "vtr_digest.h"
+#    include "vtr_log.h"
+#    include "vtr_memory.h"
+#    include "vtr_util.h"
+
+#    include "arch_check.h"
+#    include "arch_error.h"
+#    include "arch_util.h"
+#    include "arch_types.h"
 
 /*
  * FPGA Interchange Device frontend
@@ -2503,7 +2502,7 @@ struct ArchReader {
     }
 };
 
-#endif  // VTR_ENABLE_CAPNPROTO
+#endif // VTR_ENABLE_CAPNPROTO
 
 void FPGAInterchangeReadArch(const char* FPGAInterchangeDeviceFile,
                              const bool /*timing_enabled*/,
@@ -2551,12 +2550,12 @@ void FPGAInterchangeReadArch(const char* FPGAInterchangeDeviceFile,
 
     ArchReader reader(arch, device_reader, FPGAInterchangeDeviceFile, PhysicalTileTypes, LogicalBlockTypes);
     reader.read_arch();
-#else   // VTR_ENABLE_CAPNPROTO
+#else  // VTR_ENABLE_CAPNPROTO
     // If CAPNPROTO is disabled, throw an error.
     (void)FPGAInterchangeDeviceFile;
     (void)arch;
     (void)PhysicalTileTypes;
     (void)LogicalBlockTypes;
     throw vtr::VtrError("Unable to read FPGA interchange if CAPNPROTO is not enabled", __FILE__, __LINE__);
-#endif  // VTR_ENABLE_CAPNPROTO
+#endif // VTR_ENABLE_CAPNPROTO
 }

libs/libarchfpga/src/read_fpga_interchange_arch.h

@@ -5,14 +5,14 @@
 
 #ifdef VTR_ENABLE_CAPNPROTO
 
-#include "DeviceResources.capnp.h"
-#include "LogicalNetlist.capnp.h"
-#include "capnp/serialize.h"
-#include "capnp/serialize-packed.h"
-#include <fcntl.h>
-#include <unistd.h>
-
-#endif  // VTR_ENABLE_CAPNPROTO
+#    include "DeviceResources.capnp.h"
+#    include "LogicalNetlist.capnp.h"
+#    include "capnp/serialize.h"
+#    include "capnp/serialize-packed.h"
+#    include <fcntl.h>
+#    include <unistd.h>
+
+#endif // VTR_ENABLE_CAPNPROTO
 
 #ifdef __cplusplus
 extern "C" {

vpr/src/base/read_interchange_netlist.cpp

@@ -13,33 +13,33 @@
 
 #ifdef VTR_ENABLE_CAPNPROTO
 
-#include <cmath>
-#include <limits>
-#include <kj/std/iostream.h>
-#include <regex>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <zlib.h>
-#include <iostream>
-#include <sstream>
-
-#include "LogicalNetlist.capnp.h"
-#include "capnp/serialize.h"
-#include "capnp/serialize-packed.h"
-
-#include "vtr_assert.h"
-#include "vtr_hash.h"
-#include "vtr_util.h"
-#include "vtr_log.h"
-#include "vtr_logic.h"
-#include "vtr_time.h"
-#include "vtr_digest.h"
-
-#include "vpr_types.h"
-#include "vpr_error.h"
-#include "globals.h"
-#include "arch_types.h"
+#    include <cmath>
+#    include <limits>
+#    include <kj/std/iostream.h>
+#    include <regex>
+#    include <string>
+#    include <unordered_map>
+#    include <unordered_set>
+#    include <zlib.h>
+#    include <iostream>
+#    include <sstream>
+
+#    include "LogicalNetlist.capnp.h"
+#    include "capnp/serialize.h"
+#    include "capnp/serialize-packed.h"
+
+#    include "vtr_assert.h"
+#    include "vtr_hash.h"
+#    include "vtr_util.h"
+#    include "vtr_log.h"
+#    include "vtr_logic.h"
+#    include "vtr_time.h"
+#    include "vtr_digest.h"
+
+#    include "vpr_types.h"
+#    include "vpr_error.h"
+#    include "globals.h"
+#    include "arch_types.h"
 
 struct NetlistReader {
   public:
@@ -524,7 +524,7 @@ struct NetlistReader {
     }
 };
 
-#endif  // VTR_ENABLE_CAPNPROTO
+#endif // VTR_ENABLE_CAPNPROTO
 
 AtomNetlist read_interchange_netlist(const char* ic_netlist_file,
                                      t_arch& arch) {
@@ -572,12 +572,12 @@ AtomNetlist read_interchange_netlist(const char* ic_netlist_file,
 
     return netlist;
 
-#else   // VTR_ENABLE_CAPNPROTO
+#else // VTR_ENABLE_CAPNPROTO
 
     // If CAPNPROTO is not enabled, throw an error
     (void)ic_netlist_file;
     (void)arch;
     throw vtr::VtrError("Unable to read interchange netlist with CAPNPROTO disabled", __FILE__, __LINE__);
 
-#endif  // VTR_ENABLE_CAPNPROTO
+#endif // VTR_ENABLE_CAPNPROTO
 }

vpr/src/draw/draw_basic.cpp

@@ -660,6 +660,10 @@ void draw_partial_route(const std::vector<RRNodeId>& rr_nodes_to_draw, ezgl::ren
         RRNodeId prev_node = rr_nodes_to_draw[i - 1];
         auto prev_type = rr_graph.node_type(RRNodeId(prev_node));
 
+        if (!is_inter_cluster_node(rr_graph, prev_node) || !is_inter_cluster_node(rr_graph, inode)) {
+            continue;
+        }
+
         auto iedge = find_edge(prev_node, inode);
         auto switch_type = rr_graph.edge_switch(RRNodeId(prev_node), iedge);
 
@@ -773,6 +777,10 @@ bool is_edge_valid_to_draw(RRNodeId current_node, RRNodeId prev_node) {
     int current_node_layer = rr_graph.node_layer(current_node);
     int prev_node_layer = rr_graph.node_layer(prev_node);
 
+    if (!(is_inter_cluster_node(rr_graph, current_node)) || !(is_inter_cluster_node(rr_graph, prev_node))) {
+        return false;
+    }
+
     if (current_node_layer != prev_node_layer) {
         if (draw_state->cross_layer_display.visible && draw_state->draw_layer_display[current_node_layer].visible && draw_state->draw_layer_display[prev_node_layer].visible) {
             return true; //if both layers are enabled and cross layer connections are enabled

vpr/src/draw/draw_rr.cpp

@@ -549,6 +549,9 @@ void draw_rr_pin(RRNodeId inode, const ezgl::color& color, ezgl::renderer* g) {
     char str[vtr::bufsize];
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;
+    if (!is_inter_cluster_node(rr_graph, inode)) {
+        return;
+    }
 
     int ipin = rr_graph.node_pin_num(RRNodeId(inode));
 
@@ -581,6 +584,9 @@ void draw_rr_src_sink(RRNodeId inode, ezgl::color color, ezgl::renderer* g) {
 
     auto& device_ctx = g_vpr_ctx.device();
     const auto& rr_graph = device_ctx.rr_graph;
+    if (!is_inter_cluster_node(rr_graph, inode)) {
+        return;
+    }
 
     int transparency_factor = get_rr_node_transparency(inode);
 

vpr/src/noc/noc_link.cpp

@@ -6,7 +6,7 @@ NocLink::NocLink(NocLinkId link_id, NocRouterId source, NocRouterId sink, double
     , source_router(source)
     , sink_router(sink)
     , bandwidth_usage(0.0)
-    , bandwidth(bw) { }
+    , bandwidth(bw) {}
 
 // getters
 NocRouterId NocLink::get_source_router(void) const {

vpr/src/noc/noc_link.h

@@ -50,7 +50,7 @@ class NocLink {
     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 bits-per-second(bps)*/
-    double bandwidth; /*!< Represents the maximum bits per second that can be transmitted over the link without causing congestion*/
+    double bandwidth;       /*!< Represents the maximum bits per second that can be transmitted over the link without causing congestion*/
 
   public:
     NocLink(NocLinkId link_id, NocRouterId source_router, NocRouterId sink_router, double bw);
@@ -135,7 +135,6 @@ class NocLink {
      */
     void set_bandwidth(double new_bandwidth);
 
-    
     /**
      * @brief Returns the unique link ID. The ID can be used to index
      * vtr::vector<NoCLinkId, ...> instances.

vpr/src/noc/noc_storage.cpp

@@ -56,7 +56,7 @@ const NocLink& NocStorage::get_single_noc_link(NocLinkId id) const {
     return link_storage[id];
 }
 
-NocLinkId  NocStorage::get_single_noc_link_id(NocRouterId src_router, NocRouterId dst_router) const {
+NocLinkId NocStorage::get_single_noc_link_id(NocRouterId src_router, NocRouterId dst_router) const {
     NocLinkId link_id = NocLinkId::INVALID();
 
     for (const auto& link : link_storage) {

vpr/src/noc/noc_storage.h

@@ -282,7 +282,7 @@ class NocStorage {
      * to the destination router. NocLinkId::INVALID() is such a link is not
      * found.
      */
-    NocLinkId  get_single_noc_link_id(NocRouterId src_router, NocRouterId dst_router) const;
+    NocLinkId get_single_noc_link_id(NocRouterId src_router, NocRouterId dst_router) const;
 
     /**
      * @brief Given a unique link identifier, get the corresponding link

vpr/src/place/initial_noc_placement.cpp

@@ -188,7 +188,6 @@ static void noc_routers_anneal(const t_noc_opts& noc_opts) {
     const double starting_prob = 0.5;
     const double prob_step = starting_prob / N_MOVES;
 
-
     // The checkpoint stored the placement with the lowest cost.
     NoCPlacementCheckpoint checkpoint;