From ce0d168acf4a84b22da4eae74ef084900fc863b1 Mon Sep 17 00:00:00 2001
From: cknizek <87683288+cknizek@users.noreply.github.com>
Date: Thu, 19 Sep 2024 14:15:44 -0700
Subject: [PATCH] update yosys version (#469)

---
 Dockerfile      | 21 ++++++++++++++-------
 dependencies.sh |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 45a23e95..02cd39c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -161,13 +161,20 @@ ENV PATH="/root/stp/build:${PATH}"
 ENV LD_LIBRARY_PATH="/root/stp/deps/cadical/build:/root/stp/deps/cadiback/:$LD_LIBRARY_PATH"
 
 # Build Yosys.
-WORKDIR /root
-RUN source /root/dependencies.sh \
-  && mkdir yosys && cd yosys \
-  && wget -qO- https://github.com/YosysHQ/yosys/archive/$YOSYS_COMMIT_HASH.tar.gz | tar xz --strip-components=1 \
-  && PREFIX="/root/.local" CPLUS_INCLUDE_PATH="/usr/include/tcl8.6/:$CPLUS_INCLUDE_PATH" make config-gcc \
-  && PREFIX="/root/.local" CPLUS_INCLUDE_PATH="/usr/include/tcl8.6/:$CPLUS_INCLUDE_PATH" make -j ${MAKE_JOBS} install \
-  && rm -rf /root/yosys
+WORKDIR /root 
+RUN cd /root \
+# TODO(@cknizek?): Replace this with archive download
+# Yosys depends on a submodule (abc) and so downloading an archive doesn't work.
+# Once this issue (https://github.com/dear-github/dear-github/issues/214)...
+# ... is resolved, we can go back to downloading an archive.
+&& git clone https://github.com/YosysHQ/yosys.git \
+&& cd yosys \
+&& source /root/dependencies.sh \
+&& git checkout $YOSYS_COMMIT_HASH \
+&& git submodule update --init --recursive \
+&& PREFIX="/root/.local" CPLUS_INCLUDE_PATH="/usr/include/tcl8.6/:$CPLUS_INCLUDE_PATH" make config-gcc \
+&& PREFIX="/root/.local" CPLUS_INCLUDE_PATH="/usr/include/tcl8.6/:$CPLUS_INCLUDE_PATH" make -j ${MAKE_JOBS} install \
+&& rm -rf /root/yosys
 
 # Build CVC5.
 RUN source /root/dependencies.sh \
diff --git a/dependencies.sh b/dependencies.sh
index 3c323334..cdc43963 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -26,6 +26,6 @@ export STP_COMMIT_HASH="918e55c011df5226d293d5f7a784507e03774e28"
 export YICES2_COMMIT_HASH="5326f0d645df6e38ae6e7d944381d01ba7d805ab"
 export BITWUZLA_COMMIT_HASH="9e5d7d82b0a0bfd3dc838eb3c3936acad500dc97"
 export RACKET_FMT_COMMIT_HASH="7d0a3dfff3a6cacfb59972a56d476556f89a0b1b"
-export YOSYS_COMMIT_HASH="70d35314dbd7521870047ed607897f22dc48cbc3"
+export YOSYS_COMMIT_HASH="092214256791007a433999635ed39fb9fc5d00ad"
 export CVC5_COMMIT_HASH="1d05a49387c041dba17f85f3c4e738b4b388ace2"
 export VERILATOR_COMMIT_HASH="881c6ee6557fbde017466553b2f0918250e9c4bd"