Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
container: Correct and test verible installation
Browse files Browse the repository at this point in the history
colluca committed Oct 3, 2024
1 parent c975a3d commit 74b741e
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions target/snitch_cluster/Makefile
Original file line number Diff line number Diff line change
@@ -167,6 +167,7 @@ $(GENERATED_DIR):

$(GENERATED_DIR)/snitch_cluster_wrapper.sv: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)
$(CLUSTER_GEN) -c $< -o $(GENERATED_DIR) --wrapper
$(VERIBLE_FMT) --inplace $@

$(GENERATED_DIR)/link.ld: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)
$(CLUSTER_GEN) -c $< -o $(GENERATED_DIR) --linker
@@ -179,9 +180,11 @@ $(GENERATED_DIR)/bootdata.cc: ${CFG} ${CLUSTER_GEN_PREREQ} | $(GENERATED_DIR)

# REGGEN regfile
$(PERIPH_DIR)/snitch_cluster_peripheral_reg_pkg.sv: $(PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv
$(VERIBLE_FMT) --inplace $@
$(PERIPH_DIR)/snitch_cluster_peripheral_reg_top.sv: $(PERIPH_DIR)/snitch_cluster_peripheral_reg.hjson
@echo "[REGGEN] Generating peripheral regfile"
$(REGGEN) -r -t $(PERIPH_DIR) $<
$(VERIBLE_FMT) --inplace $@

#############
# Verilator #
7 changes: 4 additions & 3 deletions util/container/Dockerfile
Original file line number Diff line number Diff line change
@@ -49,8 +49,8 @@ RUN wget https://github.com/pulp-platform/bender/releases/download/v${BENDER_VER

# Install Verible
RUN wget https://github.com/chipsalliance/verible/releases/download/v${VERIBLE_VERSION}/verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz && \
tar -x -f verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz --strip-components=1 -C . && \
rm -rf verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz
tar xzf verible-v${VERIBLE_VERSION}-linux-static-x86_64.tar.gz --strip-components=1 -C . && \
mv verible-v${VERIBLE_VERSION} verible

# Install Doxygen
RUN wget https://www.doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz && \
@@ -111,12 +111,13 @@ RUN ${VIRTUAL_ENV}/bin/pip install --upgrade pip && \
COPY --from=builder /tools/bender /tools/bin/
# COPY --from=builder /root/.cargo/bin/banshee /tools/bin/
COPY --from=builder /tools/doxygen/bin/doxygen /tools/bin/
COPY --from=builder /tools/verible* /tools/bin/
COPY --from=builder /tools/verible/bin/ /tools/verible
COPY --from=builder /tools/riscv-llvm /tools/riscv-llvm

# Modify environment and path variables
ENV VLT="verilator-wrap.sh"
ENV LLVM_BINROOT="/tools/riscv-llvm/bin"
ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
ENV PATH="/tools/bin:${PATH}"
ENV PATH="/tools/verible/bin:${PATH}"
ENV PATH="/tools/riscv-llvm/bin:${PATH}"

0 comments on commit 74b741e

Please sign in to comment.