From patchwork Fri Jun 12 02:24:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1307964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jl756D2vz9sRN for ; Fri, 12 Jun 2020 12:29:53 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PdZwhoBv; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49jl754cxyzDqv1 for ; Fri, 12 Jun 2020 12:29:53 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2a00:1450:4864:20::329; helo=mail-wm1-x329.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PdZwhoBv; dkim-atps=neutral Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49jl2H4sgmzDqsx for ; Fri, 12 Jun 2020 12:25:43 +1000 (AEST) Received: by mail-wm1-x329.google.com with SMTP id g10so6690337wmh.4 for ; Thu, 11 Jun 2020 19:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EEeRreLUBs4lmcCZtSb/LGiF4zCsxvXF7bM8tyLjfZA=; b=PdZwhoBvPyZ6czPUUlHkuhmE0PclUDhCJCNip+5kihyAyQfoO6AgTpJfWXSAYVjTmf cmRUni0nRlA/McbmAsKrePo5DFN8WFYy/qqVbB2JyGp8o2S3dvXW680OSt990lWONJmD fYf4QX9m9Aa0MWMt6+jzcSUWy3ltNEJRUebjwgYWSCBK7IpnvovjJMJElI+k05FcbAng 8V1j9HfEKTS/NNJRjCGUL3cEsp0YkArt/fHvXvhjucdHTmvoGf7ApCRAMkQeAZEou9zv bCQqr6SXEqGur1mjXyv8YkvOf2Ht9DChl6k3m4f2FFfnHiIDLNtXWRzeoiRDHu6kQs1K A6Ew== 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=EEeRreLUBs4lmcCZtSb/LGiF4zCsxvXF7bM8tyLjfZA=; b=kEwreM4ljepq3zPR5VwsXqBRxB+fI7zV4mfe9+yxjL8bR9FCawl3Hvf6Qii3fN/fAd ajNQPkroQs+/7hxcP20qRlbpD1t8CLVGluLT9CZPP/OFDxHjNzLhQuCRSpdui7iBWNwC RbsbBKXBJMVdwL9igt6JNW7o3SeOWTeJD9FPu63cn2BbqM2lkb9xhruxU4oIaNFNR2l7 79Ob8Hro9Sj93/ZUbtNyMX8cDHvIzaQ9Q24aU8g4P/mt1BDqQeLX6x9B5V8mFkh4St4+ kvvHjSRaZYsCN8OMU/fNYPf/Ic6+kXh7VU6idoK6ETIkVWDbtLojnZO/d13lrKD91LrO nSFg== X-Gm-Message-State: AOAM530kgCxxKrtK/lnxdqPZaLaA9louOSB4OMk6Z0jCyxBLSH+WmKor TreP5bS1RDLJLY8qQr0lbc/fq9e5 X-Google-Smtp-Source: ABdhPJxeUUMKoIA3boWsuh3scZwWkVtPwKlOL7H9T5uLTxVB3ZDHQz7uNVRUCX90MezIhQv7lJXBgA== X-Received: by 2002:a7b:c2a9:: with SMTP id c9mr10429995wmk.11.1591928739970; Thu, 11 Jun 2020 19:25:39 -0700 (PDT) Received: from localhost.ibm.com (123-243-125-185.tpgi.com.au. [123.243.125.185]) by smtp.gmail.com with ESMTPSA id h7sm6756948wml.24.2020.06.11.19.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 19:25:39 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 12 Jun 2020 12:24:52 +1000 Message-Id: <20200612022452.371685-16-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612022452.371685-1-oohall@gmail.com> References: <20200612022452.371685-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [PATCH 15/15] travis: Add clang specific build job X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Right now clang doesn't support the -ffixed-r compiler options that we rely on for the skiboot cpu_thread pointer so it can't build skiboot. Remove the clang builds from the debian-unstable and ubuntu-latest and builds in favour of a clang specific job. This allows those jobs to pass normally and gives us as specific job to monitor to see when support for those options lands in clang. Signed-off-by: Oliver O'Halloran --- Right now even make check fails, but we might as well have it in the matrix. --- .travis.yml | 3 +++ opal-ci/Dockerfile-clang | 6 ++++++ opal-ci/Dockerfile-debian-unstable | 2 +- opal-ci/Dockerfile-ubuntu-18.04 | 2 +- opal-ci/Dockerfile-ubuntu-20.04 | 2 +- opal-ci/Dockerfile-ubuntu-latest | 2 +- opal-ci/build-clang.sh | 10 ++++++++++ opal-ci/build-ubuntu-latest.sh | 5 ----- 8 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 opal-ci/Dockerfile-clang create mode 100755 opal-ci/build-clang.sh diff --git a/.travis.yml b/.travis.yml index 860d204d0465..6eaf0a92d7dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,14 @@ jobs: - env: RUN_ON_CONTAINER=fedora-rawhide - env: RUN_ON_CONTAINER=debian-unstable - env: RUN_ON_CONTAINER=ubuntu-latest + - env: RUN_ON_CONTAINER=clang exclude: - os: linux-ppc64le env: RUN_ON_CONTAINER=centos7 - os: linux-ppc64le env: RUN_ON_CONTAINER=docs + - os: linux-ppc64le + env: RUN_ON_CONTAINER=clang install: - docker build --pull -t ${RUN_ON_CONTAINER} -f opal-ci/Dockerfile-${RUN_ON_CONTAINER} . diff --git a/opal-ci/Dockerfile-clang b/opal-ci/Dockerfile-clang new file mode 100644 index 000000000000..02a0bf54e6df --- /dev/null +++ b/opal-ci/Dockerfile-clang @@ -0,0 +1,6 @@ +FROM ubuntu:rolling +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update -qq +RUN apt-get install -y clang device-tree-compiler +COPY . /build/ +WORKDIR /build diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable index 04ff179b5e9d..13c157fe7c75 100644 --- a/opal-ci/Dockerfile-debian-unstable +++ b/opal-ci/Dockerfile-debian-unstable @@ -5,7 +5,7 @@ RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget \ curl xterm device-tree-compiler build-essential gcc python g++ pkg-config \ libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind \ - libtcl8.6 clang qemu-system-ppc opal-utils + libtcl8.6 qemu-system-ppc opal-utils RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04 index 1743df2f507e..3a031c3e9e76 100644 --- a/opal-ci/Dockerfile-ubuntu-18.04 +++ b/opal-ci/Dockerfile-ubuntu-18.04 @@ -2,7 +2,7 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true -RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 clang qemu-system-ppc +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 qemu-system-ppc RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ diff --git a/opal-ci/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-20.04 index 2770951667f8..515ec5c9a3f3 100644 --- a/opal-ci/Dockerfile-ubuntu-20.04 +++ b/opal-ci/Dockerfile-ubuntu-20.04 @@ -3,7 +3,7 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true -RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 clang qemu-system-ppc +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 qemu-system-ppc RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index ce9cbdda371c..577d7a48af2f 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -2,7 +2,7 @@ FROM ubuntu:rolling ENV DEBIAN_FRONTEND noninteractive RUN apt-get update -qq RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 clang qemu-system-ppc +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 qemu-system-ppc RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ diff --git a/opal-ci/build-clang.sh b/opal-ci/build-clang.sh new file mode 100755 index 000000000000..09377c06d5f5 --- /dev/null +++ b/opal-ci/build-clang.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx + +MAKE_J=$(nproc) + +make -j${MAKE_J} CC=clang +make -j${MAKE_J} CC=clang check diff --git a/opal-ci/build-ubuntu-latest.sh b/opal-ci/build-ubuntu-latest.sh index 16c33a9f39b7..ea27bba3288a 100755 --- a/opal-ci/build-ubuntu-latest.sh +++ b/opal-ci/build-ubuntu-latest.sh @@ -28,8 +28,3 @@ rm -rf builddir mkdir builddir make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J} make clean - -echo "Building with clang..." -make clean -make -j${MAKE_J} CC=clang -make -j${MAKE_J} CC=clang check