Skip to content

Commit 6ce3706

Browse files
authored
Merge branch 'master' into openfpga
2 parents 876311a + 2f14a9f commit 6ce3706

File tree

79 files changed

+4976
-2342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4976
-2342
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,8 @@ tags
155155
cmake-build-debug
156156
cmake-build-release
157157
/.metadata/
158+
159+
#
160+
# Clangd
161+
#
162+
compile_commands.json

doc/src/api/vpr/route_tree.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ RouteTreeNode
2020
.. doxygenclass:: RouteTreeNode
2121
:project: vpr
2222
:members:
23+
24+
RTExploredNode
25+
-------------
26+
27+
.. doxygenclass:: RTExploredNode
28+
:project: vpr
29+
:members:

doc/src/api/vprinternals/router_heap.rst

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,13 @@
22
Router Heap
33
==============
44

5-
t_heap
6-
----------
7-
.. doxygenstruct:: t_heap
8-
:project: vpr
9-
:members:
10-
115
HeapInterface
126
----------
137
.. doxygenclass:: HeapInterface
148
:project: vpr
159
:members:
1610

17-
HeapStorage
18-
----------
19-
.. doxygenclass:: HeapStorage
20-
:project: vpr
21-
:members:
22-
23-
KAryHeap
11+
DAryHeap
2412
----------
25-
.. doxygenclass:: KAryHeap
13+
.. doxygenclass:: DAryHeap
2614
:project: vpr
27-
28-
FourAryHeap
29-
----------
30-
.. doxygenclass:: FourAryHeap
31-
:project: vpr

doc/src/vpr/command_line_usage.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,14 @@ General Options
200200

201201
.. option:: --device <string>
202202

203-
Specifies which device layout/floorplan to use from the architecture file.
203+
Specifies which device layout/floorplan to use from the architecture file. Valid values are:
204204

205-
``auto`` uses the smallest device satisfying the circuit's resource requirements.
206-
Other values are assumed to be the names of device layouts defined in the :ref:`arch_grid_layout` section of the architecture file.
205+
* ``auto`` VPR uses the smallest device satisfying the circuit's resource requirements. This option will use the ``<auto_layout>`` tag if it is present in the architecture file in order to construct the smallest FPGA that has sufficient resources to fit the design. If the ``<auto_layout>`` tag is not present, the ``auto`` option chooses the smallest device amongst all the architecture file's ``<fixed_layout>`` specifications into which the design can be packed.
206+
* Any string matching ``name`` attribute of a device layout defined with a ``<fixed_layout>`` tag in the :ref:`arch_grid_layout` section of the architecture file.
207207

208-
.. note:: If the architecture contains both ``<auto_layout>`` and ``<fixed_layout>`` specifications, specifying an ``auto`` device will use the ``<auto_layout>``.
208+
If the value specified is neither ``auto`` nor matches the ``name`` attribute value of a ``<fixed_layout>`` tag, VPR issues an error.
209+
210+
.. note:: If the only layout in the architecture file is a single device specified using ``<fixed_layout>``, it is recommended to always specify the ``--device`` option; this prevents the value ``--device auto`` from interfering with operations supported only for ``<fixed_layout>`` grids.
209211

210212
**Default:** ``auto``
211213

@@ -1394,15 +1396,17 @@ The following options are only valid when the router is in timing-driven mode (t
13941396

13951397
**Default:** ``safe``
13961398

1397-
.. option:: --routing_budgets_algorithm { disable | minimax | scale_delay }
1399+
.. option:: --routing_budgets_algorithm { disable | minimax | yoyo | scale_delay }
13981400

13991401
.. warning:: Experimental
14001402

14011403
Controls how the routing budgets are created. Routing budgets are used to guid VPR's routing algorithm to consider both short path and long path timing constraints :cite:`RCV_algorithm`.
14021404

14031405
``disable`` is used to disable the budget feature. This uses the default VPR and ignores hold time constraints.
14041406

1405-
``minimax`` sets the minimum and maximum budgets by distributing the long path and short path slacks depending on the the current delay values. This uses the routing cost valleys and Minimax-PERT algorithm :cite:`minimax_pert,RCV_algorithm`.
1407+
``minimax`` sets the minimum and maximum budgets by distributing the long path and short path slacks depending on the the current delay values. This uses the Minimax-PERT algorithm :cite:`minimax_pert`.
1408+
1409+
``yoyo`` allocates budgets using minimax algorithm (as above), and enables hold slack resolution in the router using the Routing Cost Valleys (RCV) algorithm :cite:`RCV_algorithm`.
14061410

14071411
``scale_delay`` has the minimum budgets set to 0 and the maximum budgets is set to the delay of a net scaled by the pin criticality (net delay/pin criticality).
14081412

libs/libarchfpga/src/physical_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ class t_pb_graph_pin {
13851385
float tco_max = std::numeric_limits<float>::quiet_NaN(); /* For sequential logic elements the maximum clock to output time */
13861386
t_pb_graph_pin* associated_clock_pin = nullptr; /* For sequentail elements, the associated clock */
13871387

1388-
/* This member is used when flat-routing and has_choking_spot are enabled.
1388+
/* This member is used when flat-routing and router_opt_choke_points are enabled.
13891389
* It is used to identify choke points.
13901390
* This is only valid for IPINs, and it only contain the pins that are reachable to the pin by a forwarding path.
13911391
* It doesn't take into account feed-back connection.

utils/route_diag/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static void do_one_route(const Netlist<>& net_list,
114114
is_flat);
115115
enable_router_debug(router_opts, ParentNetId(), sink_node, 1, &router);
116116
bool found_path;
117-
t_heap cheapest;
117+
RTExploredNode cheapest;
118118
ConnectionParameters conn_params(ParentNetId::INVALID(),
119119
-1,
120120
false,

vpr/src/base/SetupVPR.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ void SetupVPR(const t_options* options,
318318
vtr::ScopedStartFinishTimer timer("Allocate intra-cluster resources");
319319
// The following two functions should be called when the data structured related to t_pb_graph_node, t_pb_type,
320320
// and t_pb_graph_edge are initialized
321-
alloc_and_load_intra_cluster_resources(routerOpts->has_choking_spot);
321+
alloc_and_load_intra_cluster_resources(routerOpts->has_choke_point);
322322
add_intra_tile_switches();
323323
}
324324

@@ -526,7 +526,7 @@ static void SetupRouterOpts(const t_options& Options, t_router_opts* RouterOpts)
526526
RouterOpts->max_logged_overused_rr_nodes = Options.max_logged_overused_rr_nodes;
527527
RouterOpts->generate_rr_node_overuse_report = Options.generate_rr_node_overuse_report;
528528
RouterOpts->flat_routing = Options.flat_routing;
529-
RouterOpts->has_choking_spot = Options.has_choking_spot;
529+
RouterOpts->has_choke_point = Options.router_opt_choke_points;
530530
RouterOpts->custom_3d_sb_fanin_fanout = Options.custom_3d_sb_fanin_fanout;
531531
RouterOpts->with_timing_analysis = Options.timing_analysis;
532532
}

vpr/src/base/ShowSetup.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,11 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
255255
VTR_LOG("false\n");
256256
}
257257

258-
VTR_LOG("RouterOpts.has_choking_spot: ");
259-
if (RouterOpts.has_choking_spot) {
260-
VTR_LOG("true\n");
258+
VTR_LOG("RouterOpts.choke_points: ");
259+
if (RouterOpts.has_choke_point) {
260+
VTR_LOG("on\n");
261261
} else {
262-
VTR_LOG("false\n");
262+
VTR_LOG("off\n");
263263
}
264264

265265
VTR_ASSERT(GLOBAL == RouterOpts.route_type || DETAILED == RouterOpts.route_type);
@@ -468,9 +468,6 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
468468
case e_heap_type::FOUR_ARY_HEAP:
469469
VTR_LOG("FOUR_ARY_HEAP\n");
470470
break;
471-
case e_heap_type::BUCKET_HEAP_APPROXIMATION:
472-
VTR_LOG("BUCKET_HEAP_APPROXIMATION\n");
473-
break;
474471
default:
475472
VPR_FATAL_ERROR(VPR_ERROR_UNKNOWN, "Unknown router_heap\n");
476473
}

vpr/src/base/place_and_route.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ int binary_search_place_and_route(const Netlist<>& placement_net_list,
402402

403403
init_route_structs(router_net_list,
404404
router_opts.bb_factor,
405-
router_opts.has_choking_spot,
405+
router_opts.has_choke_point,
406406
is_flat);
407407

408408
restore_routing(best_routing,

vpr/src/base/read_options.cpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ struct RouteBudgetsAlgorithm {
272272
}
273273

274274
std::vector<std::string> default_choices() {
275-
return {"minimax", "scale_delay", "disable"};
275+
return {"minimax", "yoyo", "scale_delay", "disable"};
276276
}
277277
};
278278

@@ -1063,8 +1063,6 @@ struct ParseRouterHeap {
10631063
conv_value.set_value(e_heap_type::BINARY_HEAP);
10641064
else if (str == "four_ary")
10651065
conv_value.set_value(e_heap_type::FOUR_ARY_HEAP);
1066-
else if (str == "bucket")
1067-
conv_value.set_value(e_heap_type::BUCKET_HEAP_APPROXIMATION);
10681066
else {
10691067
std::stringstream msg;
10701068
msg << "Invalid conversion from '" << str << "' to e_heap_type (expected one of: " << argparse::join(default_choices(), ", ") << ")";
@@ -1077,11 +1075,9 @@ struct ParseRouterHeap {
10771075
ConvertedValue<std::string> conv_value;
10781076
if (val == e_heap_type::BINARY_HEAP)
10791077
conv_value.set_value("binary");
1080-
else if (val == e_heap_type::FOUR_ARY_HEAP)
1081-
conv_value.set_value("four_ary");
10821078
else {
1083-
VTR_ASSERT(val == e_heap_type::BUCKET_HEAP_APPROXIMATION);
1084-
conv_value.set_value("bucket");
1079+
VTR_ASSERT(val == e_heap_type::FOUR_ARY_HEAP);
1080+
conv_value.set_value("four_ary");
10851081
}
10861082
return conv_value;
10871083
}
@@ -2491,13 +2487,13 @@ argparse::ArgumentParser create_arg_parser(const std::string& prog_name, t_optio
24912487
.default_value("off")
24922488
.show_in(argparse::ShowIn::HELP_ONLY);
24932489

2494-
route_grp.add_argument(args.has_choking_spot, "--has_choking_spot")
2490+
route_grp.add_argument<bool, ParseOnOff>(args.router_opt_choke_points, "--router_opt_choke_points")
24952491
.help(
24962492
""
2497-
"Some FPGA architectures, due to the lack of full connectivity inside the cluster, may have"
2498-
" a choking spot inside the cluster. Thus, if routing doesn't converge, enabling this option may"
2499-
" help it.")
2500-
.default_value("false")
2493+
"Some FPGA architectures with limited fan-out options within a cluster (e.g. fracturable LUTs with shared pins) do"
2494+
" not converge well in routing unless these fan-out choke points are discovered and optimized for during net routing."
2495+
" This option helps router convergence for such architectures.")
2496+
.default_value("on")
25012497
.show_in(argparse::ShowIn::HELP_ONLY);
25022498

25032499

0 commit comments

Comments
 (0)