Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update yosys version #469

Merged
merged 11 commits into from
Sep 19, 2024
Merged

update yosys version #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
769354e
update yosys version
cknizek Sep 11, 2024
d411bdc
Update dependencies.sh
cknizek Sep 11, 2024
8b56135
Update dependencies.sh
cknizek Sep 11, 2024
e131007
Update dependencies.sh
cknizek Sep 11, 2024
dbf53da
Update dependencies.sh
cknizek Sep 11, 2024
7dcc59d
update
cknizek Sep 12, 2024
0f83e8c
update
cknizek Sep 12, 2024
ed41374
update dockerfile
cknizek Sep 12, 2024
2481d08
update
cknizek Sep 12, 2024
aa871f3
update
cknizek Sep 12, 2024
337ceb7
update dockerfile with context
cknizek Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
gussmith23 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment here saying that Yosys depends on a submodule and so we cannot download an archive of it? Furthermore, say that, once dear-github/dear-github#214 is resolved, we could switch back to downloading an archive.

&& 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 \
Expand Down
2 changes: 1 addition & 1 deletion dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading