From patchwork Fri Mar 5 09:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 393473 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp263085jai; Fri, 5 Mar 2021 01:24:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyC6B/M0yve0CfSma06RH1UH4191+36eK2dSbczcChu/dYtmRzaThQQCIMZyDHT0K1mJRaX X-Received: by 2002:a25:4906:: with SMTP id w6mr12589694yba.324.1614936241229; Fri, 05 Mar 2021 01:24:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614936241; cv=none; d=google.com; s=arc-20160816; b=FcwmTdBQprwOv4zkIcaiZ0Af9oD7lWTL8kkX+nnpsIBIsRuKIU2Gju0WMCROdU6Tg1 nUy6V+h2nTMwgNRZXDppq7kyJfZXkLqdY7ysrXWy9/mXtBRgykja4igX9Nu8lNB701WE UhC7fShP4B48c7h27Lel3GtzjvuXiTERAqYiOA9S6ouYGIuxbPTNHcmeU4nRANnjViL4 ohqLaXfydm0CNhV+sjzZWgcZgA5bT1HpA1XnriJpgRnlouK/+x1jcErEh8F2ydZq5yIl jS6l9NWfpZp1BlQ6YbA6oQ3+S4rkN9d27TdscNFwahbvlP3PaIY5Sy0dL/+n+eSEwFdY HeIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=mEqFXXdBNdlHpwnN4608sAjOSv2Qh2FmZYg5wtcxoz4DnkLW/XCwnf7aQNkHGvGYzM TiLUdXk6xMPVG36NRlAEaB6d+5/IQHQAGUIcc0cOhLs+s8aPNypn8gJj8js8p45qDOYc ulTOoClNMwA2qORoPFecfaleBIpN/hrs2zdnzBukZ/UmrbUnckVgQEvEjmiwgT1U4UjY v0Fy9gfiJb2G0JHCnXcOrAx+Uvn31u09inyn+litpesCV6Ma32s/6u9agAbt16J6f874 C8YLUed/G7mgB0FD1yjvWu8vNGUzeWWUco9opNO5f/jwz67I4gK0vgNtTiXGJdPIdc0H ifkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efRWbJUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w8si2167868ybq.399.2021.03.05.01.24.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 01:24:01 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=efRWbJUl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lI6gi-00016t-K8 for patch@linaro.org; Fri, 05 Mar 2021 04:24:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lI6gN-00014Y-Hk for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:40 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lI6gL-0004Jy-5n for qemu-devel@nongnu.org; Fri, 05 Mar 2021 04:23:39 -0500 Received: by mail-wr1-x432.google.com with SMTP id b18so1277782wrn.6 for ; Fri, 05 Mar 2021 01:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=efRWbJUl3SG3Mhcd3Hld7DqLL3H/uJmkN/rBTZBe51s/E3Ci1eGboiTa7SzxcJohnS 0X/oF9qE1ILud5/4J38m3eg9reviPZASyrq70Y2535sQxglU9ab5BGn5cUbWDvVqYWt9 UXisgbV9fb8bRSK62FBkZBeDq4XD5UenHzCZuOFVKXY90BZqm/jJXOPjVc50LQZ9v2c7 ZvaLKCKIIgOlKMRtEEs4Pt5SiUNZRp0/hp+z1JIgqUyXp1m9WZKhwHmZiJyneN+aAOU8 s6Ov1RfyllSqu5FOiAn1KOxOLoLW8/3Y3jMxWJBzRJHUMSd+Y7iOsDe2cRQPlf4sW/Hk HKGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+UzYDP9cQ1V8C20NjMVuBOgS/p/If5huR1Br4L+1ZEM=; b=Hv5ASwnaCTLOe1FpsQ/30Otox0/rZcOzx2iiLdnkwZMthIQrAeHRsopi7nw9UUwAmh RvXkiTvGurAi5CY3BRC+6zgbiVPq1XjNMU9m27cSjBRS8taSvbWKP9qL9JC0krSg/3sN JPdXqmSaawrYB6JcJoeGaiCRc8tAUDAZnVY6ZVR+gMXFL3nkvOVKRmpgPKcnpwDEFTnV erj3Uly5HBvcrBLPvuI2nEZWa3/9ZQ9iQDKWghjyJZ38OEVNM0PwKEzkMG6AnSZpuj2q 8yol2EnepmhtPxvaRXZk0bovKPnYbAoNCOy7WUmdD0uksihpvZzKiWjGzhFCk2muY8ve Z2FA== X-Gm-Message-State: AOAM5301jrGPsDLjXVADLRkrngkdXPC3N6R3cG7HXi5rgQDiwABK/G/3 tNx10G6lqjeXCnQUT0usdIoq1Q== X-Received: by 2002:adf:e84f:: with SMTP id d15mr8273713wrn.394.1614936215821; Fri, 05 Mar 2021 01:23:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c128sm16325664wme.3.2021.03.05.01.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 01:23:34 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 543AD1FF90; Fri, 5 Mar 2021 09:23:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/9] docker: Add Hexagon image Date: Fri, 5 Mar 2021 09:23:23 +0000 Message-Id: <20210305092328.31792-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305092328.31792-1-alex.bennee@linaro.org> References: <20210305092328.31792-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.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, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Alessandro Di Federico , berrange@redhat.com, Brian Cain , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alessandro Di Federico [PMD: Base on qemu/debian10, add missing EXTRA_FILES, remove X86] Signed-off-by: Alessandro Di Federico Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Brian Cain Message-Id: <20210228222314.304787-2-f4bug@amsat.org> [AJB: add build-dep for QEMU, include in MAINTAINERS] Signed-off-by: Alex Bennée squash! docker: Add Hexagon image --- MAINTAINERS | 2 + tests/docker/Makefile.include | 2 + .../dockerfiles/debian-hexagon-cross.docker | 27 ++++ .../build-toolchain.sh | 141 ++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-hexagon-cross.docker create mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh -- 2.20.1 diff --git a/MAINTAINERS b/MAINTAINERS index 9b2aa18e1f..1443278059 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -196,6 +196,8 @@ F: linux-user/hexagon/ F: tests/tcg/hexagon/ F: disas/hexagon.c F: default-configs/targets/hexagon-linux-user.mak +F: docker/dockerfiles/debian-hexagon-cross.docker +F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh HPPA (PA-RISC) TCG CPUs M: Richard Henderson diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5..3aee031c4e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -144,6 +144,8 @@ docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 +docker-image-debian-hexagon-cross: \ + EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker new file mode 100644 index 0000000000..bf32536896 --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -0,0 +1,27 @@ +FROM qemu/debian10 + +# What we need to build QEMU itself (as this is used in CI as well) +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + cmake \ + flex \ + lld \ + rsync \ + wget + +ENV TOOLCHAIN_INSTALL /usr +ENV ROOTFS /usr + +ENV LLVM_URL https://github.com/llvm/llvm-project/archive/3d8149c2a1228609fd7d7c91a04681304a2f0ca9.tar.gz +ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz +ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz + +ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh + +RUN ( cd /root/hexagon-toolchain && ./build-toolchain.sh ) && \ + rm -rf /root/hexagon-toolchain diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh new file mode 100755 index 0000000000..19b1c9f83e --- /dev/null +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +set -e + +BASE=$(readlink -f ${PWD}) + +TOOLCHAIN_INSTALL=$(readlink -f "$TOOLCHAIN_INSTALL") +ROOTFS=$(readlink -f "$ROOTFS") + +TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin +HEX_SYSROOT=${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl +HEX_TOOLS_TARGET_BASE=${HEX_SYSROOT}/usr + +function cdp() { + DIR="$1" + mkdir -p "$DIR" + cd "$DIR" +} + +function fetch() { + DIR="$1" + URL="$2" + TEMP="$(readlink -f "$PWD/tmp.tar.gz")" + wget --quiet "$URL" -O "$TEMP" + cdp "$DIR" + tar xaf "$TEMP" --strip-components=1 + rm "$TEMP" + cd - +} + +build_llvm_clang() { + fetch "$BASE/llvm-project" "$LLVM_URL" + cdp "$BASE/build-llvm" + + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN_INSTALL} \ + -DLLVM_ENABLE_LLD=ON \ + -DLLVM_TARGETS_TO_BUILD="Hexagon" \ + -DLLVM_ENABLE_PROJECTS="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=${HEX_SYSROOT} +EOF +} + +build_clang_rt() { + cdp "$BASE/build-clang_rt" + cmake -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_CONFIG_PATH="$BASE/build-llvm/bin/llvm-config" \ + -DCMAKE_ASM_FLAGS="-G0 -mlong-calls -fno-pic --target=hexagon-unknown-linux-musl " \ + -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_C_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_ASM_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ + -DCMAKE_INSTALL_PREFIX=${HEX_TOOLS_TARGET_BASE} \ + -DCMAKE_CROSSCOMPILING=ON \ + -DCMAKE_C_COMPILER_FORCED=ON \ + -DCMAKE_CXX_COMPILER_FORCED=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILTINS_ENABLE_PIC=OFF \ + -DCMAKE_SIZEOF_VOID_P=4 \ + -DCOMPILER_RT_OS_DIR= \ + -DCAN_TARGET_hexagon=1 \ + -DCAN_TARGET_x86_64=0 \ + -DCOMPILER_RT_SUPPORTED_ARCH=hexagon \ + -DLLVM_ENABLE_PROJECTS="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=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + CROSS_COMPILE=hexagon-unknown-linux-musl \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CROSS_CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE= 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=../build-linux ARCH=hexagon \ + KBUILD_CFLAGS_KERNEL="-mlong-calls" \ + CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ + LD=${TOOLCHAIN_BIN}/ld.lld \ + KBUILD_VERBOSE=1 comet_defconfig + make mrproper + + cd "$BASE/build-linux" + make \ + ARCH=hexagon \ + CC=${TOOLCHAIN_BIN}/clang \ + INSTALL_HDR_PATH=${HEX_TOOLS_TARGET_BASE} \ + V=1 \ + headers_install +} + +build_musl() { + cd "$BASE/musl" + make clean + CROSS_COMPILE=hexagon-unknown-linux-musl- \ + AR=llvm-ar \ + RANLIB=llvm-ranlib \ + STRIP=llvm-strip \ + CC=clang \ + LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ + CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ + ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} + PATH=${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE= 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