Skip to content

Commit c8cb440

Browse files
authored
[CPU][RV64] Remove SHL library, exclude Xuantie toolchain build (#33774)
### Details: - Remove SHL library usage for RISC-V CPU - Remove Xuantie toolchain usage from build (Xuantie toolchain based RISC-V emulator is still used for testing) - Rename toolchains for better consistency: linux_riscv (ex Xuantie) is the main pipeline, linux_riscv_conan (ex linux_riscv)- pipeline that checks conan build on RISC-V ### Tickets: - N/A
1 parent 921aa5a commit c8cb440

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+441
-1952
lines changed

.github/dockerfiles/docker_tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pr-29664
1+
pr-33774

.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ ENV DEBIAN_FRONTEND="noninteractive" \
1313
TZ="Europe/London"
1414

1515
RUN apt-get update && \
16-
apt-get install software-properties-common && \
16+
apt-get install software-properties-common wget && \
1717
add-apt-repository --yes --no-update ppa:git-core/ppa && \
1818
add-apt-repository --yes --no-update ppa:deadsnakes/ppa && \
19+
add-apt-repository --yes --no-update "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
20+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/llvm.asc && \
1921
apt-get update && \
2022
# install compilers to build OpenVINO for RISC-V 64
21-
apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu && \
23+
apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu binutils-riscv64-linux-gnu && \
2224
apt-get install \
2325
curl \
2426
git \
@@ -40,6 +42,10 @@ RUN apt-get update && \
4042
# Compilers
4143
gcc \
4244
g++ \
45+
# For clang-tidy validation
46+
clang-format-18 \
47+
clang-tidy-18 \
48+
libomp-18-dev \
4349
&& \
4450
rm -rf /var/lib/apt/lists/*
4551

@@ -62,9 +68,19 @@ RUN echo deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricte
6268

6369
RUN dpkg --add-architecture riscv64 && \
6470
apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/riscv64-sources.list && \
65-
apt-get install -y --no-install-recommends libpython3-dev:riscv64 && \
66-
apt-get install libgomp1:riscv64 && \
67-
apt-get install libatomic1:riscv64
71+
apt-get install -y --no-install-recommends libpython3-dev:riscv64
72+
73+
# Install sscache
74+
ARG SCCACHE_VERSION="v0.7.5"
75+
ENV SCCACHE_HOME="/opt/sccache" \
76+
SCCACHE_PATH="/opt/sccache/sccache"
77+
78+
RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
79+
SCCACHE_ARCHIVE="sccache-${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" && \
80+
curl -SLO https://github.com/mozilla/sccache/releases/download/${SCCACHE_VERSION}/${SCCACHE_ARCHIVE} && \
81+
tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}
82+
83+
ENV PATH="$SCCACHE_HOME:$PATH"
6884

6985
# Setup pip
7086
ENV PIP_VERSION="24.0"

.github/dockerfiles/ov_build/ubuntu_22_04_riscv_xuantie/Dockerfile

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

.github/workflows/clang_tidy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Set mock output images if pipeline should be skipped
7070
if: ${{ needs.smart_ci.outputs.skip_workflow == 'True' }}
7171
id: mock_image
72-
run: echo "images={\"ov_build\":{\"ubuntu_24_04_x64\":\"mock\", \"ubuntu_22_04_arm64\":\"mock\", \"ubuntu_22_04_riscv_xuantie\":\"mock\"}}" >> "$GITHUB_OUTPUT"
72+
run: echo "images={\"ov_build\":{\"ubuntu_24_04_x64\":\"mock\", \"ubuntu_22_04_arm64\":\"mock\", \"ubuntu_22_04_riscv_gnu\":\"mock\"}}" >> "$GITHUB_OUTPUT"
7373

7474
- name: Checkout
7575
if: ${{ needs.smart_ci.outputs.skip_workflow != 'True' }}
@@ -82,7 +82,7 @@ jobs:
8282
with:
8383
images: |
8484
ov_build/ubuntu_24_04_x64
85-
ov_build/ubuntu_22_04_riscv_xuantie
85+
ov_build/ubuntu_22_04_riscv
8686
registry: 'openvinogithubactions.azurecr.io'
8787
dockerfiles_root_dir: '.github/dockerfiles'
8888
changed_components: ${{ needs.smart_ci.outputs.changed_components }}
@@ -276,7 +276,7 @@ jobs:
276276
shell: bash
277277
runs-on: aks-linux-16-cores-32gb
278278
container:
279-
image: ${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv_xuantie }}
279+
image: ${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv }}
280280
volumes:
281281
- /mount:/mount
282282
- /home/runner/secrets/:/secrets:ro
@@ -317,7 +317,7 @@ jobs:
317317
run: |
318318
cmake \
319319
-G "${{ env.CMAKE_GENERATOR }}" \
320-
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/riscv64-100-xuantie-gnu.toolchain.cmake \
320+
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/riscv64.linux.toolchain.cmake \
321321
-DENABLE_CLANG_TIDY=ON \
322322
-DENABLE_PROFILING_ITT=FULL \
323323
-DENABLE_DEBUG_CAPS=ON \

0 commit comments

Comments
 (0)