Skip to content

Commit 8ec1474

Browse files
authored
Merge branch 'master' into 20221103-update-to-c++-17
2 parents c313635 + 2a29e57 commit 8ec1474

File tree

6,190 files changed

+565148
-142342
lines changed

Some content is hidden

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

6,190 files changed

+565148
-142342
lines changed

.gitattributes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ libs/EXTERNAL/** linguist-vendored
3838
# External benchmarks imported into vtr_flow benchmark suite.
3939
vtr_flow/benchmarks/** linguist-vendored
4040
vtr_flow/scripts/perl_libs/** linguist-vendored
41-
# External benchmarks imported into ODIN_II benchmark suite.
42-
ODIN_II/regression_test/benchmark/verilog/large/** linguist-vendored
43-
ODIN_II/regression_test/benchmark/verilog/full/** linguist-vendored
44-
ODIN_II/regression_test/benchmark/verilog/FIR/** linguist-vendored
41+
# External benchmarks imported into odin_ii benchmark suite.
42+
odin_ii/regression_test/benchmark/verilog/large/** linguist-vendored
43+
odin_ii/regression_test/benchmark/verilog/full/** linguist-vendored
44+
odin_ii/regression_test/benchmark/verilog/FIR/** linguist-vendored
4545

4646
# Documentation
4747
doc/** linguist-documentation

.github/labeler.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ blifexplorer:
1717
- blifexplorer/*
1818
- blifexplorer/**/*
1919
Odin:
20-
- ODIN_II/*
21-
- ODIN_II/**/*
20+
- odin_ii/*
21+
- odin_ii/**/*
2222
- odin2_helper/*
2323
- odin2_helper/**/*
24+
Parmys:
25+
- parmys/*
26+
- parmys/**/*
27+
- yosys/*
28+
- yosys/**/*
2429
VPR:
2530
- vpr/*
2631
- vpr/**/*

.github/scripts/run-vtr.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ set -e
88
export VTR_DIR=$(pwd)
99
source $SCRIPT_DIR/hostsetup.sh
1010

11-
if ! { [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ] \
12-
|| [ $VTR_TEST == "odin_tech_strong" ] || [ $VTR_TEST == "vtr_reg_yosys_odin" ]; }; then
11+
if ! { [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ]; }; then
1312
source $SCRIPT_DIR/vtr-full-setup.sh
1413
fi
1514

.github/workflows/containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717

1818
- name: 🧰 Repository Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
- name: 🔧 Generate image name
2222
id: generate

0 commit comments

Comments
 (0)