Skip to content

Commit 8d8da36

Browse files
acomodiacomodi
committed
Revert master+wip to master (b4ad02d)
Signed-off-by: Alessandro Comodi <[email protected]>
1 parent f1a3bcc commit 8d8da36

File tree

509 files changed

+20816
-284447
lines changed

Some content is hidden

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

509 files changed

+20816
-284447
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
6-
assignees: ''
74

85
---
96

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: ''
6-
assignees: ''
74

85
---
96

‎.github/ISSUE_TEMPLATE/vtr-change.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/autolabeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ external_libs: ["libs/EXTERNAL"]
1717
docs: ["docs/", "README.md", "*.md", "tutorial", "README", "*.rst"]
1818
infra: [".travis.yml", ".travis.yml", ".travis/", "scripts/", ".github/", "Dockerfile"]
1919
build: ["Makefile", "*.make", "CMakeLists.txt", "cmake"]
20-
tests: ["*_test.pl", "*test*", "*TESTS*"]
21-
scripts: ["scripts", "*.pl", "*.sh"]
20+
tests: ["*_test.py", "*test*", "*TESTS*"]
21+
scripts: ["scripts", "*.pl", "*.py", "*.sh"]
2222
VTR Flow: ["vtr_flow"]
2323

2424
# Tag pull requests with the languages used to make it easy to see what is

‎.github/kokoro/continuous/nightly.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env_vars {
4646
value: "vtr_reg_nightly"
4747
}
4848

49-
#Options for run_reg_test.pl
49+
#Options for run_reg_test.py
5050
# -show_failures: show tool failures in main log output
5151
env_vars {
5252
key: "VTR_TEST_OPTIONS"

‎.github/kokoro/continuous/strong.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env_vars {
4646
value: "vtr_reg_strong"
4747
}
4848

49-
#Options for run_reg_test.pl
49+
#Options for run_reg_test.py
5050
# -show_failures: show tool failures in main log output
5151
env_vars {
5252
key: "VTR_TEST_OPTIONS"

‎.github/kokoro/continuous/strong_sanitized.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ env_vars {
4848
value: "vtr_reg_strong"
4949
}
5050

51-
#Options for run_reg_test.pl
51+
#Options for run_reg_test.py
5252
# -show_failures: show tool failures in main log output
5353
# -skip_qor: Skip QoR checks (since we expect run-time failures due to sanitizers)
5454
env_vars {

‎.github/kokoro/continuous/weekly.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env_vars {
4646
value: "vtr_reg_weekly"
4747
}
4848

49-
#Options for run_reg_test.pl
49+
#Options for run_reg_test.py
5050
# -show_failures: show tool failures in main log output
5151
env_vars {
5252
key: "VTR_TEST_OPTIONS"

‎.github/kokoro/presubmit/nightly.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env_vars {
4646
value: "vtr_reg_nightly"
4747
}
4848

49-
#Options for run_reg_test.pl
49+
#Options for run_reg_test.py
5050
# -show_failures: show tool failures in main log output
5151
env_vars {
5252
key: "VTR_TEST_OPTIONS"

‎.github/kokoro/presubmit/strong.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env_vars {
4646
value: "vtr_reg_strong"
4747
}
4848

49-
#Options for run_reg_test.pl
49+
#Options for run_reg_test.py
5050
# -show_failures: show tool failures in main log output
5151
env_vars {
5252
key: "VTR_TEST_OPTIONS"

‎.github/kokoro/presubmit/strong_sanitized.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ env_vars {
4848
value: "vtr_reg_strong"
4949
}
5050

51-
#Options for run_reg_test.pl
51+
#Options for run_reg_test.py
5252
# -show_failures: show tool failures in main log output
5353
# -skip_qor: Skip QoR checks (since we expect run-time failures due to sanitizers)
5454
env_vars {

‎.github/kokoro/steps/vtr-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ echo "========================================"
4545
echo "Running Tests"
4646
echo "========================================"
4747
export VPR_NUM_WORKERS=1
48-
./run_reg_test.pl $VTR_TEST $VTR_TEST_OPTIONS -j$NUM_CORES
48+
./run_reg_test.py $VTR_TEST $VTR_TEST_OPTIONS -j$NUM_CORES
4949
kill $MONITOR

‎.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- ./dev/check-format-py.sh
8787
- stage: Test
8888
name: "Python Lint"
89-
script:
89+
script:
9090
- python3 ./dev/pylint_check.py
9191
- stage: Test
9292
name: "C++ Unit Tests"
@@ -112,39 +112,39 @@ jobs:
112112
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
113113
script:
114114
- ./.github/travis/build.sh
115-
- travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
115+
- travis_wait 30 ./run_reg_test.py vtr_reg_basic -show_failures -j2
116116
- stage: Test
117117
name: "Basic Regression Tests with NO_GRAPHICS"
118118
env:
119119
- CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off"
120120
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
121121
script:
122122
- ./.github/travis/build.sh
123-
- travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
123+
- travis_wait 30 ./run_reg_test.py vtr_reg_basic -show_failures -j2
124124
- stage: Test
125125
name: "Basic Regression Tests with VTR_ENABLE_DEBUG_LOGGING"
126126
env:
127127
- CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on"
128128
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
129129
script:
130130
- ./.github/travis/build.sh
131-
- travis_wait 30 ./run_reg_test.pl vtr_reg_basic -show_failures -j2
131+
- travis_wait 30 ./run_reg_test.py vtr_reg_basic -show_failures -j2
132132
- stage: Test
133133
name: "Strong Regression Tests"
134134
env:
135135
- CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on"
136136
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
137137
script:
138138
- ./.github/travis/build.sh
139-
- travis_wait 30 ./run_reg_test.pl vtr_reg_strong -show_failures -j2
139+
- travis_wait 30 ./run_reg_test.py vtr_reg_strong -show_failures -j2
140140
- stage: Test
141141
name: "Basic Valgrind Memory Tests"
142142
env:
143143
- CMAKE_PARAMS="-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on"
144144
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
145145
script:
146146
- ./.github/travis/build.sh
147-
- travis_wait 30 ./run_reg_test.pl vtr_reg_valgrind_small -show_failures -j2
147+
- travis_wait 30 ./run_reg_test.py vtr_reg_valgrind_small -show_failures -j2
148148
- stage: Test
149149
name: "Sanitized Basic Regression Tests"
150150
env:
@@ -155,7 +155,7 @@ jobs:
155155
script:
156156
- ./.github/travis/build.sh
157157
#We skip QoR since we are only checking for errors in sanitizer runs
158-
- travis_wait 50 ./run_reg_test.pl vtr_reg_basic -show_failures -skip_qor -j2
158+
- travis_wait 50 ./run_reg_test.py vtr_reg_basic -show_failures -skip_qor -j2
159159
#Currently strong regression with sanitizers is disabled as it exceeds the maximum travis job run-time
160160
#- stage: Test
161161
#name: "Sanitized Strong Regression Tests"
@@ -167,7 +167,7 @@ jobs:
167167
#script:
168168
#- ./.github/travis/build.sh
169169
##We skip QoR since we are only checking for errors in sanitizer runs
170-
#- travis_wait 60 ./run_reg_test.pl vtr_reg_strong -show_failures -skip_qor -j2
170+
#- travis_wait 60 ./run_reg_test.py vtr_reg_strong -show_failures -skip_qor -j2
171171
- stage: Test
172172
name: "ODIN-II Micro Tests"
173173
env:
@@ -176,7 +176,7 @@ jobs:
176176
- BUILD_TYPE=debug
177177
script:
178178
- ./.github/travis/build.sh
179-
- ./run_reg_test.pl odin_reg_micro -show_failures -j2
179+
- ./run_reg_test.py odin_reg_micro -show_failures -j2
180180

181181
- stage: Test
182182
name: "Build Compatibility: GCC 5 (Ubuntu Xenial - 16.04)"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ifneq (,$(findstring pgo,$(BUILD_TYPE)))
8787
#Need titan benchmarks for pgo_profile task
8888
@+$(MAKE) -C $(BUILD_DIR) get_titan_benchmarks
8989
#Note profiling must be done serially to avoid corrupting the generated profiles
90-
./run_reg_test.pl pgo_profile
90+
./run_reg_test.py pgo_profile
9191
#
9292
#Configure 2nd-stage build to use profiling data to guide compiler optimization
9393
#

‎ODIN_II/SRC/MixingOptimization.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,20 @@
3434

3535
void MixingOpt::scale_counts() {
3636
if (this->_blocks_count < 0 || this->_blocks_count == INT_MAX || this->_ratio < 0.0 || this->_ratio > 1.0) {
37-
error_message(NETLIST, unknown_location, "%s",
38-
"The parameters for optimization kind:%i are configured incorrectly : count %i, ratio %f\n", this->_kind, this->_blocks_count, this->_ratio);
37+
error_message(NETLIST, unknown_location, "The parameters for optimization kind:%i are configured incorrectly : count %i, ratio %f\n", this->_kind, this->_blocks_count, this->_ratio);
3938
exit(0);
4039
}
4140
this->_blocks_count = this->_blocks_count * this->_ratio;
4241
}
4342

4443
void MixingOpt::assign_weights(netlist_t* /*netlist*/, std::vector<nnode_t*> /*nodes*/) {
4544
// compute weights for all noted nodes
46-
error_message(NETLIST, unknown_location, "%s",
47-
"Assign_weights mixing optimization was called for optimization without specification provided, for kind %i\n", this->_kind);
45+
error_message(NETLIST, unknown_location, "Assign_weights mixing optimization was called for optimization without specification provided, for kind %i\n", this->_kind);
4846
exit(0);
4947
}
5048

5149
void MixingOpt::perform(netlist_t*, std::vector<nnode_t*>&) {
52-
error_message(NETLIST, unknown_location, "%s",
53-
"Performing mixing optimization was called for optimization without method provided, for kind %i\n", this->_kind);
50+
error_message(NETLIST, unknown_location, "Performing mixing optimization was called for optimization without method provided, for kind %i\n", this->_kind);
5451
exit(0);
5552
}
5653

@@ -63,8 +60,7 @@ MultsOpt::MultsOpt(int _exact)
6360
MultsOpt::MultsOpt(float ratio)
6461
: MixingOpt(ratio, MULTIPLY) {
6562
if (ratio < 0.0 || ratio > 1.0) {
66-
error_message(NETLIST, unknown_location, "%s",
67-
"Miltipliers mixing optimization is started with wrong ratio %f\n", ratio);
63+
error_message(NETLIST, unknown_location, "Miltipliers mixing optimization is started with wrong ratio %f\n", ratio);
6864
exit(0);
6965
}
7066

@@ -144,14 +140,12 @@ void MultsOpt::set_blocks_needed(int new_count) {
144140
this->scale_counts();
145141
}
146142
void MixingOpt::instantiate_soft_logic(netlist_t* /*netlist*/, std::vector<nnode_t*> /* nodes*/) {
147-
error_message(NETLIST, unknown_location, "%s",
148-
"Performing instantiate_soft_logic was called for optimization without method provided, for kind %i\n", this->_kind);
143+
error_message(NETLIST, unknown_location, "Performing instantiate_soft_logic was called for optimization without method provided, for kind %i\n", this->_kind);
149144
exit(0);
150145
}
151146

152147
void MixingOpt::partial_map_node(nnode_t* /*node*/, short /*traverse_value*/, netlist_t*, /*netlist*/ HardSoftLogicMixer* /*mixer*/) {
153-
error_message(NETLIST, unknown_location, "%s",
154-
"Performing partial_map_node was called for optimization without method provided, for kind %i\n", this->_kind);
148+
error_message(NETLIST, unknown_location, "Performing partial_map_node was called for optimization without method provided, for kind %i\n", this->_kind);
155149
exit(0);
156150
}
157151

‎ODIN_II/SRC/include/MixingOptimization.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class MixingOpt {
138138
* @brief this variable allows to cache traverse value
139139
*
140140
*/
141-
short cached_traverse_value;
141+
short cached_traverse_value = 0;
142142

143143
// an integer representing the number of required hard blocks
144144
// that should be estimated and updated through set blocks needed

0 commit comments

Comments
 (0)