Skip to content

Commit b6a98cf

Browse files
Merge branch 'master' into patch-1
2 parents a915cfe + 5d0486f commit b6a98cf

File tree

11,117 files changed

+17925702
-499357
lines changed

Some content is hidden

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

11,117 files changed

+17925702
-499357
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/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
3+
updates:
4+
5+
# Monthly update of submodules.
6+
# This dependabot will create a PR if there are any updates to the submodules.
7+
- package-ecosystem: gitsubmodule
8+
schedule:
9+
interval: "monthly"
10+
11+
# Update all submodules
12+
directory: /

.github/labeler.yml

Lines changed: 93 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,96 +6,126 @@
66

77
# Tools
88
ABC:
9-
- abc_with_bb_support/*
10-
- abc_with_bb_support/**/*
11-
- abc/*
12-
- abc/**/*
9+
- changed-files:
10+
- any-glob-to-any-file: abc_with_bb_support/*
11+
- any-glob-to-any-file: abc_with_bb_support/**/*
12+
- any-glob-to-any-file: abc/*
13+
- any-glob-to-any-file: abc/**/*
1314
ACE2:
14-
- ace2/*
15-
- ace2/**/*
15+
- changed-files:
16+
- any-glob-to-any-file: ace2/*
17+
- any-glob-to-any-file: ace2/**/*
1618
blifexplorer:
17-
- blifexplorer/*
18-
- blifexplorer/**/*
19+
- changed-files:
20+
- any-glob-to-any-file: blifexplorer/*
21+
- any-glob-to-any-file: blifexplorer/**/*
1922
Odin:
20-
- ODIN_II/*
21-
- ODIN_II/**/*
22-
- odin2_helper/*
23-
- odin2_helper/**/*
23+
- changed-files:
24+
- any-glob-to-any-file: odin_ii/*
25+
- any-glob-to-any-file: odin_ii/**/*
26+
- any-glob-to-any-file: odin2_helper/*
27+
- any-glob-to-any-file: odin2_helper/**/*
28+
Parmys:
29+
- changed-files:
30+
- any-glob-to-any-file: parmys/*
31+
- any-glob-to-any-file: parmys/**/*
32+
- any-glob-to-any-file: yosys/*
33+
- any-glob-to-any-file: yosys/**/*
2434
VPR:
25-
- vpr/*
26-
- vpr/**/*
35+
- changed-files:
36+
- any-glob-to-any-file: vpr/*
37+
- any-glob-to-any-file: vpr/**/*
2738

2839
# Libraries
2940
libarchfpga:
30-
- libs/libarchfpga/*
31-
- libs/libarchfpga/**/*
41+
- changed-files:
42+
- any-glob-to-any-file: libs/libarchfpga/*
43+
- any-glob-to-any-file: libs/libarchfpga/**/*
3244
libeasygl:
33-
- libs/libeasygl/*
34-
- libs/libeasygl/**/*
45+
- changed-files:
46+
- any-glob-to-any-file: libs/libeasygl/*
47+
- any-glob-to-any-file: libs/libeasygl/**/*
3548
liblog:
36-
- libs/liblog/*
37-
- libs/liblog/**/*
49+
- changed-files:
50+
- any-glob-to-any-file: libs/liblog/*
51+
- any-glob-to-any-file: libs/liblog/**/*
3852
libpugiutil:
39-
- libs/libpugiutil/*
40-
- libs/libpugiutil/**/*
53+
- changed-files:
54+
- any-glob-to-any-file: libs/libpugiutil/*
55+
- any-glob-to-any-file: libs/libpugiutil/**/*
4156
libvtrutil:
42-
- libs/libvtrutil/*
43-
- libs/libvtrutil/**/*
57+
- changed-files:
58+
- any-glob-to-any-file: libs/libvtrutil/*
59+
- any-glob-to-any-file: libs/libvtrutil/**/*
4460
external_libs:
45-
- libs/EXTERNAL/*
46-
- libs/EXTERNAL/**/*
61+
- changed-files:
62+
- any-glob-to-any-file: libs/EXTERNAL/*
63+
- any-glob-to-any-file: libs/EXTERNAL/**/*
4764

4865
# General areas
4966
docs:
50-
- docs/*
51-
- docs/**/*
52-
- "*README*"
53-
- "*.md"
54-
- tutorial
55-
- "*.rst"
67+
- changed-files:
68+
- any-glob-to-any-file: doc/*
69+
- any-glob-to-any-file: doc/**/*
70+
- any-glob-to-any-file: "*README*"
71+
- any-glob-to-any-file: "*.md"
72+
- any-glob-to-any-file: "*.rst"
5673
infra:
57-
- .github/*
58-
- .github/**/*
59-
- Dockerfile
60-
- "*docker*"
74+
- changed-files:
75+
- any-glob-to-any-file: .github/*
76+
- any-glob-to-any-file: .github/**/*
77+
- any-glob-to-any-file: Dockerfile
78+
- any-glob-to-any-file: "*docker*"
6179
build:
62-
- Makefile
63-
- "*.make"
64-
- CMakeLists.txt
65-
- cmake
80+
- changed-files:
81+
- any-glob-to-any-file: Makefile
82+
- any-glob-to-any-file: "*.make"
83+
- any-glob-to-any-file: CMakeLists.txt
84+
- any-glob-to-any-file: cmake/*
85+
- any-glob-to-any-file: cmake/**/*
6686
tests:
67-
- "*_test.py"
68-
- "*test*"
69-
- "*TESTS*"
87+
- changed-files:
88+
- any-glob-to-any-file: "*_test.py"
89+
- any-glob-to-any-file: "*test*"
90+
- any-glob-to-any-file: "*TESTS*"
7091
scripts:
71-
- scripts
72-
- "*.pl"
73-
- "*.py"
74-
- "*.sh"
92+
- changed-files:
93+
- any-glob-to-any-file: scripts
94+
- any-glob-to-any-file: "*.pl"
95+
- any-glob-to-any-file: "*.py"
96+
- any-glob-to-any-file: "*.sh"
7597
VTR Flow:
76-
- vtr_flow
98+
- changed-files:
99+
- any-glob-to-any-file: vtr_flow
77100

78101
# Tag pull requests with the languages used to make it easy to see what is
79102
# being used.
80103
lang-hdl:
81-
- "*.v"
82-
- "*.sv"
104+
- changed-files:
105+
- any-glob-to-any-file: "**/*.v"
106+
- any-glob-to-any-file: "**/*.sv"
83107
lang-cpp:
84-
- "*.c*"
85-
- "*.h"
108+
- changed-files:
109+
- any-glob-to-any-file: "**/*.c*"
110+
- any-glob-to-any-file: "**/*.h"
86111
lang-perl:
87-
- "*.pl"
88-
- "*perl*"
112+
- changed-files:
113+
- any-glob-to-any-file: "**/*.pl"
114+
- any-glob-to-any-file: "**/*perl*"
89115
lang-python:
90-
- "*.py"
116+
- changed-files:
117+
- any-glob-to-any-file: "**/*.py"
91118
lang-shell:
92-
- "*.sh"
119+
- changed-files:
120+
- any-glob-to-any-file: "**/*.sh"
93121
lang-netlist:
94-
- "*.blif"
95-
- "*.eblif"
96-
- "*.edif"
97-
- "*.vqm"
122+
- changed-files:
123+
- any-glob-to-any-file: "**/*.blif"
124+
- any-glob-to-any-file: "**/*.eblif"
125+
- any-glob-to-any-file: "**/*.edif"
126+
- any-glob-to-any-file: "**/*.vqm"
98127
lang-make:
99-
- "*.make"
100-
- Makefile
101-
- CMakeLists.txt
128+
- changed-files:
129+
- any-glob-to-any-file: "**/*.make"
130+
- any-glob-to-any-file: "**/*Makefile"
131+
- any-glob-to-any-file: "**/CMakeLists.txt"

.github/scripts/hostsetup.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apt install -y \
3030
build-essential \
3131
capnproto \
3232
clang \
33-
ctags \
33+
exuberant-ctags \
3434
curl \
3535
doxygen \
3636
flex \
@@ -50,20 +50,21 @@ apt install -y \
5050
libxft-dev \
5151
libxml++2.6-dev \
5252
libreadline-dev \
53-
python \
53+
python2 \
5454
python3 \
5555
python3-dev \
5656
python3-pip \
5757
python3-virtualenv \
5858
python3-yaml \
59-
tcl-dev \
59+
tcllib \
60+
tcl8.6-dev \
6061
libffi-dev \
6162
perl \
6263
texinfo \
6364
time \
6465
valgrind \
6566
zip \
66-
qt5-default \
67+
qtbase5-dev \
6768
uuid-dev \
6869
default-jdk \
6970
g++-9 \
@@ -75,7 +76,7 @@ apt install -y \
7576
apt install -y apt-transport-https ca-certificates gnupg
7677
wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc |apt-key add -
7778

78-
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
79+
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
7980
apt update
8081
apt install -y cmake
8182

.github/scripts/install_dependencies.sh

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ sudo apt install -y \
1111
binutils-gold \
1212
build-essential \
1313
capnproto \
14-
cmake \
15-
ctags \
14+
ament-cmake \
15+
exuberant-ctags \
1616
curl \
1717
doxygen \
1818
flex \
@@ -29,32 +29,34 @@ sudo apt install -y \
2929
libncurses5-dev \
3030
libx11-dev \
3131
libxft-dev \
32+
libxml2-utils \
3233
libxml++2.6-dev \
3334
libreadline-dev \
34-
tcl-dev \
35+
tcllib \
36+
tcl8.6-dev \
3537
libffi-dev \
3638
perl \
39+
pkg-config \
3740
texinfo \
3841
time \
3942
valgrind \
4043
zip \
41-
qt5-default \
44+
qtbase5-dev \
4245
uuid-dev \
4346
default-jdk \
44-
clang-format-7 \
45-
g++-7 \
46-
gcc-7 \
47-
g++-8 \
48-
gcc-8 \
4947
g++-9 \
5048
gcc-9 \
5149
g++-10 \
5250
gcc-10 \
5351
g++-11 \
5452
gcc-11 \
55-
clang-6.0 \
56-
clang-7 \
57-
clang-10 \
53+
g++-12 \
54+
gcc-12 \
55+
clang-11 \
56+
clang-12 \
57+
clang-13 \
58+
clang-14 \
59+
clang-format-14 \
5860
libtbb-dev
5961

6062
pip install -r requirements.txt
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/usr/bin/env bash
2+
3+
sudo apt update
4+
5+
sudo apt install -y \
6+
autoconf \
7+
automake \
8+
bash \
9+
bison \
10+
binutils \
11+
binutils-gold \
12+
build-essential \
13+
capnproto \
14+
exuberant-ctags \
15+
curl \
16+
doxygen \
17+
flex \
18+
fontconfig \
19+
gdb \
20+
git \
21+
gperf \
22+
libcairo2-dev \
23+
libcapnp-dev \
24+
libgtk-3-dev \
25+
libevent-dev \
26+
libfontconfig1-dev \
27+
liblist-moreutils-perl \
28+
libncurses5-dev \
29+
libx11-dev \
30+
libxft-dev \
31+
libxml2-utils \
32+
libxml++2.6-dev \
33+
libreadline-dev \
34+
tcllib \
35+
tcl8.6-dev \
36+
libffi-dev \
37+
perl \
38+
pkg-config \
39+
texinfo \
40+
time \
41+
valgrind \
42+
zip \
43+
qtbase5-dev \
44+
uuid-dev \
45+
default-jdk \
46+
g++-9 \
47+
gcc-9 \
48+
g++-10 \
49+
gcc-10 \
50+
g++-11 \
51+
gcc-11 \
52+
g++-12 \
53+
gcc-12 \
54+
g++-13 \
55+
gcc-13 \
56+
clang-14 \
57+
clang-18 \
58+
clang-format-14 \
59+
libtbb-dev
60+
61+
pip install -r requirements.txt
62+
63+
git clone https://github.com/capnproto/capnproto-java.git $GITHUB_WORKSPACE/env/capnproto-java
64+
pushd $GITHUB_WORKSPACE/env/capnproto-java
65+
make
66+
sudo make install
67+
popd

.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

0 commit comments

Comments
 (0)