Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmake/riscv64.toolchain
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ELSE()
IF(NOT XNNPACK_ENABLE_RISCV_FP16_VECTOR)
SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0 -L ${CMAKE_FIND_ROOT_PATH})
ELSE()
SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0,zfh=true,x-zvfh=true -L ${CMAKE_FIND_ROOT_PATH})
SET(QEMU_OPTION -cpu rv64,zba=true,zbb=true,zbc=true,zbs=true,v=true,vlen=${VLEN},elen=64,vext_spec=v1.0,zfh=true,zvfh=true -L ${CMAKE_FIND_ROOT_PATH})
ENDIF()
ENDIF()

Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile.riscv
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ RUN apt-get update && apt-get install -y \
bison

WORKDIR /src
RUN wget -nv https://download.qemu.org/qemu-9.2.2.tar.xz && \
tar xJf qemu-9.2.2.tar.xz
RUN wget -nv https://download.qemu.org/qemu-10.2.1.tar.xz && \
tar xJf qemu-10.2.1.tar.xz

WORKDIR /src/qemu-9.2.2
WORKDIR /src/qemu-10.2.1
RUN ./configure --target-list=riscv64-linux-user --static --disable-tools --disable-system --disable-docs
RUN make -j$(nproc)

Expand Down Expand Up @@ -48,7 +48,7 @@ RUN wget -nv https://github.com/riscv-collab/riscv-gnu-toolchain/releases/downlo
rm riscv64-glibc-ubuntu-24.04-llvm-nightly-2025.01.20-nightly.tar.xz

WORKDIR /opt/qemu/bin
COPY --from=qemu-builder /src/qemu-9.2.2/build/qemu-riscv64 .
COPY --from=qemu-builder /src/qemu-10.2.1/build/qemu-riscv64 .
ENV PATH="/opt/qemu/bin:${PATH}"

ARG USERNAME=xnnpack
Expand Down
Loading