johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-27 15:12:30 +02:00
Code Issues Releases Wiki Activity

Merge pull request #377 from Mizux/main

Browse Source 
Fix ci
This commit is contained in:
Guillaume Chatelet 2024-12-16 10:26:18 +01:00 committed by GitHub
commit 744e4511cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 76 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ci/Makefile
View File

@ -155,7 +155,8 @@ TOOLCHAIN_TARGETS = \
arm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi armeb-linux-gnueabihf armeb-linux-gnueabi \ arm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi armeb-linux-gnueabihf armeb-linux-gnueabi \
aarch64-linux-gnu aarch64_be-linux-gnu \ aarch64-linux-gnu aarch64_be-linux-gnu \
mips32 mips32el mips64 mips64el \ mips32 mips32el mips64 mips64el \
ppc ppc64 ppc64le \ ppc ppc-440fp ppc-e500mc \
ppc64 ppc64le \
riscv32 riscv64 \ riscv32 riscv64 \
s390x s390x
TOOLCHAIN_STAGES = env devel build test TOOLCHAIN_STAGES = env devel build test

15
cmake/ci/docker/toolchain/Dockerfile
View File

@ -5,25 +5,22 @@ LABEL maintainer="corentinl@google.com"
# Install system build dependencies # Install system build dependencies
ENV PATH=/usr/local/bin:$PATH ENV PATH=/usr/local/bin:$PATH
RUN apt-get update -qq \ RUN apt-get update -qq \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq git wget libssl-dev build-essential \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
ninja-build python3 python3-venv pkgconf libglib2.0-dev \ git wget libssl-dev \
build-essential cmake ninja-build \
python3 python3-venv \
pkgconf libglib2.0-dev \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENTRYPOINT ["/usr/bin/bash", "-c"] ENTRYPOINT ["/usr/bin/bash", "-c"]
CMD ["/usr/bin/bash"] CMD ["/usr/bin/bash"]
# Install CMake 3.21.3
RUN wget "https://cmake.org/files/v3.21/cmake-3.21.3-linux-x86_64.sh" \
&& chmod a+x cmake-3.21.3-linux-x86_64.sh \
&& ./cmake-3.21.3-linux-x86_64.sh --prefix=/usr/local/ --skip-license \
&& rm cmake-3.21.3-linux-x86_64.sh
FROM env AS devel FROM env AS devel
WORKDIR /home/project WORKDIR /home/project
COPY . . COPY . .
ARG TARGET ARG TARGET
ENV TARGET ${TARGET:-unknown} ENV TARGET=${TARGET:-unknown}
FROM devel AS build FROM devel AS build
RUN cmake -version RUN cmake -version

102
scripts/run_integration.sh
View File

@ -33,7 +33,7 @@ function install_qemu() {
>&2 echo 'QEMU is disabled !' >&2 echo 'QEMU is disabled !'
return 0 return 0
fi fi
local -r QEMU_VERSION=${QEMU_VERSION:=9.0.2} local -r QEMU_VERSION=${QEMU_VERSION:=9.0.4}
local -r QEMU_TARGET=${QEMU_ARCH}-linux-user local -r QEMU_TARGET=${QEMU_ARCH}-linux-user
if echo "${QEMU_VERSION} ${QEMU_TARGET}" | cmp --silent "${QEMU_INSTALL}/.build" -; then if echo "${QEMU_VERSION} ${QEMU_TARGET}" | cmp --silent "${QEMU_INSTALL}/.build" -; then
@ -49,8 +49,8 @@ function install_qemu() {
# Checking for a tarball before downloading makes testing easier :-) # Checking for a tarball before downloading makes testing easier :-)
local -r QEMU_URL="https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz" local -r QEMU_URL="https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz"
local -r QEMU_DIR="qemu-${QEMU_VERSION}" local -r QEMU_DIR="qemu-${QEMU_VERSION}"
unpack ${QEMU_URL} ${QEMU_DIR} unpack "${QEMU_URL}" "${QEMU_DIR}"
cd ${QEMU_DIR} || exit 2 cd "${QEMU_DIR}" || exit 2
# Qemu (meson based build) depends on: pkgconf, libglib2.0, python3, ninja # Qemu (meson based build) depends on: pkgconf, libglib2.0, python3, ninja
./configure \ ./configure \
@ -141,38 +141,62 @@ function expand_bootlin_config() {
local -r GCC_DIR=${ARCHIVE_DIR}/${GCC_RELATIVE_DIR} local -r GCC_DIR=${ARCHIVE_DIR}/${GCC_RELATIVE_DIR}
case "${TARGET}" in case "${TARGET}" in
"aarch64") "arm" | "armv7-eabihf")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2021.11-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="arm"
local -r GCC_SUFFIX="eabihf"
;;
"armeb" | "armebv7-eabihf")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="armeb"
local -r GCC_SUFFIX="eabihf"
;;
"arm64" | "aarch64")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="aarch64" local -r GCC_PREFIX="aarch64"
local -r GCC_SUFFIX=""
;; ;;
"aarch64be") "arm64be" | "aarch64be")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2021.11-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="aarch64_be" local -r GCC_PREFIX="aarch64_be"
local -r GCC_SUFFIX=""
;; ;;
"ppc64le") "ppc" | "ppc-440fp")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2021.11-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="powerpc64le"
;;
"ppc64")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2021.11-1.tar.bz2"
local -r GCC_PREFIX="powerpc64"
;;
"ppc")
#local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2021.11-1.tar.bz2"
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-1.tar.bz2"
local -r GCC_PREFIX="powerpc" local -r GCC_PREFIX="powerpc"
local -r GCC_SUFFIX=""
QEMU_ARGS+=( -cpu "440epx" )
;;
"ppc-e500mc")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="powerpc"
local -r GCC_SUFFIX=""
QEMU_ARGS+=( -cpu "e500mc" )
;;
"ppc64" | "ppc64-power8")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="powerpc64"
local -r GCC_SUFFIX=""
;;
"ppc64le" | "ppc64le-power8")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="powerpc64le"
local -r GCC_SUFFIX=""
;; ;;
"riscv32") "riscv32")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2022.08-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2024.05-1.tar.xz"
local -r GCC_PREFIX="riscv32" local -r GCC_PREFIX="riscv32"
local -r GCC_SUFFIX=""
;; ;;
"riscv64") "riscv64")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2022.08-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="riscv64" local -r GCC_PREFIX="riscv64"
local -r GCC_SUFFIX=""
;; ;;
"s390x") "s390x")
local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2022.08-1.tar.bz2" local -r TOOLCHAIN_URL="https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2024.05-1.tar.xz"
local -r GCC_PREFIX="s390x" local -r GCC_PREFIX="s390x"
local -r GCC_SUFFIX=""
;; ;;
*) *)
>&2 echo 'unknown power platform' >&2 echo 'unknown power platform'
@ -181,14 +205,14 @@ function expand_bootlin_config() {
local -r TOOLCHAIN_RELATIVE_DIR="${TARGET}" local -r TOOLCHAIN_RELATIVE_DIR="${TARGET}"
unpack "${TOOLCHAIN_URL}" "${TOOLCHAIN_RELATIVE_DIR}" unpack "${TOOLCHAIN_URL}" "${TOOLCHAIN_RELATIVE_DIR}"
local -r EXTRACT_DIR="${ARCHIVE_DIR}/$(basename ${TOOLCHAIN_URL%.tar.bz2})" local -r EXTRACT_DIR="${ARCHIVE_DIR}/$(basename ${TOOLCHAIN_URL%.tar.xz})"
local -r TOOLCHAIN_DIR=${ARCHIVE_DIR}/${TOOLCHAIN_RELATIVE_DIR} local -r TOOLCHAIN_DIR=${ARCHIVE_DIR}/${TOOLCHAIN_RELATIVE_DIR}
if [[ -d "${EXTRACT_DIR}" ]]; then if [[ -d "${EXTRACT_DIR}" ]]; then
mv "${EXTRACT_DIR}" "${TOOLCHAIN_DIR}" mv "${EXTRACT_DIR}" "${TOOLCHAIN_DIR}"
fi fi
local -r SYSROOT_DIR="${TOOLCHAIN_DIR}/${GCC_PREFIX}-buildroot-linux-gnu/sysroot" local -r SYSROOT_DIR="${TOOLCHAIN_DIR}/${GCC_PREFIX}-buildroot-linux-gnu${GCC_SUFFIX}/sysroot"
#local -r STAGING_DIR=${SYSROOT_DIR}-stage #local -r STAGING_DIR=${SYSROOT_DIR}-stage
# Write a Toolchain file # Write a Toolchain file
@ -362,13 +386,14 @@ DESCRIPTION
\tYou MUST define the following variables before running this script: \tYou MUST define the following variables before running this script:
\t* TARGET: \t* TARGET:
\t\tx86_64 \t\tx86_64
\t\taarch64 aarch64be (bootlin) \t\tarmv7-eabihf(arm) armebv7-eabihf(armeb) (bootlin)
\t\taarch64(arm64) aarch64be(arm64be) (bootlin)
\t\taarch64-linux-gnu aarch64_be-linux-gnu (linaro) \t\taarch64-linux-gnu aarch64_be-linux-gnu (linaro)
\t\tarm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi (linaro) \t\tarm-linux-gnueabihf armv8l-linux-gnueabihf arm-linux-gnueabi (linaro)
\t\tarmeb-linux-gnueabihf armeb-linux-gnueabi (linaro) \t\tarmeb-linux-gnueabihf armeb-linux-gnueabi (linaro)
\t\tmips32 mips32el (codespace) \t\tmips32 mips32el (codespace)
\t\tmips64 mips64el (codespace) \t\tmips64 mips64el (codespace)
\t\tppc (bootlin) \t\tppc-440fp(ppc) ppc-e500mc (bootlin)
\t\tppc64 ppc64le (bootlin) \t\tppc64 ppc64le (bootlin)
\t\triscv32 riscv64 (bootlin) \t\triscv32 riscv64 (bootlin)
\t\ts390x (bootlin) \t\ts390x (bootlin)
@ -430,10 +455,16 @@ function main() {
aarch64_be-linux-gnu) aarch64_be-linux-gnu)
expand_linaro_config expand_linaro_config
declare -r QEMU_ARCH=aarch64_be ;; declare -r QEMU_ARCH=aarch64_be ;;
aarch64) arm | armv7-eabihf)
expand_bootlin_config
declare -r QEMU_ARCH=arm ;;
armeb | armebv7-eabihf)
expand_bootlin_config
declare -r QEMU_ARCH=DISABLED ;;
arm64 | aarch64)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=aarch64 ;; declare -r QEMU_ARCH=aarch64 ;;
aarch64be) arm64be | aarch64be)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=aarch64_be ;; declare -r QEMU_ARCH=aarch64_be ;;
mips32) mips32)
@ -448,21 +479,24 @@ function main() {
mips64el) mips64el)
expand_codescape_config expand_codescape_config
declare -r QEMU_ARCH=mips64el ;; declare -r QEMU_ARCH=mips64el ;;
ppc64le)
expand_bootlin_config ppc | ppc-440fp | ppc-e500mc )
declare -r QEMU_ARCH=ppc64le ;;
ppc64)
expand_bootlin_config
declare -r QEMU_ARCH=ppc64 ;;
ppc)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=ppc ;; declare -r QEMU_ARCH=ppc ;;
ppc64 | ppc64-power8)
expand_bootlin_config
declare -r QEMU_ARCH=ppc64 ;;
ppc64le | ppc64le-power8)
expand_bootlin_config
declare -r QEMU_ARCH=ppc64le ;;
riscv32) riscv32)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=riscv32 ;; declare -r QEMU_ARCH=riscv32 ;;
riscv64) riscv64)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=riscv64 ;; declare -r QEMU_ARCH=riscv64 ;;
s390x) s390x)
expand_bootlin_config expand_bootlin_config
declare -r QEMU_ARCH=s390x ;; declare -r QEMU_ARCH=s390x ;;