Skip to content

Commit 5b2fccd

Browse files
authored
treewide: Bump AXI after rebase (#280)
* Bump AXI * container: Copy repo from build context instead of cloning
1 parent 01896a7 commit 5b2fccd

File tree

5 files changed

+12
-29
lines changed

5 files changed

+12
-29
lines changed

.dockerignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
with:
4848
docker-images: false
4949
- uses: actions/checkout@v4
50+
with:
51+
submodules: 'recursive'
5052
- uses: docker/setup-buildx-action@v3
5153
- name: GHCR Log-in
5254
uses: docker/login-action@v3

Bender.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
dependencies:
88
- common_cells
99
axi:
10-
revision: bec548fa2a9b18cbd7531105bb1fdf481ea8ad49
10+
revision: bd1abffc0812f8170902e5fb93142c7785c0b8c1
1111
version: null
1212
source:
1313
Git: https://github.com/colluca/axi.git

hw/snitch_cluster/src/snitch_cluster.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ module snitch_cluster
411411
typedef logic [WideIdWidthOut-1:0] id_dma_slv_t;
412412
typedef logic [NarrowUserWidth-1:0] user_t;
413413
typedef struct packed {
414-
logic [WideUserWidth-1:0] mcast;
414+
logic [WideUserWidth-1:0] collective_mask;
415415
} user_dma_t;
416416

417417
typedef logic [TCDMMemAddrWidth-1:0] tcdm_mem_addr_t;

util/container/Dockerfile

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ RUN apt-get update && \
7878
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
7979

8080
# Copy all needed files to install the package
81-
# (.dockerignore is used to filter only the necessary files)
82-
COPY pyproject.toml .
83-
COPY sw ./sw
84-
COPY util ./util
85-
COPY nonfree/util ./nonfree/util
81+
COPY . /repo
8682

8783
# Create and activate virtual environment
8884
ENV VIRTUAL_ENV="/root/.venvs/snitch_cluster"
@@ -108,7 +104,7 @@ ENV PATH="/repo/target/sim/build/bin:${PATH}"
108104
ARG PIP_NO_CACHE_DIR=1
109105
RUN pip install --upgrade pip && \
110106
pip install torch --index-url https://download.pytorch.org/whl/cpu && \
111-
pip install .[all]
107+
pip install /repo[all]
112108

113109
#-------------------------------------------------------------------------------
114110
# Stage 3: Hardware build
@@ -117,15 +113,10 @@ RUN pip install --upgrade pip && \
117113

118114
FROM snitch_cluster-hw AS hw-builder
119115

120-
# Patch .gitmodules to replace SSH URLs with HTTPS
121-
# Clone the snitch_cluster repository into /repo
122-
# If the repo URL or commit hash doesn't change, this layer remains cached.
123-
RUN git config --global url."https://github".insteadOf "git://github" \
124-
&& git config --global url."https://github.com/".insteadOf "[email protected]:" \
125-
&& git clone --recursive https://github.com/pulp-platform/snitch_cluster /repo \
126-
&& cd /repo \
127-
# Build the verilator model
128-
&& make verilator
116+
# Copy the snitch_cluster repository from the build context into /repo
117+
COPY . /repo
118+
# Build the verilator model
119+
RUN cd /repo && make verilator
129120

130121
#-------------------------------------------------------------------------------
131122
# Stage 4: Software development stage
@@ -153,11 +144,7 @@ RUN apt-get update && \
153144
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
154145

155146
# Copy all needed files to install the package
156-
# (.dockerignore is used to filter only the necessary files)
157-
COPY pyproject.toml /snitch_cluster/pyproject.toml
158-
COPY sw /snitch_cluster/sw
159-
COPY util /snitch_cluster/util
160-
COPY nonfree/util /snitch_cluster/nonfree/util
147+
COPY . /repo
161148

162149
# Create and activate virtual environment
163150
ENV VIRTUAL_ENV="/root/.venvs/snitch_cluster"
@@ -182,4 +169,4 @@ ENV PATH="/tools/riscv-llvm/bin:${PATH}"
182169
ARG PIP_NO_CACHE_DIR=1
183170
RUN pip install --upgrade pip && \
184171
pip install torch --index-url https://download.pytorch.org/whl/cpu && \
185-
pip install /snitch_cluster[all]
172+
pip install /repo[all]

0 commit comments

Comments
 (0)