Skip to content

Commit 5be8b39

Browse files
authored
Merge branch 'master' into jy-pack-option-cleanup
2 parents 028f8a5 + 04183ba commit 5be8b39

File tree

196 files changed

+3742
-3329
lines changed

Some content is hidden

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

196 files changed

+3742
-3329
lines changed

.github/workflows/stale.yml

+10
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.'
@@ -20,6 +25,11 @@ jobs:
2025
# Start from the oldest issues
2126
ascending: true
2227

28+
# Upper limit for number of API calls per day
29+
# This worklfow does 2-3 API calls per issue
30+
# including issues that have been marked stale
31+
operations-per-run: 300
32+
2333
# The configuration below can be used to allow the same behaviour with PRs.
2434
# Since we currently don't want to close old PRs, it is commented out but
2535
# left here in case we change our mind.

doc/src/api/vtrutil/containers.rst

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ vtr_vector
88
:project: vtr
99
:sections: briefdescription detaileddescription innernamespace innerclass public-func typedef func
1010

11+
vtr_array
12+
----------
13+
.. doxygenfile:: vtr_array.h
14+
:project: vtr
15+
:sections: briefdescription detaileddescription innernamespace innerclass public-func typedef func
16+
1117
vtr_small_vector
1218
----------------
1319
.. doxygenclass:: vtr::small_vector

doc/src/vpr/command_line_usage.rst

+10
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,16 @@ Analysis Options
17301730

17311731
**Default:** ``unconnected``
17321732

1733+
.. option:: --post_synth_netlist_module_parameters { on | off }
1734+
1735+
Controls whether the post-synthesis netlist output by VTR can use Verilog parameters
1736+
or not. When using the post-synthesis netlist for external timing analysis,
1737+
some tools cannot accept the netlist if it contains parameters. By setting
1738+
this option to ``off``, VPR will try to represent the netlist using non-parameterized
1739+
modules.
1740+
1741+
**Default:** ``on``
1742+
17331743
.. option:: --timing_report_npaths <int>
17341744

17351745
Controls how many timing paths are reported.

libs/EXTERNAL/libblifparse/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
1313
endif()
1414

1515
#Flex and Bison are used to generate the parser
16-
find_package(BISON REQUIRED 3.0)
16+
find_package(BISON REQUIRED 3.3)
1717
find_package(FLEX REQUIRED)
1818

1919
file(GLOB_RECURSE LIB_SOURCES src/blif*.cpp)

libs/EXTERNAL/libblifparse/src/blif_parser.y

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* C++ parsers require Bison 3 */
2-
%require "3.0"
1+
/* C++ parsers require Bison 3.3 */
2+
%require "3.3"
33
%language "C++"
44

55
/* Write-out tokens header file */
@@ -34,7 +34,7 @@
3434
%define api.namespace {blifparse}
3535

3636
/* Name the parser class */
37-
%define parser_class_name {Parser}
37+
%define api.parser.class {Parser}
3838

3939
/* Match the flex prefix */
4040
%define api.prefix {blifparse_}

libs/EXTERNAL/libcatch2

Submodule libcatch2 updated 84 files

libs/EXTERNAL/libsdcparse/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
1313
endif()
1414

1515
#Flex and Bison are used to generate the parser
16-
find_package(BISON REQUIRED 3.0)
16+
find_package(BISON REQUIRED 3.3)
1717
find_package(FLEX REQUIRED)
1818

1919
file(GLOB_RECURSE LIB_SOURCES src/sdc*.cpp)

libs/EXTERNAL/libsdcparse/src/sdc_parser.y

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* C++ parsers require Bison 3 */
2-
%require "3.0"
1+
/* C++ parsers require Bison 3.3 */
2+
%require "3.3"
33
%language "C++"
44

55
/* Write-out tokens header file */
@@ -34,7 +34,7 @@
3434
%define api.namespace {sdcparse}
3535

3636
/* Name the parser class */
37-
%define parser_class_name {Parser}
37+
%define api.parser.class {Parser}
3838

3939
/* Match the flex prefix */
4040
%define api.prefix {sdcparse_}

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)