Skip to content

Commit 2fec151

Browse files
authored
Merge branch 'master' into 20221103-initialize-enums
2 parents 77352cf + 1fa012b commit 2fec151

File tree

6,681 files changed

+17300760
-553261
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,681 files changed

+17300760
-553261
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/hostsetup.sh

Lines changed: 7 additions & 7 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,32 +50,32 @@ 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 \
7071
gcc-9 \
71-
wget \
72-
libtbb-dev
72+
wget
7373

7474
# installing the latest version of cmake
7575
apt install -y apt-transport-https ca-certificates gnupg
7676
wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc |apt-key add -
7777

78-
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
78+
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
7979
apt update
8080
apt install -y cmake
8181

.github/scripts/install_dependencies.sh

Lines changed: 13 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 \
@@ -31,30 +31,31 @@ sudo apt install -y \
3131
libxft-dev \
3232
libxml++2.6-dev \
3333
libreadline-dev \
34-
tcl-dev \
34+
tcllib \
35+
tcl8.6-dev \
3536
libffi-dev \
3637
perl \
38+
pkg-config \
3739
texinfo \
3840
time \
3941
valgrind \
4042
zip \
41-
qt5-default \
43+
qtbase5-dev \
4244
uuid-dev \
4345
default-jdk \
44-
clang-format-7 \
45-
g++-7 \
46-
gcc-7 \
47-
g++-8 \
48-
gcc-8 \
4946
g++-9 \
5047
gcc-9 \
5148
g++-10 \
5249
gcc-10 \
5350
g++-11 \
5451
gcc-11 \
55-
clang-6.0 \
56-
clang-7 \
57-
clang-10 \
52+
g++-12 \
53+
gcc-12 \
54+
clang-11 \
55+
clang-12 \
56+
clang-13 \
57+
clang-14 \
58+
clang-format-14 \
5859
libtbb-dev
5960

6061
pip install -r requirements.txt

.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)