Skip to content

Commit b2c3774

Browse files
committed
Remove independent dockerfiles already included by synthesis and simulation
1 parent 9f202ac commit b2c3774

8 files changed

Lines changed: 60 additions & 212 deletions

‎dockerfiles/Dockerfile.ghdl‎

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

‎dockerfiles/Dockerfile.iverilog‎

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

‎dockerfiles/Dockerfile.langutils‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ RUN apt-get install -y --no-install-recommends \
1010
ca-certificates \
1111
git
1212

13-
RUN apt-get install -y --no-install-recommends \
14-
cargo \
15-
cmake \
16-
curl \
17-
default-jre \
18-
python3 \
19-
python3-orderedmultidict
20-
2113
#
2214
# vhd2vl (https://github.com/ldoolitt/vhd2vl)
2315
#
@@ -104,10 +96,11 @@ RUN apt-get install -y --no-install-recommends \
10496
RUN cargo install --root /usr/local --git https://github.com/dalance/svlint.git svlint
10597

10698
#
107-
# clean-up
99+
# Optimization
108100
#
109101

110-
RUN rm -f /usr/local/bin/stack /usr/local/bin/bazel
102+
RUN strip /usr/local/bin/* 2>/dev/null || true
103+
RUN find /usr/local/lib -name "*.so*" -exec strip --strip-unneeded {} + 2>/dev/null || true
111104

112105
#------------------------------------------------------------------------------
113106

‎dockerfiles/Dockerfile.simulation‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,52 @@ WORKDIR /tmp
55
ENV DEBIAN_FRONTEND=noninteractive
66

77
RUN apt-get update -qq
8+
89
RUN apt-get install -y --no-install-recommends \
910
ca-certificates \
1011
git
12+
13+
#
14+
# GHDL (https://github.com/ghdl/ghdl)
15+
#
16+
1117
RUN apt-get install -y --no-install-recommends \
12-
autoconf \
13-
bison \
1418
build-essential \
15-
flex \
1619
gnat \
17-
gperf \
18-
help2man \
19-
libfl-dev \
20-
python3 \
21-
python3-dev \
22-
python3-pip \
23-
python3-venv \
2420
zlib1g-dev
2521

26-
#
27-
# ghdl
28-
#
29-
3022
RUN git clone --depth 1 https://github.com/ghdl/ghdl
3123
RUN mkdir ghdl/build && cd ghdl/build && ../configure --prefix=/usr/local \
3224
&& make -j$(nproc) && make install
3325

3426
#
35-
# iVerilog
27+
# iVerilog (https://github.com/steveicarus/iverilog)
3628
#
3729

30+
RUN apt-get install -y --no-install-recommends \
31+
autoconf \
32+
bison \
33+
build-essential \
34+
flex \
35+
gperf
36+
3837
RUN git clone --depth 1 https://github.com/steveicarus/iverilog
3938
RUN cd iverilog && autoconf && ./configure \
4039
&& make -j$(nproc) && make install
4140

4241
#
43-
# Verilator
42+
# Verilator (https://github.com/verilator/verilator)
4443
#
4544

45+
RUN apt-get install -y --no-install-recommends \
46+
autoconf \
47+
bison \
48+
build-essential \
49+
flex \
50+
help2man \
51+
libfl-dev \
52+
python3
53+
4654
RUN git clone --depth 1 https://github.com/verilator/verilator
4755
RUN cd verilator && autoconf && ./configure \
4856
&& make -j$(nproc) && make install
@@ -51,7 +59,11 @@ RUN cd verilator && autoconf && ./configure \
5159
# cocotb
5260
#
5361

54-
# RUN pip install cocotb --break-system-packages
62+
RUN apt-get install -y --no-install-recommends \
63+
python3 \
64+
python3-dev \
65+
python3-pip \
66+
python3-venv
5567

5668
RUN python3 -m venv /opt/venv && /opt/venv/bin/pip install --no-cache-dir cocotb
5769

‎dockerfiles/Dockerfile.synlig‎

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

‎dockerfiles/Dockerfile.synthesis‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@ WORKDIR /tmp
55
ENV DEBIAN_FRONTEND=noninteractive
66

77
RUN apt-get update -qq
8+
89
RUN apt-get install -y --no-install-recommends \
910
ca-certificates \
1011
git
12+
13+
#
14+
# GHDL (https://github.com/ghdl/ghdl)
15+
#
16+
1117
RUN apt-get install -y --no-install-recommends \
12-
bison \
1318
build-essential \
14-
cmake \
15-
default-jre \
16-
flex \
1719
gnat \
18-
libffi-dev \
19-
libreadline-dev \
20-
pkg-config \
21-
python3-orderedmultidict \
22-
tcl-dev \
2320
zlib1g-dev
2421

25-
#
26-
# GHDL
27-
#
28-
2922
RUN git clone --depth 1 https://github.com/ghdl/ghdl
3023
RUN mkdir ghdl/build && cd ghdl/build && ../configure --prefix=/usr/local \
3124
&& make -j$(nproc) && make install
3225

3326
#
34-
# Yosys
27+
# Yosys (https://github.com/yosyshq/yosys)
3528
#
3629

30+
RUN apt-get install -y --no-install-recommends \
31+
bison \
32+
build-essential \
33+
cmake \
34+
flex \
35+
python3
36+
3737
RUN git clone --depth 1 https://github.com/YosysHQ/yosys
3838
RUN cd yosys && git submodule update --init --depth 1 \
3939
&& cmake -B build . -DCMAKE_BUILD_TYPE=Release \
@@ -49,9 +49,22 @@ RUN cd ghdl-yosys-plugin && git submodule update --init --depth 1 \
4949
&& make -j$(nproc) && make install
5050

5151
#
52-
# Synlig
52+
# Synlig (https://github.com/chipsalliance/synlig)
5353
#
5454

55+
RUN apt-get install -y --no-install-recommends \
56+
bison \
57+
build-essential \
58+
cmake \
59+
default-jre \
60+
flex \
61+
libffi-dev \
62+
libreadline-dev \
63+
pkg-config \
64+
python3 \
65+
python3-orderedmultidict \
66+
tcl-dev
67+
5568
RUN git clone --depth 1 https://github.com/chipsalliance/synlig
5669
RUN cd synlig \
5770
&& git submodule update --init --depth 1 --recursive third_party/surelog \

‎dockerfiles/Dockerfile.verilator‎

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

‎dockerfiles/Dockerfile.yosys‎

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

0 commit comments

Comments
 (0)