Skip to content

Commit 9c4057a

Browse files
authored
Merge branch 'master' into placement_search_range
2 parents a1d67f7 + d5dc5f7 commit 9c4057a

File tree

207 files changed

+3791
-2222
lines changed

Some content is hidden

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

207 files changed

+3791
-2222
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ IndentCaseLabels: true
6969
IndentWidth: 4
7070
IndentWrappedFunctionNames: false
7171
IndentPPDirectives: None
72+
InsertNewlineAtEOF: true
7273
JavaScriptQuotes: Leave
7374
JavaScriptWrapImports: true
7475
KeepEmptyLinesAtTheStartOfBlocks: true

.github/workflows/stale.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: 'Close Stale Issues'
2+
on:
3+
schedule:
4+
# Run everyday at 1 PM UTC
5+
- cron: '0 13 * * *'
6+
7+
jobs:
8+
stale:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v9
12+
with:
13+
# The message to be shown for stale issues
14+
stale-issue-message: 'This issue has been inactive for a year and has been marked as stale. It will be closed in 15 days if it continues to be stale. If you believe this is still an issue, please add a comment.'
15+
close-issue-message: 'This issue has been marked stale for 15 days and has been automatically closed.'
16+
# If you want to exempt an issue from being marked stale/deleted, label it as 'no-stale'
17+
exempt-issue-labels: 'no-stale'
18+
days-before-issue-stale: 365
19+
days-before-issue-close: 15
20+
# Start from the oldest issues
21+
ascending: true
22+
23+
# The configuration below can be used to allow the same behaviour with PRs.
24+
# Since we currently don't want to close old PRs, it is commented out but
25+
# left here in case we change our mind.
26+
27+
# stale-pr-message: 'This PR has been inactive for a year and has been marked as stale. It will be closed in 15 days if it continues to be stale. If you are still working on this PR, please add a comment.'
28+
# close-pr-message: 'This PR has been marked stale for 15 days and has been automatically closed.'
29+
# exempt-pr-labels: 'no-stale'
30+
# days-before-pr-stale: 365
31+
# days-before-pr-close: 15

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ This information helps us to quickly reproduce (and hopefully fix) the issue:
7777

7878
Tell us what version of VTR you are using (e.g. the output of `vpr --version`), which Operating System and compiler you are using, or any other relevant information about where or how you are building/running VTR.
7979

80-
Once you've gathered all the information [open an Issue](https://github.com/verilog-to-routing/vtr-verilog-to-routing/issues/new?template=bug_report.md) on our issue tracker.
80+
Once you've gathered all the information [open an Issue](https://github.com/verilog-to-routing/vtr-verilog-to-routing/issues/new?template=bug_report.md) on our issue tracker. Issues that do not have any activity for a year will be automatically marked as stale and will be closed after 15 days of being marked as stale.
8181

8282
If you know how to fix the issue, or already have it coded-up, please also consider [submitting the fix](#submitting-code-to-vtr).
8383
This is likely the fastest way to get bugs fixed!

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ ifeq ($(VERBOSE),1)
4848
override CMAKE_PARAMS := -DVTR_ENABLE_VERBOSE=on ${CMAKE_PARAMS}
4949
endif
5050

51-
# -s : Suppresss makefile output (e.g. entering/leaving directories)
51+
# -s : Suppresses makefile output (e.g. entering/leaving directories)
5252
# --output-sync target : For parallel compilation ensure output for each target is synchronized (make version >= 4.0)
5353
MAKEFLAGS := -s
5454

5555
SOURCE_DIR := $(PWD)
5656
BUILD_DIR ?= build
5757

58-
#Check for the cmake exectuable
58+
#Check for the cmake executable
5959
CMAKE := $(shell command -v cmake 2> /dev/null)
6060

6161
#Show test log on failures with 'make test'

doc/src/api/vtrutil/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ VTRUTIL API
1111
container_utils
1212
logging
1313
geometry
14+
parallel
1415
other

doc/src/api/vtrutil/parallel.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
=====
2+
Parallel
3+
=====
4+
5+
vtr_thread_pool
6+
-------------
7+
.. doxygenfile:: vtr_thread_pool.h
8+
:project: vtr
9+
:sections: briefdescription detaileddescription func innernamespace enum
10+
11+
.. doxygenclass:: vtr::thread_pool
12+
:project: vtr
13+
:members:

doc/src/vpr/command_line_usage.rst

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,14 @@ Use the options below to override this default naming behaviour.
379379

380380
.. seealso:: :ref:`Routing Resource XML File <vpr_route_resource_file>`.
381381

382+
.. option:: --read_rr_edge_override <file>
383+
384+
Reads a file that overrides the intrinsic delay of specific edges in RR graph.
385+
386+
This option should be used with both :option:`--read_rr_graph` and :option:`--write_rr_graph`. When used this way,
387+
VPR reads the RR graph, updates the delays of selected edges using :option:`--read_rr_edge_override`,
388+
and writes the updated RR graph. The modified RR graph can then be used in later VPR runs.
389+
382390
.. option:: --read_vpr_constraints <file>
383391

384392
Reads the :ref:`VPR constraints <vpr_constraints>` that the flow must respect from the specified XML file.
@@ -1214,7 +1222,7 @@ Analytical Placement is generally split into three stages:
12141222
Uses the legalized solution as anchor-points to pull the solution to a
12151223
more legal solution (similar to the approach from SimPL :cite:`Kim2013_SimPL`).
12161224

1217-
**Default:** ``qp-hybrid``
1225+
**Default:** ``lp-b2b``
12181226

12191227
.. option:: --ap_partial_legalizer {bipartitioning | flow-based}
12201228

@@ -1253,6 +1261,15 @@ Analytical Placement is generally split into three stages:
12531261

12541262
**Default:** ``annealer``
12551263

1264+
.. option:: --ap_timing_tradeoff <float>
1265+
1266+
Controls the trade-off between wirelength (HPWL) and delay minimization in the AP flow.
1267+
1268+
A value of 0.0 makes the AP flow focus completely on wirelength minimization,
1269+
while a value of 1.0 makes the AP flow focus completely on timing optimization.
1270+
1271+
**Default:** ``0.5``
1272+
12561273
.. option:: --ap_verbosity <int>
12571274

12581275
Controls the verbosity of the AP flow output.

doc/src/vpr/file_formats.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,28 @@ To aid in handling large graphs, rr_graph files can also be :ref:`saved in <file
11001100

11011101
.. _end:
11021102

1103+
RR Graph Edge Attribute Override File Format (.txt)
1104+
---------------------------------------------------
1105+
This file lets users override attributes of specific edges in the RR graph. Currently, only the intrinsic delay (Tdel)
1106+
can be changed. The expected format is:
1107+
1108+
.. code-block:: none
1109+
1110+
# edge Tdel
1111+
64812 5.9e-11
1112+
9981 4.2e-11
1113+
1234 7.1e-11
1114+
4321 9.4e-11
1115+
(42, 64) 7.3e-11
1116+
1117+
.. _end:
1118+
1119+
Lines starting with # are comments and ignored. Each other line should specify either: an edge ID and its new delay, or
1120+
a source/sink node pair and its delay.
1121+
1122+
This allows more accurate modeling of switch delays in the RR graph without creating many switch types
1123+
in the architecture file and limiting them to small regions. This can be useful for more detailed modeling of
1124+
a fabricated FPGA where layout differences lead to small delay differences in the same type of routing switch.
11031125

11041126
Network-on-Chip (NoC) Traffic Flows Format (.flows)
11051127
---------------------------------------------------

libs/EXTERNAL/libcatch2

libs/libarchfpga/src/cad_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ struct t_cluster_placement_primitive {
126126
t_pb_graph_node* pb_graph_node;
127127
bool valid;
128128
float base_cost; /* cost independent of current status of packing */
129-
float incremental_cost; /* cost dependant on current status of packing */
129+
float incremental_cost; /* cost dependent on current status of packing */
130130
};
131131

132132
#endif

0 commit comments

Comments
 (0)