Skip to content

Commit c8266d3

Browse files
committed
Merge branch 'master' into upstream-fpt24-fine-grained-parallel-router
2 parents 1e615f1 + 43f2a94 commit c8266d3

File tree

115 files changed

+2517
-2296
lines changed

Some content is hidden

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

115 files changed

+2517
-2296
lines changed

.github/workflows/stale.yml

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ jobs:
1010
steps:
1111
- uses: actions/stale@v9
1212
with:
13+
# Set default number of days before being marked stale to 100 years
14+
# This will be overriden by "days-before-issue-stale" and "days-before-pr-stale"
15+
# This is done to avoid marking PRs as stale, as it is not something
16+
# we want to do.
17+
days-before-stale: 36500
1318
# The message to be shown for stale issues
1419
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.'
1520
close-issue-message: 'This issue has been marked stale for 15 days and has been automatically closed.'

doc/src/vpr/command_line_usage.rst

+10
Original file line numberDiff line numberDiff line change
@@ -1807,6 +1807,16 @@ Analysis Options
18071807

18081808
**Default:** ``unconnected``
18091809

1810+
.. option:: --post_synth_netlist_module_parameters { on | off }
1811+
1812+
Controls whether the post-synthesis netlist output by VTR can use Verilog parameters
1813+
or not. When using the post-synthesis netlist for external timing analysis,
1814+
some tools cannot accept the netlist if it contains parameters. By setting
1815+
this option to ``off``, VPR will try to represent the netlist using non-parameterized
1816+
modules.
1817+
1818+
**Default:** ``on``
1819+
18101820
.. option:: --timing_report_npaths <int>
18111821

18121822
Controls how many timing paths are reported.

libs/EXTERNAL/libcatch2

Submodule libcatch2 updated 84 files

libs/libarchfpga/src/arch_check.cpp

+43-52
Large diffs are not rendered by default.

libs/libarchfpga/src/arch_check.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extern "C" {
2626
* @param file architecture file
2727
* @param line line in the architecture file that generates the failure
2828
*/
29-
bool check_model_clocks(t_model* model, const char* file, uint32_t line);
29+
bool check_model_clocks(const t_model& model, const char* file, uint32_t line);
3030

3131
/**
3232
* @brief Checks the correctness of the combinational sinks in the model inputs to outputs connections
@@ -35,7 +35,7 @@ bool check_model_clocks(t_model* model, const char* file, uint32_t line);
3535
* @param file architecture file
3636
* @param line line in the architecture file that generates the failure
3737
*/
38-
bool check_model_combinational_sinks(const t_model* model, const char* file, uint32_t line);
38+
bool check_model_combinational_sinks(const t_model& model, const char* file, uint32_t line);
3939

4040
/**
4141
* @brief Checks whether the I/O ports can have timing specifications based on their connectivity.
@@ -47,7 +47,7 @@ bool check_model_combinational_sinks(const t_model* model, const char* file, uin
4747
* @param file architecture file
4848
* @param line line in the architecture file that generates the failure
4949
*/
50-
void warn_model_missing_timing(const t_model* model, const char* file, uint32_t line);
50+
void warn_model_missing_timing(const t_model& model, const char* file, uint32_t line);
5151

5252
/**
5353
* @brief Checks the consistency of the mappings between a logical block and the corresponding physical tile.

libs/libarchfpga/src/arch_types.h

-9
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,9 @@
1818
/* Value for UNDEFINED data */
1919
constexpr int UNDEFINED = -1;
2020

21-
/** The total number of predefined blif models */
22-
constexpr int NUM_MODELS_IN_LIBRARY = 4;
23-
2421
/* Maximum value for minimum channel width to avoid overflows of short data type. */
2522
constexpr int MAX_CHANNEL_WIDTH = 8000;
2623

27-
/* Built-in library models */
28-
constexpr const char* MODEL_NAMES = ".names";
29-
constexpr const char* MODEL_LATCH = ".latch";
30-
constexpr const char* MODEL_INPUT = ".input";
31-
constexpr const char* MODEL_OUTPUT = ".output";
32-
3324
enum class e_arch_format {
3425
VTR, ///<VTR-specific device XML format
3526
FPGAInterchange ///<FPGA Interchange device format

0 commit comments

Comments
 (0)