Merge pull request #1596 from tangxifan/rr_graph_dead_code_removal

vaughnbetz · web-flow · commit 8271fa9b43a4 · 2020-11-19T14:23:04.000-05:00
Remove Legacy Codes about `trim_empty_channels` and `trim_obs_channels`
diff --git a/vpr/src/base/SetupVPR.cpp b/vpr/src/base/SetupVPR.cpp
@@ -356,10 +356,6 @@ static void SetupRouterOpts(const t_options& Options, t_router_opts* RouterOpts)
     RouterOpts->reorder_rr_graph_nodes_threshold = Options.reorder_rr_graph_nodes_threshold;
     RouterOpts->reorder_rr_graph_nodes_seed = Options.reorder_rr_graph_nodes_seed;
 
-    //TODO document these?
-    RouterOpts->trim_empty_channels = false; /* DEFAULT */
-    RouterOpts->trim_obs_channels = false;   /* DEFAULT */
-
     RouterOpts->initial_pres_fac = Options.initial_pres_fac;
     RouterOpts->base_cost_type = Options.base_cost_type;
     RouterOpts->first_iter_pres_fac = Options.first_iter_pres_fac;
diff --git a/vpr/src/base/ShowSetup.cpp b/vpr/src/base/ShowSetup.cpp
@@ -252,8 +252,6 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
                 VPR_FATAL_ERROR(VPR_ERROR_UNKNOWN, "Unknown check_route value\n");
         }
 
-        VTR_LOG("RouterOpts.trim_empty_chan: %s\n", (RouterOpts.trim_empty_channels ? "true" : "false"));
-        VTR_LOG("RouterOpts.trim_obs_chan: %s\n", (RouterOpts.trim_obs_channels ? "true" : "false"));
         VTR_LOG("RouterOpts.acc_fac: %f\n", RouterOpts.acc_fac);
         VTR_LOG("RouterOpts.bb_factor: %d\n", RouterOpts.bb_factor);
         VTR_LOG("RouterOpts.bend_cost: %f\n", RouterOpts.bend_cost);
@@ -395,8 +393,6 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
             VTR_LOG("%d\n", RouterOpts.fixed_channel_width);
         }
 
-        VTR_LOG("RouterOpts.trim_empty_chan: %s\n", (RouterOpts.trim_empty_channels ? "true" : "false"));
-        VTR_LOG("RouterOpts.trim_obs_chan: %s\n", (RouterOpts.trim_obs_channels ? "true" : "false"));
         VTR_LOG("RouterOpts.acc_fac: %f\n", RouterOpts.acc_fac);
         VTR_LOG("RouterOpts.bb_factor: %d\n", RouterOpts.bb_factor);
         VTR_LOG("RouterOpts.bend_cost: %f\n", RouterOpts.bend_cost);
diff --git a/vpr/src/base/vpr_types.h b/vpr/src/base/vpr_types.h
@@ -1185,8 +1185,6 @@ struct t_router_opts {
     enum e_route_type route_type;
     int fixed_channel_width;
     int min_channel_width_hint; ///<Hint to binary search of what the minimum channel width is
-    bool trim_empty_channels;
-    bool trim_obs_channels;
     enum e_router_algorithm router_algorithm;
     enum e_base_cost_type base_cost_type;
     float astar_fac;
diff --git a/vpr/src/route/rr_graph.cpp b/vpr/src/route/rr_graph.cpp
@@ -301,8 +301,6 @@ static void build_rr_graph(const t_graph_type graph_type,
                            const float R_minW_pmos,
                            const enum e_base_cost_type base_cost_type,
                            const enum e_clock_modeling clock_modeling,
-                           const bool trim_empty_channels,
-                           const bool trim_obs_channels,
                            const t_direct_inf* directs,
                            const int num_directs,
                            int* wire_to_rr_ipin_switch,
@@ -362,8 +360,6 @@ void create_rr_graph(const t_graph_type graph_type,
                        det_routing_arch->R_minW_pmos,
                        router_opts.base_cost_type,
                        router_opts.clock_modeling,
-                       router_opts.trim_empty_channels,
-                       router_opts.trim_obs_channels,
                        directs, num_directs,
                        &det_routing_arch->wire_to_rr_ipin_switch,
                        Warnings);
@@ -424,8 +420,6 @@ static void build_rr_graph(const t_graph_type graph_type,
                            const float R_minW_pmos,
                            const enum e_base_cost_type base_cost_type,
                            const enum e_clock_modeling clock_modeling,
-                           const bool trim_empty_channels,
-                           const bool trim_obs_channels,
                            const t_direct_inf* directs,
                            const int num_directs,
                            int* wire_to_rr_ipin_switch,
@@ -490,7 +484,6 @@ static void build_rr_graph(const t_graph_type graph_type,
     t_chan_details chan_details_y;
 
     alloc_and_load_chan_details(grid, &nodes_per_chan,
-                                trim_empty_channels, trim_obs_channels,
                                 num_seg_details, seg_details,
                                 chan_details_x, chan_details_y);
 
diff --git a/vpr/src/route/rr_graph2.cpp b/vpr/src/route/rr_graph2.cpp
@@ -365,8 +365,6 @@ t_seg_details* alloc_and_load_seg_details(int* max_chan_width,
 
 void alloc_and_load_chan_details(const DeviceGrid& grid,
                                  const t_chan_width* nodes_per_chan,
-                                 const bool trim_empty_channels,
-                                 const bool trim_obs_channels,
                                  const int num_seg_details,
                                  const t_seg_details* seg_details,
                                  t_chan_details& chan_details_x,
@@ -376,11 +374,6 @@ void alloc_and_load_chan_details(const DeviceGrid& grid,
     chan_details_y = init_chan_details(grid, nodes_per_chan,
                                        num_seg_details, seg_details, SEG_DETAILS_Y);
 
-    /* Obstruct channel segment details based on grid block widths/heights */
-    obstruct_chan_details(grid, nodes_per_chan,
-                          trim_empty_channels, trim_obs_channels,
-                          chan_details_x, chan_details_y);
-
     /* Adjust segment start/end based on obstructed channels, if any */
     adjust_chan_details(grid, nodes_per_chan,
                         chan_details_x, chan_details_y);
@@ -432,84 +425,6 @@ t_chan_details init_chan_details(const DeviceGrid& grid,
     return chan_details;
 }
 
-void obstruct_chan_details(const DeviceGrid& grid,
-                           const t_chan_width* nodes_per_chan,
-                           const bool trim_empty_channels,
-                           const bool trim_obs_channels,
-                           t_chan_details& chan_details_x,
-                           t_chan_details& chan_details_y) {
-    auto& device_ctx = g_vpr_ctx.device();
-
-    /* Iterate grid to find and obstruct based on multi-width/height blocks */
-    for (size_t x = 0; x < grid.width() - 1; ++x) {
-        for (size_t y = 0; y < grid.height() - 1; ++y) {
-            if (!trim_obs_channels)
-                continue;
-
-            if (grid[x][y].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE)
-                continue;
-            if (grid[x][y].width_offset > 0 || grid[x][y].height_offset > 0)
-                continue;
-            if (grid[x][y].type->width == 1 && grid[x][y].type->height == 1)
-                continue;
-
-            if (grid[x][y].type->height > 1) {
-                for (int dx = 0; dx <= grid[x][y].type->width - 1; ++dx) {
-                    for (int dy = 0; dy < grid[x][y].type->height - 1; ++dy) {
-                        for (int track = 0; track < nodes_per_chan->max; ++track) {
-                            chan_details_x[x + dx][y + dy][track].set_length(0);
-                        }
-                    }
-                }
-            }
-            if (grid[x][y].type->width > 1) {
-                for (int dy = 0; dy <= grid[x][y].type->height - 1; ++dy) {
-                    for (int dx = 0; dx < grid[x][y].type->width - 1; ++dx) {
-                        for (int track = 0; track < nodes_per_chan->max; ++track) {
-                            chan_details_y[x + dx][y + dy][track].set_length(0);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /* Iterate grid again to find and obstruct based on neighboring EMPTY and/or IO types */
-    for (size_t x = 0; x <= grid.width() - 2; ++x) {      //-2 for no perim channels
-        for (size_t y = 0; y <= grid.height() - 2; ++y) { //-2 for no perim channels
-
-            if (!trim_empty_channels)
-                continue;
-
-            if (is_io_type(grid[x][y].type)) {
-                if ((x == 0) || (y == 0))
-                    continue;
-            }
-            if (grid[x][y].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE) {
-                if ((x == grid.width() - 2) && is_io_type(grid[x + 1][y].type)) //-2 for no perim channels
-                    continue;
-                if ((y == grid.height() - 2) && is_io_type(grid[x][y + 1].type)) //-2 for no perim channels
-                    continue;
-            }
-
-            if (is_io_type(grid[x][y].type) || (grid[x][y].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE)) {
-                if (is_io_type(grid[x][y + 1].type) || (grid[x][y + 1].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE)) {
-                    for (int track = 0; track < nodes_per_chan->max; ++track) {
-                        chan_details_x[x][y][track].set_length(0);
-                    }
-                }
-            }
-            if (is_io_type(grid[x][y].type) || (grid[x][y].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE)) {
-                if (is_io_type(grid[x + 1][y].type) || (grid[x + 1][y].type == device_ctx.EMPTY_PHYSICAL_TILE_TYPE)) {
-                    for (int track = 0; track < nodes_per_chan->max; ++track) {
-                        chan_details_y[x][y][track].set_length(0);
-                    }
-                }
-            }
-        }
-    }
-}
-
 void adjust_chan_details(const DeviceGrid& grid,
                          const t_chan_width* nodes_per_chan,
                          t_chan_details& chan_details_x,
diff --git a/vpr/src/route/rr_graph2.h b/vpr/src/route/rr_graph2.h
@@ -104,8 +104,6 @@ t_seg_details* alloc_and_load_seg_details(int* max_chan_width,
 
 void alloc_and_load_chan_details(const DeviceGrid& grid,
                                  const t_chan_width* nodes_per_chan,
-                                 const bool trim_empty_channels,
-                                 const bool trim_obs_channels,
                                  const int num_seg_details,
                                  const t_seg_details* seg_details,
                                  t_chan_details& chan_details_x,
@@ -115,12 +113,6 @@ t_chan_details init_chan_details(const DeviceGrid& grid,
                                  const int num_seg_details,
                                  const t_seg_details* seg_details,
                                  const enum e_seg_details_type seg_details_type);
-void obstruct_chan_details(const DeviceGrid& grid,
-                           const t_chan_width* nodes_per_chan,
-                           const bool trim_empty_channels,
-                           const bool trim_obs_channels,
-                           t_chan_details& chan_details_x,
-                           t_chan_details& chan_details_y);
 void adjust_chan_details(const DeviceGrid& grid,
                          const t_chan_width* nodes_per_chan,
                          t_chan_details& chan_details_x,
