Skip to content

Commit 2efcf86

Browse files
committed
etc: eqy/sby match orfs yosys version
Make eqy/sby tools match yosys version from the submodule Signed-off-by: Vitor Bandeira <vvbandeira@precisioninno.com>
1 parent b9eee30 commit 2efcf86

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

etc/DependencyInstaller.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ _versionCompare() {
2020
}
2121

2222
_installORDependencies() {
23-
./tools/OpenROAD/etc/DependencyInstaller.sh ${OR_INSTALLER_ARGS}
23+
if [[ ${YOSYS_VER} == "" ]]; then
24+
YOSYS_VER=$(grep 'yosys_ver =' tools/yosys/docs/source/conf.py | awk -F'"' '{print $2}')
25+
fi
26+
./tools/OpenROAD/etc/DependencyInstaller.sh ${OR_INSTALLER_ARGS} -yosys-ver="${YOSYS_VER}"
2427
}
2528

2629
_installPipCommon() {
@@ -306,6 +309,10 @@ Usage: $0 [-all|-base|-common] [-<ARGS>]
306309
# sudo or with root access.
307310
$0 -ci
308311
# Installs CI tools
312+
$0 -yosys-ver=VERSION
313+
# Installs specified version of Yosys.
314+
# By default, the Yosys version is
315+
# obtained from tools/yosys/docs/source/conf.py
309316
$0 -constant-build-dir
310317
# Use constant build directory, instead of
311318
# random one.
@@ -315,6 +322,7 @@ EOF
315322

316323
# default args
317324
OR_INSTALLER_ARGS="-eqy"
325+
YOSYS_VER=""
318326
# default prefix
319327
PREFIX=""
320328
# default option
@@ -355,6 +363,9 @@ while [ "$#" -gt 0 ]; do
355363
CI="yes"
356364
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -save-deps-prefixes=/etc/openroad_deps_prefixes.txt"
357365
;;
366+
-yosys-ver=*)
367+
YOSYS_VER=${1#*=}
368+
;;
358369
-prefix=*)
359370
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} $1"
360371
PREFIX=${1#*=}

etc/DockerHelper.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ _setup() {
7373
fromImage="${FROM_IMAGE_OVERRIDE:-$osBaseImage}"
7474
cp tools/OpenROAD/etc/DependencyInstaller.sh etc/InstallerOpenROAD.sh
7575
context="etc"
76-
buildArgs="--build-arg options=${options} ${noConstantBuildDir}"
76+
local yosys_ver
77+
yosys_ver=$(grep 'yosys_ver =' tools/yosys/docs/source/conf.py | awk -F'"' '{print $2}')
78+
options+=" -yosys-ver=${yosys_ver}"
79+
buildArgs="--build-arg options='"
80+
buildArgs+="${options}'"
81+
buildArgs+="${noConstantBuildDir}"
7782
;;
7883
*)
7984
echo "Target ${target} not found" >&2

tools/OpenROAD

Submodule OpenROAD updated 166 files

0 commit comments

Comments
 (0)