diff --git a/images/covered/info.json b/images/covered/info.json index 72dcb5bb..cec73c1f 100755 --- a/images/covered/info.json +++ b/images/covered/info.json @@ -1,9 +1,9 @@ { - "args" : { - "GIT": "true", - "BASE_IMAGE" : "base", - "NAME": "covered", - "REPO_URL": "https://github.com/Manarabdelaty/verilog-covered", - "REPO_COMMIT": "93bee2e0d89c1beb5943a329109dcf24d59498e6" - } -} + "args": { + "GIT": "true", + "BASE_IMAGE": "base", + "NAME": "covered", + "REPO_URL": "https://github.com/Manarabdelaty/verilog-covered", + "REPO_COMMIT": "93bee2e0d89c1beb5943a329109dcf24d59498e6" + } +} \ No newline at end of file diff --git a/images/dv/Dockerfile b/images/dv/Dockerfile index 896c4737..cbf42c06 100755 --- a/images/dv/Dockerfile +++ b/images/dv/Dockerfile @@ -11,7 +11,7 @@ FROM base COPY --from=iverilog /foss/tools/ /foss/tools/ COPY --from=rv32i /foss/tools/ /foss/tools/ COPY --from=opensta /foss/tools/ /foss/tools/ -COPY --from=cvc /foss/tools/ /foss/tools/simcvc +COPY --from=cvc /foss/tools/ /foss/tools/ ADD ./scripts/env.sh /root/.bashrc ADD ./scripts/env.sh /.bashrc diff --git a/images/dv/scripts/env.sh b/images/dv/scripts/env.sh index 415604fa..7712dca4 100755 --- a/images/dv/scripts/env.sh +++ b/images/dv/scripts/env.sh @@ -1,5 +1,5 @@ -base_path=/foss/tools/ +base_path=/foss/tools function get_path() { tool_name=$1 bin_path=$(realpath $base_path/$tool_name/*/bin) @@ -9,8 +9,8 @@ function get_path() { iverilog_path=$(get_path "iverilog") riscv32i_path=$(get_path "riscv-gnu-toolchain-rv32i" ) opensta_path=$(get_path "opensta") -simcvc_path=$(get_path "simcvc") +cvc_path=$(get_path "cvc") -export PATH=$PATH:${iverilog_path}:${riscv32i_path}:${opensta_path}:${simcvc_path} +export PATH=$PATH:${iverilog_path}:${riscv32i_path}:${opensta_path}:${cvc_path} export GCC_PATH=${riscv32i_path} diff --git a/images/foss-asic-tools/Dockerfile b/images/foss-asic-tools/Dockerfile index 87ce63e4..2c3c420f 100755 --- a/images/foss-asic-tools/Dockerfile +++ b/images/foss-asic-tools/Dockerfile @@ -54,13 +54,15 @@ FROM xyce as xyce FROM covered as covered FROM cvc as cvc FROM opensta as opensta -FROM dv as dv +FROM efabless/dv as dv FROM irsim as irsim +#FROM openroad as openroad FROM base COPY --from=pdk /foss/pdks/ /foss/pdks/ -COPY --from=openlane /openlane /foss/tools/openlane +COPY --from=openlane /openlane /foss/tools/openlane +#COPY --from=openroad /foss/tools/openroad /foss/tools/ COPY --from=gtkwave /foss/tools/ /foss/tools/ COPY --from=iverilog /foss/tools/ /foss/tools/ COPY --from=magic /foss/tools/ /foss/tools/ diff --git a/images/foss-asic-tools/info.json b/images/foss-asic-tools/info.json index d3397ad0..3a27e624 100755 --- a/images/foss-asic-tools/info.json +++ b/images/foss-asic-tools/info.json @@ -6,4 +6,4 @@ "REPO_URL": "https://github.com/efabless/foss-asic-tools", "REPO_COMMIT": "alpha" } -} +} \ No newline at end of file diff --git a/images/foss-asic-tools/scripts/tools.sh b/images/foss-asic-tools/scripts/tools.sh index e8bfcab5..13bb0a1f 100644 --- a/images/foss-asic-tools/scripts/tools.sh +++ b/images/foss-asic-tools/scripts/tools.sh @@ -28,5 +28,8 @@ yum install -y \ bzip2 \ mailcap \ numpy \ - gedit + gedit \ + xterm \ + meld \ + diff --git a/images/iverilog/info.json b/images/iverilog/info.json index 1bdbdce8..68d28f61 100755 --- a/images/iverilog/info.json +++ b/images/iverilog/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "iverilog", "REPO_URL": "https://github.com/steveicarus/iverilog.git", - "REPO_COMMIT": "668f9850bc74c49842302891d63d7d42058e4a11" + "REPO_COMMIT": "bc0fc4ab894ae1c1f549276e75ad31ebaafbd362" } } \ No newline at end of file diff --git a/images/klayout/info.json b/images/klayout/info.json index 3089305c..fbcd5121 100755 --- a/images/klayout/info.json +++ b/images/klayout/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "klayout", "REPO_URL": "https://github.com/KLayout/klayout", - "REPO_COMMIT": "ffb81a66eac7bddfc7dc8aef3edf22241f677d01" + "REPO_COMMIT": "d764adb1016f74d3e9cc8059cb183f5fc29b2a25" } } \ No newline at end of file diff --git a/images/ngscope/info.json b/images/ngscope/info.json index 9522f8db..17ffca96 100755 --- a/images/ngscope/info.json +++ b/images/ngscope/info.json @@ -6,4 +6,4 @@ "REPO_URL": "n/a", "REPO_COMMIT": "0.9.5" } -} +} \ No newline at end of file diff --git a/images/open_pdks/info.json b/images/open_pdks/info.json index 356def28..aa9bce0f 100755 --- a/images/open_pdks/info.json +++ b/images/open_pdks/info.json @@ -5,7 +5,7 @@ "MAGIC_IMAGE": "magic", "NAME": "open_pdks", "REPO_URL": "https://github.com/RTimothyEdwards/open_pdks", - "REPO_COMMIT": "cabdd63c8df3fce5a825deed8b8f679172b1c443", + "REPO_COMMIT": "774b26abc485d74468dc3369483799f1b6fc93d0", "SKYWATER_IMAGE": "skywater-pdk" } } \ No newline at end of file diff --git a/images/openlane/info.json b/images/openlane/info.json index 573851fe..d2977ca7 100755 --- a/images/openlane/info.json +++ b/images/openlane/info.json @@ -1,9 +1,9 @@ { "args": { - "GIT": "true", + "GIT": "false", "BASE_IMAGE": "base", "NAME": "openlane", "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenLane", - "REPO_COMMIT": "2022.02.01_02.19.58" + "REPO_COMMIT": "2022.02.08_01.48.52" } -} \ No newline at end of file +} diff --git a/images/openroad/Dockerfile b/images/openroad/Dockerfile new file mode 100755 index 00000000..536ed6c9 --- /dev/null +++ b/images/openroad/Dockerfile @@ -0,0 +1,13 @@ +ARG BASE_IMAGE +FROM ${BASE_IMAGE} as builder + +ARG REPO_URL +ARG REPO_COMMIT +ARG NAME + +#ADD scripts/dependencies.sh dependencies.sh +#RUN bash dependencies.sh + +ADD scripts/install.sh install.sh +RUN bash install.sh +# diff --git a/images/openroad/info.json b/images/openroad/info.json new file mode 100755 index 00000000..65787aea --- /dev/null +++ b/images/openroad/info.json @@ -0,0 +1,9 @@ +{ + "args": { + "GIT": "true", + "BASE_IMAGE": "base", + "NAME": "openroad", + "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenROAD.git", + "REPO_COMMIT": "5782fa96bde0109c9ca46c1a01a95dc00579082c" + } +} \ No newline at end of file diff --git a/images/openroad/scripts/install.sh b/images/openroad/scripts/install.sh new file mode 100644 index 00000000..8e6f11a2 --- /dev/null +++ b/images/openroad/scripts/install.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +yum install -y centos-release-scl git devtoolset-8-gcc devtoolset-8-gcc-c++ +source scl_source enable devtoolset-8 +scl enable devtoolset-8 bash + + +git clone --recursive https://github.com/The-OpenROAD-Project/OpenROAD.git +cd OpenROAD/ +git submodule update --init --recursive +./etc/DependencyInstaller.sh -dev +mkdir build +cd build +cmake .. -DCMAKE_INSTALL_PREFIX="/foss/tools/openroad" +make +make install + + + +sudo apt update +sudo apt install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev curl libbz2-dev + +curl -O https://www.python.org/ftp/python/3.8.2/Python-3.8.2.tar.xz +tar -xf Python-3.8.2.tar.xz diff --git a/images/opensta/info.json b/images/opensta/info.json index 25026d18..b7283992 100755 --- a/images/opensta/info.json +++ b/images/opensta/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "opensta", "REPO_URL": "https://github.com/The-OpenROAD-Project/OpenSTA", - "REPO_COMMIT": "104f90089a0e4427e1fa03d59a583e7414fbbb20" + "REPO_COMMIT": "6802190c15625b2f72e1a04c0f5763e8cd65a490" } } \ No newline at end of file diff --git a/images/riscv-gnu-toolchain-rv32i/info.json b/images/riscv-gnu-toolchain-rv32i/info.json index b6ed8a22..6c723c41 100755 --- a/images/riscv-gnu-toolchain-rv32i/info.json +++ b/images/riscv-gnu-toolchain-rv32i/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "riscv-gnu-toolchain-rv32i", "REPO_URL": "https://github.com/riscv/riscv-gnu-toolchain", - "REPO_COMMIT": "411d134" + "REPO_COMMIT": "f640044a947afb39c78b96fa1ba1db8aa31b1d89" } } \ No newline at end of file diff --git a/images/xschem/info.json b/images/xschem/info.json index 3ae34314..8130f02e 100755 --- a/images/xschem/info.json +++ b/images/xschem/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "xschem", "REPO_URL": "https://github.com/StefanSchippers/xschem.git", - "REPO_COMMIT": "432db0799ea068707cad65f84fe4b8f9b7c00ce5" + "REPO_COMMIT": "a0e7a9ed78f38cc8d5602161a1ebc97f763dcadd" } } \ No newline at end of file diff --git a/images/xyce/info.json b/images/xyce/info.json index 7af0ef71..dd8d755e 100755 --- a/images/xyce/info.json +++ b/images/xyce/info.json @@ -4,6 +4,6 @@ "BASE_IMAGE": "base", "NAME": "xyce", "REPO_URL": "https://github.com/Xyce/Xyce.git", - "REPO_COMMIT": "f5d3d9906a103711bbde83b17d3a6afd6b33fc20" + "REPO_COMMIT": "94f506b8a8c8415d7e76d63b5ef78c1f2fc3a899" } } \ No newline at end of file diff --git a/recipes/recipe-openroad.csv b/recipes/recipe-openroad.csv new file mode 100644 index 00000000..54bfeddc --- /dev/null +++ b/recipes/recipe-openroad.csv @@ -0,0 +1,4 @@ +Name,Version +base,alpha +openroad,5782fa96bde0109c9ca46c1a01a95dc00579082c +foss-asic-tools,openroad diff --git a/recipes/recipe.csv b/recipes/recipe.csv index 32f7e255..8b39ad74 100755 --- a/recipes/recipe.csv +++ b/recipes/recipe.csv @@ -1,18 +1,19 @@ Name,Version base,alpha magic,113f0dfb3f5df026127daba209e1252eadc67d8e -klayout,ffb81a66eac7bddfc7dc8aef3edf22241f677d01 +klayout,d764adb1016f74d3e9cc8059cb183f5fc29b2a25 skywater-pdk,f70d8ca46961ff92719d8870a18a076370b85f6c -open_pdks,cabdd63c8df3fce5a825deed8b8f679172b1c443 +open_pdks,774b26abc485d74468dc3369483799f1b6fc93d0 gtkwave,48c6409ed001f28eae9dc5fe87bb0b6b1a7c1217 iverilog,bc0fc4ab894ae1c1f549276e75ad31ebaafbd362 netgen,bfb01e032f668c09ff43e889f35d611ef0e4a317 riscv-gnu-toolchain-rv32i,f640044a947afb39c78b96fa1ba1db8aa31b1d89 +openlane,2022.02.08_01.48.52 gaw3-xschem,a3239fdcc700e7b33331051eb22f47904112e849 ngscope,0.9.5 ngspice,1a6a9e6bb60ad8d07ecbfb3f35dea22379fb73e9 -xschem,432db0799ea068707cad65f84fe4b8f9b7c00ce5 -xyce,f5d3d9906a103711bbde83b17d3a6afd6b33fc20 +xschem,a0e7a9ed78f38cc8d5602161a1ebc97f763dcadd +xyce,94f506b8a8c8415d7e76d63b5ef78c1f2fc3a899 covered,93bee2e0d89c1beb5943a329109dcf24d59498e6 irsim,3813495e55a21a024e62e21bd6993fac068a61b9 opensta,6802190c15625b2f72e1a04c0f5763e8cd65a490