From nobody Thu May 16 01:04:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1671461151; cv=none; d=zohomail.com; s=zohoarc; b=eZOjkAAR+Wrh93Hk4AAb9yq+7Y0QZ54Ook43wRG/e9shKrEMYpE+V2zBlq4vq4wa9E+EbOp97gszV5t7vUTx245BX73vUgLEROIHrZg/od+7Y+aNmsLOk7ZnEFYRXFbD/Htb5t9f7nb5rDXt+UZXgYdggdm2l9U/F6u5MEZRsE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671461151; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=haeM0FZyX9ne1ZZhzIIgNTSpdJ0yU8AKrd1bHE4PzIU=; b=WWQ0VKIdW/FuwoN3tYd+sP8LktQb/KBXUEgSVEpVVFaTCimhmMaR/WfmkDC7laJPXlMSWHWzItzpn+z8+s8urA8qz7hsuS3AbWtCtzcY9tQzgAGpRo5gRcoVjOuxYF7RdZ40271quOSuvl90sTGQRTwoBJ4P1V/GLAm/G4wt06g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1671461151218402.5296125181096; Mon, 19 Dec 2022 06:45:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7HO3-00079P-D5; Mon, 19 Dec 2022 09:45:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7HNz-00077F-1g for qemu-devel@nongnu.org; Mon, 19 Dec 2022 09:44:59 -0500 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7HNv-0003ZM-38 for qemu-devel@nongnu.org; Mon, 19 Dec 2022 09:44:58 -0500 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BJDwEHp007735; Mon, 19 Dec 2022 14:44:51 GMT Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3mh5c7vhdy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Dec 2022 14:44:51 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 2BJEio5d022583 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Dec 2022 14:44:50 GMT Received: from mthiyaga-linux.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 19 Dec 2022 06:44:46 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=haeM0FZyX9ne1ZZhzIIgNTSpdJ0yU8AKrd1bHE4PzIU=; b=VFqEmPqCoLR0o4ivFthfFMTok8xRyeMDD9YKgcbAMk0y+yAUmcEIqQvGw+p8A9Gbuv3i T2DdUkWIF7bfzJtLZKE8mst8q37XPre02jPtEoD+mhoGOmS3WoYBpAOgf/OL2X3o+Z/S k7UMHyscJ2HY24dit1f9dcTa1LuL+Ag/1wlJ0fNuMOnii50jbtw5T0KOXoWkI1aDQPAm i3qWO8ri3NKyRzG/FaiFw1nfx9qAv3Js+1fxd3dry1E8kTqYWgsElTF/2QkUnlvO4TAQ JRO/u8Ugto9gPe0HAqatQhBNI6DEwIrl310+0ySj91y8yfKoNyIr0sxD7+KiZiZvRdwA /g== From: Mukilan Thiyagarajan To: , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , "Wainer dos Santos Moschetta" , Beraldo Leal CC: , , , , , Mukilan Thiyagarajan Subject: [PATCH] tests/docker: use prebuilt toolchain for debian-hexagon-cross Date: Mon, 19 Dec 2022 20:13:54 +0530 Message-ID: <20221219144354.11659-1-quic_mthiyaga@quicinc.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: VvKuiu5SqERJui5exddDBP0J2sepoX0T X-Proofpoint-ORIG-GUID: VvKuiu5SqERJui5exddDBP0J2sepoX0T X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-19_01,2022-12-15_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 impostorscore=0 spamscore=0 priorityscore=1501 suspectscore=0 phishscore=0 clxscore=1011 mlxlogscore=999 adultscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212190130 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=quic_mthiyaga@quicinc.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @quicinc.com) X-ZM-MESSAGEID: 1671461153162100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current docker image for cross compiling hexagon guests is manually built since it takes >2 hours to build from source. This patch: 1. Solves the above issue by using the prebuilt clang toolchain hosted on CodeLinaro [1] and maintained by QUIC [2]. 2. The dockerfile is also switched from multi-stage to single stage build to allow the CI docker engine to reuse the layer cache. 3. Re-enables the hexagon-cross-container job to be always run in CI and makes it a non-optional dependency for the build-user-hexagon job. The changes for 1 & 2 together bring down the build time to ~3 minutes in GitLab CI when cache is reused and ~9 minutes when cache cannot be reused. [1]: https://github.com/CodeLinaro/hexagon-builder [2]: https://github.com/quic/toolchain_for_hexagon/releases/ Based-on: <20221215095820.13374-1-quic._5Fmthiyaga@quicinc.com> tests/tcg/multiarch: remove unused variable in linux-test Signed-off-by: Mukilan Thiyagarajan --- .gitlab-ci.d/buildtest.yml | 4 - .gitlab-ci.d/container-cross.yml | 19 +-- tests/docker/Makefile.include | 4 - .../debian-hexagon-cross.d/build-toolchain.sh | 141 ------------------ .../dockerfiles/debian-hexagon-cross.docker | 53 +++---- 5 files changed, 20 insertions(+), 201 deletions(-) delete mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.d/build-t= oolchain.sh diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d21b4a1fd4..93302a96e2 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -275,14 +275,10 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg =20 -# Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has an optional dependen= cy -# declared. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: job: hexagon-cross-container - optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 2d560e9764..5486dc43c6 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -37,28 +37,11 @@ armhf-debian-cross-container: # We never want to build hexagon in the CI system and by default we # always want to refer to the master registry where it lives. hexagon-cross-container: - extends: .base_job_template - image: docker:stable + extends: .container_job_template stage: containers variables: NAME: debian-hexagon-cross - GIT_DEPTH: 1 QEMU_JOB_ONLY_FORKS: 1 - services: - - docker:dind - before_script: - - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:lates= t" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout =20 hppa-debian-cross-container: extends: .container_job_template diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fc7a3b7e71..665ddde518 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -109,10 +109,6 @@ debian-toolchain-run =3D \ "PREPARE", $1)) debian-toolchain =3D $(call debian-toolchain-run,$(patsubst docker-image-%= ,%,$1)) =20 -docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cros= s.docker \ - $(DOCKER_FILES_DIR)/debian-hexagon-cross.d/build-toolchain.sh - $(call debian-toolchain, $@) - docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain= .docker \ $(DOCKER_FILES_DIR)/debian-microblaze-cross.d/build-toolchain.sh $(call debian-toolchain, $@) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchai= n.sh b/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh deleted file mode 100755 index 19b1c9f83e..0000000000 --- a/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash - -set -e - -BASE=3D$(readlink -f ${PWD}) - -TOOLCHAIN_INSTALL=3D$(readlink -f "$TOOLCHAIN_INSTALL") -ROOTFS=3D$(readlink -f "$ROOTFS") - -TOOLCHAIN_BIN=3D${TOOLCHAIN_INSTALL}/bin -HEX_SYSROOT=3D${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl -HEX_TOOLS_TARGET_BASE=3D${HEX_SYSROOT}/usr - -function cdp() { - DIR=3D"$1" - mkdir -p "$DIR" - cd "$DIR" -} - -function fetch() { - DIR=3D"$1" - URL=3D"$2" - TEMP=3D"$(readlink -f "$PWD/tmp.tar.gz")" - wget --quiet "$URL" -O "$TEMP" - cdp "$DIR" - tar xaf "$TEMP" --strip-components=3D1 - rm "$TEMP" - cd - -} - -build_llvm_clang() { - fetch "$BASE/llvm-project" "$LLVM_URL" - cdp "$BASE/build-llvm" - - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=3DRelease \ - -DCMAKE_INSTALL_PREFIX=3D${TOOLCHAIN_INSTALL} \ - -DLLVM_ENABLE_LLD=3DON \ - -DLLVM_TARGETS_TO_BUILD=3D"Hexagon" \ - -DLLVM_ENABLE_PROJECTS=3D"clang;lld" \ - "$BASE/llvm-project/llvm" - ninja all install - cd ${TOOLCHAIN_BIN} - ln -sf clang hexagon-unknown-linux-musl-clang - ln -sf clang++ hexagon-unknown-linux-musl-clang++ - ln -sf llvm-ar hexagon-unknown-linux-musl-ar - ln -sf llvm-objdump hexagon-unknown-linux-musl-objdump - ln -sf llvm-objcopy hexagon-unknown-linux-musl-objcopy - ln -sf llvm-readelf hexagon-unknown-linux-musl-readelf - ln -sf llvm-ranlib hexagon-unknown-linux-musl-ranlib - - # workaround for now: - cat < hexagon-unknown-linux-musl.cfg --G0 --sysroot=3D${HEX_SYSROOT} -EOF -} - -build_clang_rt() { - cdp "$BASE/build-clang_rt" - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=3DRelease \ - -DLLVM_CONFIG_PATH=3D"$BASE/build-llvm/bin/llvm-config" \ - -DCMAKE_ASM_FLAGS=3D"-G0 -mlong-calls -fno-pic --target=3Dhexagon-unkn= own-linux-musl " \ - -DCMAKE_SYSTEM_NAME=3DLinux \ - -DCMAKE_C_COMPILER=3D"${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clan= g" \ - -DCMAKE_ASM_COMPILER=3D"${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-cl= ang" \ - -DCMAKE_INSTALL_PREFIX=3D${HEX_TOOLS_TARGET_BASE} \ - -DCMAKE_CROSSCOMPILING=3DON \ - -DCMAKE_C_COMPILER_FORCED=3DON \ - -DCMAKE_CXX_COMPILER_FORCED=3DON \ - -DCOMPILER_RT_BUILD_BUILTINS=3DON \ - -DCOMPILER_RT_BUILTINS_ENABLE_PIC=3DOFF \ - -DCMAKE_SIZEOF_VOID_P=3D4 \ - -DCOMPILER_RT_OS_DIR=3D \ - -DCAN_TARGET_hexagon=3D1 \ - -DCAN_TARGET_x86_64=3D0 \ - -DCOMPILER_RT_SUPPORTED_ARCH=3Dhexagon \ - -DLLVM_ENABLE_PROJECTS=3D"compiler-rt" \ - "$BASE/llvm-project/compiler-rt" - ninja install-compiler-rt -} - -build_musl_headers() { - fetch "$BASE/musl" "$MUSL_URL" - cd "$BASE/musl" - make clean - CC=3D${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - CROSS_COMPILE=3Dhexagon-unknown-linux-musl \ - LIBCC=3D${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CROSS_CFLAGS=3D"-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target= =3Dhexagon-unknown-linux-musl" \ - ./configure --target=3Dhexagon --prefix=3D${HEX_TOOLS_TARGET_BASE} - PATH=3D${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE=3D install-headers - - cd ${HEX_SYSROOT}/.. - ln -sf hexagon-unknown-linux-musl hexagon -} - -build_kernel_headers() { - fetch "$BASE/linux" "$LINUX_URL" - mkdir -p "$BASE/build-linux" - cd "$BASE/linux" - make O=3D../build-linux ARCH=3Dhexagon \ - KBUILD_CFLAGS_KERNEL=3D"-mlong-calls" \ - CC=3D${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - LD=3D${TOOLCHAIN_BIN}/ld.lld \ - KBUILD_VERBOSE=3D1 comet_defconfig - make mrproper - - cd "$BASE/build-linux" - make \ - ARCH=3Dhexagon \ - CC=3D${TOOLCHAIN_BIN}/clang \ - INSTALL_HDR_PATH=3D${HEX_TOOLS_TARGET_BASE} \ - V=3D1 \ - headers_install -} - -build_musl() { - cd "$BASE/musl" - make clean - CROSS_COMPILE=3Dhexagon-unknown-linux-musl- \ - AR=3Dllvm-ar \ - RANLIB=3Dllvm-ranlib \ - STRIP=3Dllvm-strip \ - CC=3Dclang \ - LIBCC=3D${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CFLAGS=3D"-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=3Dhex= agon-unknown-linux-musl" \ - ./configure --target=3Dhexagon --prefix=3D${HEX_TOOLS_TARGET_BASE} - PATH=3D${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE=3D install - cd ${HEX_TOOLS_TARGET_BASE}/lib - ln -sf libc.so ld-musl-hexagon.so - ln -sf ld-musl-hexagon.so ld-musl-hexagon.so.1 - cdp ${HEX_TOOLS_TARGET_BASE}/../lib - ln -sf ../usr/lib/ld-musl-hexagon.so.1 -} - -build_llvm_clang -build_kernel_headers -build_musl_headers -build_clang_rt -build_musl diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/d= ocker/dockerfiles/debian-hexagon-cross.docker index c4238e893f..8a0d748343 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -7,44 +7,29 @@ # FROM docker.io/library/debian:11-slim =20 -# Install common build utilities -RUN apt update && \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list +RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ +# Install common build utilities + apt-get install -y --no-install-recommends \ + curl \ + xz-utils \ ca-certificates \ - clang \ - cmake \ + bison \ flex \ - gcc \ - lld \ - make \ - ninja-build \ - python3 \ - rsync \ - wget \ - xz-utils - -ENV TOOLCHAIN_INSTALL /usr/local -ENV ROOTFS /usr/local - -ENV LLVM_URL https://github.com/llvm/llvm-project/archive/bfcd21876adc3498= 065e4da92799f613e730d475.tar.gz -ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b369= 1905aa1af6c0778c.tar.gz -ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.ta= r.xz - -ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh - -RUN cd /root/hexagon-toolchain && ./build-toolchain.sh - -FROM docker.io/library/debian:11-slim -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list + git \ + ninja-build && \ # Install QEMU build deps for use in CI -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt install -yy bison flex = git ninja-build && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt build-dep -yy --arch-only qemu -COPY --from=3D0 /usr/local /usr/local -ENV PATH $PATH:/usr/local/bin/ + + +ENV TOOLCHAIN_INSTALL /opt +ENV TOOLCHAIN_RELEASE 15.0.3 +ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unkn= own-linux-musl" +ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolc= hain-for-hexagon/v${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz + +RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" +ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu= /bin --=20 2.17.1