From patchwork Mon Jun 13 17:12:52 2022 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: 581420 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2170708max; Mon, 13 Jun 2022 10:14:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1taT69mUT66cqYFR/JY3SQ7KDHNpDYHPGqJ6qMD0eILNLzePQgK9wcNGkFuOUSkfv7rIUZR X-Received: by 2002:a05:6214:ace:b0:461:e896:b653 with SMTP id g14-20020a0562140ace00b00461e896b653mr596882qvi.91.1655140481394; Mon, 13 Jun 2022 10:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140481; cv=none; d=google.com; s=arc-20160816; b=nKKBGIbOxBgHzPdO95FIDTiePKXNONS6OR+xWXErKb9efzvVfzL/dQS06VCykLXLHD 2vNbk5+XBH4gMX72d55HFj11xyzLdK2YiUyp/FWmgjAb5Zyz1fgCz3ijrRK7jk4KRmqS aX5h4zzfczrjOtcuRQLQps3Y/j2mh5DZrESEYNh/F1OTg0GGJWNISqTWPs6g+5aADeZR X996dP2qobhRt0BUWU7uhUMkLoRQMknbQrIYsY8SnFJlX/0WVrYeL7A443Eqk0TB0nPe e/X9RjEvnW1+mqP/LsM/+AtaFVcq/qwWt2sLIryoU3UrfCDe+tqXRtCaN36yunnUhnHQ rSSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=eg8b3OBoXd8GR9gPG0wlVgN4K3uY6FcjkKfFCryrL/8=; b=QE2X0Qt49QaXXKO64pM2Fnx7COZx6gmCA9FUxCd/Pyut/Urft1BRQBq3vYPW92gPfO jI+Bb8+ElJHc8BdxxPXrqWmWFVLXDwRODQAq/+Cq2mDGJaW372Tt8e8VF9jkf23FD4lV S0WcBflyWqK3YbD2Q/EymowofF6z2+56s+Uz5mCEOnB9L9dNQeR8DMrXcH9DYiFQK2MU dzGJRTmdbmwn6Is1zdkKFmkA9wW6rgS8OEC8N/vFR5DMANPDdwt9MZ1skydUdfvbjLH8 DYoh2rb2QYRje3hIMjgW9uaxRZGTQv7IkKL1rM2Hz09mMwN/bYfjqbbLUPNfZNQzHNN9 auFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qZhF3Up3; 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=pass (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 o6-20020a05622a138600b00304e3590e5asi4731382qtk.580.2022.06.13.10.14.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:14:41 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=qZhF3Up3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0neC-0001EI-Vh for patch@linaro.org; Mon, 13 Jun 2022 13:14:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nce-0001E2-Kp for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:04 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:46754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncc-0006vj-V2 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:04 -0400 Received: by mail-ed1-x52f.google.com with SMTP id z7so8051723edm.13 for ; Mon, 13 Jun 2022 10:13:02 -0700 (PDT) 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=eg8b3OBoXd8GR9gPG0wlVgN4K3uY6FcjkKfFCryrL/8=; b=qZhF3Up3fN6NIFJlmhDoxHiH9pALpDUlB8alLtVBOuyxbLYYilXNd1mDK9a3vtnkxJ 2zOayoFlUBdv9fk2U5v2uHpkqHAj0sSJdg7oyABoqdB1FOkWm8usrmofRTRSUnfA2CYG fmCFdJm9eQRXlY3/szMsbe+xfc6gLAyImYS0CNowG9nyXDiO6exe99LS7EQQa87POmIK Mxw9eb7wlgVRZWNCewuSxeR8eLuWGgo7gEgTqVaNJMq3Y+DWkzL8EodC3dajqb+Ev/ex EGfLWE9BJX281zeslpg1PSC4oNJHqDrGKwuoaJ20FfumGFAZQc//PTUa4Z1oJL+8c3CD dJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eg8b3OBoXd8GR9gPG0wlVgN4K3uY6FcjkKfFCryrL/8=; b=r+ctkYFTE25EY3/Hw3KbeNqV25XmYGfaUrVig/h+YeFo44C3nODKmnScxEhU2DAcj3 rK2+72B6yqWTMhbHS48wDcCG9MapGv8EwKpnrHOsnEnzqMvMk2aB2slNIcA05Vs9di6B 01SmLXmjrdEfJSUJDCiEX5J1/LNWzrz6dHJ99dDeTzPY91VZHnphrtPFFaT8lss/7vRb 87uktfx9CC1sbvjhXDgktIKyXB//Cu9j/jt7thM99pYL0PAcUlZYbao9foVzB4QSz458 hkOkQLcSXTiFG6YrtddA52nduko5EcpQnSSE1CIMgC1u1yEytfdEY53dldHO58LHbHQ4 p74Q== X-Gm-Message-State: AOAM533SoCdIvs2KCEjBA2uBMURdyViHVI8HYxMbim1cD2SzFUBpEqcs Hld5Ddv7czZcvhOjbW5qamiqDg== X-Received: by 2002:a05:6402:358a:b0:431:20d5:f4ad with SMTP id y10-20020a056402358a00b0043120d5f4admr800150edc.375.1655140380899; Mon, 13 Jun 2022 10:13:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m7-20020a056402510700b0042e1cbc4471sm5409304edd.3.2022.06.13.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:12:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D2971FFB8; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v1 1/7] test/tcg/arm: Use -mfloat-abi=soft for test-armv6m-undef Date: Mon, 13 Jun 2022 18:12:52 +0100 Message-Id: <20220613171258.1905715-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson GCC11 from crossbuild-essential-armhf from ubuntu 22.04 errors: cc1: error: ‘-mfloat-abi=hard’: selected architecture lacks an FPU Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220604032713.174976-1-richard.henderson@linaro.org> Signed-off-by: Alex Bennée --- tests/tcg/arm/Makefile.softmmu-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target index 3fe237ba39..7df88ddea8 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -20,7 +20,7 @@ LDFLAGS+=-nostdlib -N -static # Specific Test Rules -test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 +test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 -mfloat-abi=soft run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel run-plugin-test-armv6m-undef-%: QEMU_OPTS+=-semihosting -M microbit -kernel From patchwork Mon Jun 13 17:12:53 2022 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: 581422 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2170835max; Mon, 13 Jun 2022 10:14:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzrDTNpQIpNyLKu2JPekhbIw6xOuRkjbzXA0H0/vbRGFcAK8Fbkqod/HYIBi67IcKg2X8r X-Received: by 2002:a05:620a:2116:b0:6a6:b876:119f with SMTP id l22-20020a05620a211600b006a6b876119fmr810563qkl.526.1655140493404; Mon, 13 Jun 2022 10:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140493; cv=none; d=google.com; s=arc-20160816; b=a2LOFQThoOKD4itquEypoIJooFBND+rOm/UaaDRqatwd+lZm6HGyZ1wyXcGRADcgOy GAdH4dqWxfj/nPMnZ9jYn5IvZDx4EJ10ljbLLRUVMKl2NuOFNBQpq5bYtiwfBRPZU39D 0UTcDAy5JhGQowqc7gVQQjuqUEd/U/xYElhBBFPH4e0ZljQaF2ZxKBrCgQur4yHc4bDD 3qVHDL0skXe+Jbt0+gV8YVOR/QjxF+lTbOo8pn008uNm4Q/MnhIoNrb4XUZwggTPgRTf zcZ85p0BjM9cWkx++bLSZoXLUVBhI/UwwiPOQAgO7+Cpregf5q/bCS22nXRrWH4AdtFf TyDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=YWeJX520ndLsECRd6DQvhI+4IrssS8/6uaptuhISi24=; b=Z0WbgB2dicVftYootnwvlEgOoOYnZ2vHIMRjl9ZJjGdTvLssvEj8i1V2QnDM3XBFAf vCQOlxyYHDqSWYWzz1tGhAbODrujJnlDnVx1BJGyaKqq4edAUcLAnAm4pXnA1oT4pyAd GzFQr5FQhLI/t91itMODRZmFMiyhhZvgt8sdrN6vujjRoepA552UgvEKMr70xey5TTIV BC1DdDjnr8omFWgZPKZprNQR3dwWva4RdtUna4x2KLwLYRus2Ks6kFFR04VmVIcYIGZS MFwAuQUvyLvW0WKeNQjMMWGAhO54SBMypnSbOccamTLADUjhzQV13/C6SSwQn1Tl3HsA Ar0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WofdNKnJ; 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=pass (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 j7-20020a37a007000000b006a6a3ca225dsi3984533qke.195.2022.06.13.10.14.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:14:53 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=WofdNKnJ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0neO-0001qI-Ut for patch@linaro.org; Mon, 13 Jun 2022 13:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0ncg-0001Fr-6A for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:06 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:46948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncd-0006vv-NB for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:05 -0400 Received: by mail-ej1-x632.google.com with SMTP id v1so12344884ejg.13 for ; Mon, 13 Jun 2022 10:13:03 -0700 (PDT) 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=YWeJX520ndLsECRd6DQvhI+4IrssS8/6uaptuhISi24=; b=WofdNKnJWMZRbYdLw6QAf2EuI2nc57MCU+VQGakMKz+6j7rXHz6TvYrATWqGHigwzj U2xgXuOf9P4EpGFw3mdGU+5DlrJomSIeb/pA/fOdP/Gj5t79fBKooJZSQV1ZehG3m7P1 npyBlhQlow5ZaUfs2dVt1nDsBhZyvdM0GdIWErdDhKCpMcK8+E2DeH1xcHLk/WDWLu/+ E8AJQND3QNN+eqpLn8NPDmRxtbokoQlp7Y/dhpQSUCv4lR0TcUb906v+V2FdHaCs27oL lZIszy5m5wse2fywM973an9H5WydAxlZCt9pfTK2J5P5WriiLbVmdHoiqN5C4fvAsVGw FY2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YWeJX520ndLsECRd6DQvhI+4IrssS8/6uaptuhISi24=; b=boJYPMdcBUZsUgqSmG86B7d+Y+DXC4wVXQIQGRM2BDMhwDgDZzM/RUmSrWDEE0SKFh 3IsBlkBcJ3Q8JbkwNLIqz/f4Oth8BrCzNIi8d1RznoAQHs07oO9tc8S9cXogRWZy5wFc nOP6E0P1crrtREAUgEQe64TBU6XR6qnB/fIX1yarRNpyO4AFnv9zP215se1O9KOXLnkU ByGXbYndYCGLZ2/vLIvM11avoSKs8TX9fped61ZXACeUNz2W8fjMvajpJZm2sQYAQT7K EYPK0D8RKfm3Cac+NXMWgdS5kUZBONBvTNUc0XzE5eelP9imYyWYzEjs7v9PuTK+D8Kv 6fLw== X-Gm-Message-State: AOAM530DYcAJ1PWvzdSYdxPOCWUUaSizIBq5+Au45EvfxQ2TL5UuuMJ5 D+yvfTY98SlAKO0MZvgBotncjQ== X-Received: by 2002:a17:906:73d2:b0:712:2fed:3473 with SMTP id n18-20020a17090673d200b007122fed3473mr681881ejl.361.1655140382391; Mon, 13 Jun 2022 10:13:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v1-20020a1709063bc100b006febeb51cd5sm4068668ejf.174.2022.06.13.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:12:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 378991FFBA; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost Subject: [PATCH v1 2/7] tests/tcg/i386: Use explicit suffix on fist insns Date: Mon, 13 Jun 2022 18:12:53 +0100 Message-Id: <20220613171258.1905715-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Fixes a number of assembler warnings of the form: test-i386.c: Assembler messages: test-i386.c:869: Warning: no instruction mnemonic suffix given and no register operands; using default for `fist' Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220527171143.168276-1-richard.henderson@linaro.org> Signed-off-by: Alex Bennée --- tests/tcg/i386/test-i386-fp-exceptions.c | 24 ++++++++++++------------ tests/tcg/i386/test-i386.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/tcg/i386/test-i386-fp-exceptions.c b/tests/tcg/i386/test-i386-fp-exceptions.c index dfb7117c17..d445f13c33 100644 --- a/tests/tcg/i386/test-i386-fp-exceptions.c +++ b/tests/tcg/i386/test-i386-fp-exceptions.c @@ -423,35 +423,35 @@ int main(void) } __asm__ volatile ("fnclex"); - __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (1.5L) : "st"); + __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (1.5L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != PE) { printf("FAIL: fistp inexact\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (32767.5L) : "st"); + __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (32767.5L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fistp 32767.5\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (-32768.51L) : "st"); + __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (-32768.51L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fistp -32768.51\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_nan) : "st"); + __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_nan) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fistp nan\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) : + __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { @@ -538,49 +538,49 @@ int main(void) } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (1.5L) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (1.5L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != PE) { printf("FAIL: fisttp inexact\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.0L) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.0L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fisttp 32768\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.5L) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.5L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fisttp 32768.5\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.0L) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.0L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fisttp -32769\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.5L) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.5L) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fisttp -32769.5\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_nan) : "st"); + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_nan) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { printf("FAIL: fisttp nan\n"); ret = 1; } __asm__ volatile ("fnclex"); - __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) : + __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) : "st"); __asm__ volatile ("fnstsw" : "=a" (sw)); if ((sw & EXC) != IE) { diff --git a/tests/tcg/i386/test-i386.c b/tests/tcg/i386/test-i386.c index 18d5609665..ac8d5a3c1f 100644 --- a/tests/tcg/i386/test-i386.c +++ b/tests/tcg/i386/test-i386.c @@ -866,7 +866,7 @@ void test_fcvt(double a) uint16_t val16; val16 = (fpuc & ~0x0c00) | (i << 10); asm volatile ("fldcw %0" : : "m" (val16)); - asm volatile ("fist %0" : "=m" (wa) : "t" (a)); + asm volatile ("fists %0" : "=m" (wa) : "t" (a)); asm volatile ("fistl %0" : "=m" (ia) : "t" (a)); asm volatile ("fistpll %0" : "=m" (lla) : "t" (a) : "st"); asm volatile ("frndint ; fstl %0" : "=m" (ra) : "t" (a)); From patchwork Mon Jun 13 17:12:54 2022 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: 581423 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2173863max; Mon, 13 Jun 2022 10:18:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tD7iU2aYKlVGWni43eYldKlu2V9pdAdQKdkGseOh9HeWJqQsFM7TlLEzyv27MPc3Vy2FYu X-Received: by 2002:a05:6214:260e:b0:467:654d:85cd with SMTP id gu14-20020a056214260e00b00467654d85cdmr98636qvb.17.1655140698481; Mon, 13 Jun 2022 10:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140698; cv=none; d=google.com; s=arc-20160816; b=x16TDlhGY27nLQhbJHHTN0hRQQVOvOJgsDMVWOI0OtGUKyFDqagDBJUmIoVtpS+zFn Km2ufqRV+SiSX9xq2IDVc2gfSGz9YZlGoiJonFhSSA3IdVRV+BOm0ZBpKtqDvOhUtRhh t57KN0WXT7rcwb4A1zc8xed8ZOPjS0XDzipzcuKcd30jsS8gfw/gl5R10bbChMfDaA22 jA8WXeqqt5QdQrnXoluWmva7RBu6ltBnm1tUmiSBCDuLAdSF3U+4olF5A4LnF8yI+de0 pCDoUfhcqe7bNiy0aLewhkcP/SDBvOabw/DybrF3lQEFLx5JsRyQ2dUydISlUpGqaqzM ApzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=SzXlLcMo1UEOn5hhNOmCMERz2LS6eKiQTj0lefeaACPYjI4y8uP+rphHgRs4+j9J97 bhzOxkzfz9uEbzbJ0lf2KW2eAAcwJLtvFUiyX+ih5JpBfvv5UwFr7iH/iv4o25KeCgTH 2SsGoXE8xjwKoOUkFjFoQw36l2iJfkO4DB4WR4chaTYO2PwBz1zfRcCxVvSrcjIskDem mqvwFny6uQXI7bYIogCO/4FANA7NUjqIWB+XMIRUnLW/GBehuBRHcfLViMfkuFRiaqd5 o3fCieKSn36/fqqtAwPDGZnmpq1Q0vqpa/rSwTQHUY6/FTXgZ/om3pw3mNENIw1nIX3U BWyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="A58wzM/t"; 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=pass (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 k2-20020ad45be2000000b004673b1f1de3si4816604qvc.164.2022.06.13.10.18.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:18:18 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b="A58wzM/t"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nhi-0005za-15 for patch@linaro.org; Mon, 13 Jun 2022 13:18:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nci-0001HH-Cz for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:08 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:34499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncg-0006wV-Fw for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:07 -0400 Received: by mail-ed1-x52d.google.com with SMTP id o10so8105644edi.1 for ; Mon, 13 Jun 2022 10:13:06 -0700 (PDT) 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=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=A58wzM/thC1RKZ4kNI98Vh786epLQrgE51n+Dn3LXw6wQvej+CBRS5fRE2pZLbc022 Rw2OG0FDJoN9HiyOmUtJli4V5tb+kLtB6CbjTCUiQlyQPjEHvi8q6J//vH++WG3klma7 rR55u5Dk24+0OD23nKh9kHrisHARfypI/tfIgXSVSZVMC63QF3C6+OicGkLFrap2WjR9 YLrd4V9B173jTcXmUFJg59OSgwC4zAH8AFQUcKdlyeyglfLBcf2dvrFSJgWHAG1KWlkX q4uvsAkjLDpixOYufVFyuJFZVqqYzAZ5qVoze2pdbfW+xDMctCe/YNBs2rqWi/NCQo5s ayiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IWtB77SS8UzWWppXKv/PKd8mKK1jf+oMFHLQZ6UbrHA=; b=0n6GVW26MgPBn9xTVuwX0BdWmXd1yLDCZS1Fpou5q6a0bFI10Tup0xgGfK3mKIaV31 icHR2xQuYgH1Cd0ejKInaanIEa3NHdkwG5EokR13vHBB1HJLCS1BsfAtbq+wWSOYNjaN X4haOZcMJvTU9733MTcVt4yAMBaLOEB7jkguYJyGgV/OGRXX5cZN0aTgVu8R/kMtbErl qwHLTrvv+Surle1fYvF+pfFP3FJnnoHnvi0Vs2uBxM+UgpUmOin3SvjioDiIgAMv85yC CMT/5vWxHcto7nVElbz2kZYMx9JPCMBsjnY6JEyPyP0MIQClpUuxcOKyQHjj/LSFmb/R juQQ== X-Gm-Message-State: AOAM530TOBEqg1iYNIo4FIvAIGsjIguCQ3pQDoloJjnYlbSjQZ6XN9DI GLySBAUuVdkgGtSOLq3h3RK8Fg== X-Received: by 2002:a05:6402:40d2:b0:42f:ac14:34a3 with SMTP id z18-20020a05640240d200b0042fac1434a3mr852194edb.262.1655140385125; Mon, 13 Jun 2022 10:13:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o25-20020a1709061d5900b006fe98fb9523sm4042738ejh.129.2022.06.13.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 43B5E1FFBB; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 3/7] gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs Date: Mon, 13 Jun 2022 18:12:54 +0100 Message-Id: <20220613171258.1905715-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The job definitions recently got a second "variables:" section by accident and thus are failing now if one tries to run them. Merge the two sections into one again to fix the issue. And while we're at it, bump the timeout here (70 minutes are currently not enough for the aarch64 job). The jobs are marked as manual anyway, so if the user starts them, they want to see their result for sure and then it's annoying if the job timeouts too early. Fixes: e312d1fdbb ("gitlab: convert build/container jobs to .base_job_template") Signed-off-by: Thomas Huth Acked-by: Richard Henderson Message-Id: <20220603124809.70794-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .gitlab-ci.d/buildtest.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 544385f5be..cb7cad44b5 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -357,16 +357,15 @@ build-cfi-aarch64: --enable-safe-stack --enable-slirp=git TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 + timeout: 90m + artifacts: + expire_in: 2 days + paths: + - build check-cfi-aarch64: extends: .native_test_job_template @@ -398,16 +397,15 @@ build-cfi-ppc64-s390x: --enable-safe-stack --enable-slirp=git TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build - timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build - variables: # FIXME: This job is often failing, likely due to out-of-memory problems in # the constrained containers of the shared runners. Thus this is marked as # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 + timeout: 80m + artifacts: + expire_in: 2 days + paths: + - build check-cfi-ppc64-s390x: extends: .native_test_job_template From patchwork Mon Jun 13 17:12:55 2022 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: 581424 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2173893max; Mon, 13 Jun 2022 10:18:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7zVrXtKHCyGllNHjnhIskKkjDZjwWci6/AXRps/8SjmQ/hJ+YOTBCK3J1T6XhEZw3A3lz X-Received: by 2002:a05:620a:459f:b0:6a6:cde5:4f73 with SMTP id bp31-20020a05620a459f00b006a6cde54f73mr861034qkb.450.1655140699926; Mon, 13 Jun 2022 10:18:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140699; cv=none; d=google.com; s=arc-20160816; b=qXH0gcrIdMIXfHO7q37iEKbfNlCngsFi0RT1L4xxMGFZkY0DP6e+SnKPbVp1YAp/Lg aql+cnWYy/2poKCe5x+379rPflQXoxJqPHsMOYlzGaxFT0NXBG3s1n8tU/ncu0vV+zdu H7kKMsDWc9EsSV7QaAm5nysev+bRGkkxnHM/4TEsHGVX2whOas12/klaQdaTBchZbPxN 6S96IzvGyh8TOjKE0cHPLza2HJRsyNyrjE5AsrrUAzq/qferbZqY3s/63uNc6e2umF7Z p6JDcoLk69ygZHrdYq7j95/M0Hari2fPv6Lof+AVCEt8/W30XLBAMy0SkfqwGosj3Mg/ kO9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=3yWf9U1NzI+4Nys+xW3u44fbHi66jzdV22IJPzINLgQ=; b=wEzlQN4DanLTZSWOFfaB9oN+oQyIDjmwJAnvuiF5SYJwoFKYgIIDRkNbdBTKXRGzou st3ojSTkJQu22ZYc89iRVJDppjU5od7BAKhcbvnjnsszgEvAaaJ9QfI4i7gVWju0bNw7 rQ8wgmn/6rsyiyD40g8ClgaQSSTDV1B7FjiORHLzGa8laueaIl6rlFwMOuhaqbBN8q20 Qj7xgmX5BohaRA6J7IR+PW3/0T2J/hcw8euRWL8c53bOe4CTzRS0yeYLQ+JJvLkTAt8C TyhXynLqxuPknAlUkX0qoeJLy0iPtnz9GnBZFGupJUJWk68sXILCdh2jYI6eV5DVdJGO JDYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8ahZXAo; 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=pass (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 v12-20020ac8578c000000b00304e4c1b4fbsi2651041qta.753.2022.06.13.10.18.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:18:19 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=I8ahZXAo; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nhj-00065a-GR for patch@linaro.org; Mon, 13 Jun 2022 13:18:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0ncm-0001JB-Fy for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:13 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:38629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0nck-0006wr-3S for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:11 -0400 Received: by mail-ej1-x635.google.com with SMTP id n10so12428468ejk.5 for ; Mon, 13 Jun 2022 10:13:08 -0700 (PDT) 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=3yWf9U1NzI+4Nys+xW3u44fbHi66jzdV22IJPzINLgQ=; b=I8ahZXAo0PAe3ANex+mQcwD8prysxlKWMYkPuCNpShkd4E1lxu4lU1o43BQ+dRCj3P JT+66g9U/QuuboovirMBBOd91YALv4ZznszuTwzCWVqMRYFBW19sj8AAjmp1tKRCQxUK etkji6nDmuhzoNu4eeDdjEYB/XargXaoN1izpkpGdzo7UBpqzUnanAxflZbSJhpeY/tw 1wuve4CYkUtixE7jTHTFo3ZU+G0DKcfwgrG1uECFUWOiuh0F7Y7O5xsVlg1L1cOZyqJY rkJGWtJRl6X/aJCp1whQ+2xvtWsjWYX7H+0Xhpu7nqBaUmpXkpIrOViwiaCz791gRCA9 Jgmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3yWf9U1NzI+4Nys+xW3u44fbHi66jzdV22IJPzINLgQ=; b=Nkk3Ahw3hleK/dSN54sSHW5mYmMrbDRAs2U/kwZJ5uaN7tDqTdSp5GsCA49TodJ+hd VEYo7PGlZN89sqi54wsvvFfjNh06fSt0BB02KY0cpUlp7ThFJCt5oHQFqqv1fveaZtSn beCEyMINKHOSZmtZIozfYPWg4En5AS+19/aGN9rh82cakA7P/O4hJssPxxBfeDsOpE/X FTAaHomva6kBrlFhnjZUONCcObcppr55sO0rWG02oIpJ+wpwyT26I1ysIBEtWSvMY3qM L+Y7FqaHmxY0zjQrCOHnsNFV7X4zH6XfUuatH+wrVsKYY4sUWnRNTVdE+W7qtJcMJcpJ S16g== X-Gm-Message-State: AOAM530sLpYSsQJEdUQ8e4rWArVLyuengkggUwYf6tPvtmA0u2/xuIpL 1xyKjAJdNlqJEvHchlQIrQlJbw== X-Received: by 2002:a17:907:d8d:b0:711:d82f:5d33 with SMTP id go13-20020a1709070d8d00b00711d82f5d33mr695726ejc.595.1655140387503; Mon, 13 Jun 2022 10:13:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id hh14-20020a170906a94e00b00703e09dd2easm4118379ejb.147.2022.06.13.10.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 596F51FFBC; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 4/7] tests/docker: fix the IMAGE for build invocation Date: Mon, 13 Jun 2022 18:12:55 +0100 Message-Id: <20220613171258.1905715-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We inadvertently broke the ability to run local builds when the code was re-factored. The result was the run stanza failing to find the docker image with it's qemu/ prefix. Signed-off-by: Alex Bennée Fixes: d39eaa2266 ("tests/docker: simplify docker-TEST@IMAGE targets") Reviewed-by: Richard Henderson --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e68f91b853..ef4518d9eb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -171,7 +171,7 @@ DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS)) $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ - $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=$i) \ + $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=qemu/$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ $(eval docker-all-tests: docker-$t@$i) \ From patchwork Mon Jun 13 17:12:56 2022 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: 581426 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2176446max; Mon, 13 Jun 2022 10:21:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhdWBlS5kcreWIxdCuVoriwCNKfNmvXUODVRclwYwiZKRPF9IX4euCNsTjfrbcvS6L7Tt4 X-Received: by 2002:a05:620a:4552:b0:6a7:35ac:ed24 with SMTP id u18-20020a05620a455200b006a735aced24mr852297qkp.416.1655140873283; Mon, 13 Jun 2022 10:21:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140873; cv=none; d=google.com; s=arc-20160816; b=rsd+lSxtAPobpPzEd3gcKFFKCo+YAUFlOS0UtftB6UgbGBY+odMNKG4BthKxkXFwFr HyesK+O9C9eFmpo6IL30zf0wKe1G9vBR1HON37AJqrpjOw1V8AGD9fBT6DfVU7zdqM/m 0/P8vIP/rkkqKFaXB6zZaHzYgcARUcBLTv2nOpuBibzPmj29AbVFfVsozvZA14GLOmb1 lvK3kuSy/CibrXS5L8qxWFniHnR3AnbUOhd45CRJOlZuxrOsOCteDwTKtXABPvKWHxgc 1Fi4L3IO/ji/bRgaiTLIFQ8ISesgycZZ41QrfR4eZqHbUy2HqrkmGjyBYkvlcFPpCnjW YpnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=2PGpjsrLqpE/QLQNcCq3szGIZC92jtro/jYiQlTKzhk=; b=0iqnbkamf+3UJ1yCJChdOU5fsAUeM4WGop8ZNPvzZjgMso00692VLL03Wt+DEvEdrx i6UCDwPLFe41Lscyn2lMKcOQAtWrp5hNzpDOJRV7NCZIaQFN/Pycv4bciEo3oTC8V0tW aCHcMULbRaHNQAZuhPjKuNy0Qe/HdqKHv+K2nZsJ6sX3ggeLxYJ/nCIaMHH2S+yppgBV iMWs/jeTjXo1XyapYvrPyuSdKBNGYLt0LYxDSB3YAunnekDQuG7NB4BxIBHSN+zh2Pec 8DOH0DmrWa0WbRq2rHQUgjvgRoYQ6WvFfbpNUx8hdO3qVAMSz7HY/SkDhrCzyZkwhAjq bjLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="nfIrWEZ/"; 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=pass (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 13-20020a0562140dcd00b0046449aa093csi4903734qvt.522.2022.06.13.10.21.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:21:13 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b="nfIrWEZ/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nkW-0002vP-Tb for patch@linaro.org; Mon, 13 Jun 2022 13:21:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0ncm-0001JA-G7 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:13 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:38621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0nck-0006x4-2o for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:11 -0400 Received: by mail-ej1-x62c.google.com with SMTP id n10so12428523ejk.5 for ; Mon, 13 Jun 2022 10:13:09 -0700 (PDT) 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=2PGpjsrLqpE/QLQNcCq3szGIZC92jtro/jYiQlTKzhk=; b=nfIrWEZ/zprQsae0dw5is62HjDlo6xe54tIej6T9UscYaKUaPPUusiQqdOh3U7nQUn yMOXWZ2HBxW2tbEbefeB61BUZtGEffQoU21+H7Ne2QPL8fx7DjBPI57jQLAd2duwVy1Y WpHr5iISmgO4VvqnDkh1+AnN6/CYrzlCJdoNV5P338NsCz9wLmI1v7O8FP1tBYIsnypk 3pyAEpLskap2VcExXa+p1JOY+tyvSdyfLxGErwhUeETWZ9bSxyUykyITlUUldCSmwdFr L9x805lxNY+ESIAN6EHxWVUf8s1gQ/w2HkweSuqxycHqOnCM6CysoBXT35jgR5eeITBV yQxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2PGpjsrLqpE/QLQNcCq3szGIZC92jtro/jYiQlTKzhk=; b=wz9kM/VOZ4Qc0pzS+UMqFj0AkiCoPjlN2t5lDYEKfMN7wCZyCTx4Q1G5xrXZVD53x5 ToOm+XiyAbFBeUFyFmaidTzdmF/Quf517aj/LP84S71yZS8HL44VqG+hJrEtVvXzyM5D InkfOQgPk0VtCmzkttS/Bi/kiPeWOh5SD9f1eCmjnoeJk8YE9AjaVDmCK+7FZiQ4JmaB bUSTk2GobGmDfP9kfV7E8CH/DjzF0gOzgwzi6d55CJzzsx2+EeB+9tP9a2hilcxn25YR bxJ8GLNIef7HuGEHg93Yix8SH4knkBYhBWjcHr8+iAsfw/W1jCQ8HraGe1e/g22bsSPo IMOg== X-Gm-Message-State: AJIora/QNwE/r7D/h5P2Ran2yyfV+4VY1zr10LiP1HgOj2M++ym39quh Jl9c6ZNE249XGXyWcIFo90xSww== X-Received: by 2002:a17:906:7315:b0:711:db45:af4c with SMTP id di21-20020a170906731500b00711db45af4cmr711332ejc.412.1655140388307; Mon, 13 Jun 2022 10:13:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n21-20020a5099d5000000b0042dccb44e88sm5359485edb.23.2022.06.13.10.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 648331FFBD; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 5/7] tests/tcg: disable xtensa-linux-user again Date: Mon, 13 Jun 2022 18:12:56 +0100 Message-Id: <20220613171258.1905715-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini The move from tests/tcg/configure.sh started enabling the container image for xtensa-linux-user, which fails because the compiler does not have the full set of headers. The cause is the "xtensa*-softmmu)" case in tests/tcg/configure.sh which became just "xtensa*)" in the new probe_target_compiler shell function. Look out for xtensa*-linux-user and do not configure it. Reported-by: Alex Bennée Signed-off-by: Paolo Bonzini Message-Id: <20220608135727.1341946-1-pbonzini@redhat.com> Fixes: cd362defbb ("tests/tcg: merge configure.sh back into main configure script") Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index e69537c756..4b12a8094c 100755 --- a/configure +++ b/configure @@ -2024,7 +2024,6 @@ probe_target_compiler() { container_cross_prefix=x86_64-linux-gnu- ;; xtensa*) - # FIXME: xtensa-linux-user? container_hosts=x86_64 container_image=debian-xtensa-cross @@ -2481,6 +2480,10 @@ for target in $target_list; do echo "# Automatically generated by configure - do not modify" > $config_target_mak echo "TARGET_NAME=$arch" >> $config_target_mak case $target in + xtensa*-linux-user) + # the toolchain is not complete with headers, only build softmmu tests + continue + ;; *-softmmu) test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue qemu="qemu-system-$arch" From patchwork Mon Jun 13 17:12:57 2022 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: 581425 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2174132max; Mon, 13 Jun 2022 10:18:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6LSQbmhzUH2HYx/fCdovo/k0toetHMcbwwFzLJxOKbLozE1eh5K33RMmFcFDR3hJ3wzbj X-Received: by 2002:ae9:e50f:0:b0:6a6:a470:5 with SMTP id w15-20020ae9e50f000000b006a6a4700005mr803193qkf.705.1655140719249; Mon, 13 Jun 2022 10:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140719; cv=none; d=google.com; s=arc-20160816; b=KyC4sRgEGUyARYwUcrqePhGA8SS/M9R8RuCQIbufgASbIBHLur2/fr1mSDpT1OQfwe IwVWYfVZabCu+59cjchdiSFfkXKJmG8Sot7lSPAHh+QVKn5TiNBus3V7T+yCUpCQOvtT s3UUYn5plHFj/idZ3mXapk1wNojAokBM9L2G21iLr0W0kQegstkjFT4RHy9S0qwX823Y llgomb7JdhTgfgJPdL3bScYgfAE5stXEMGET+byzFkBBCSA91tXipsWFmgugs79DzTmM Zr/nAKkGD/9HRsglbLDxRIes0JgS3Rdk/pQnyamAgToej0e5PMfkBu6DDo313nN9Y7t3 hUBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=jmch1Xztp+sXlhSsR6daB9b/LdHkQtMGhG2GCOi2Ah4=; b=L2+8qckZ9SaJthUanCy5KP+fbbjqNv2Mi49COpuTEDeBQT9x4DDqlhUOh+CG2SDidH UZjwbmsUs/CPu8R1fDzSk3U7zE0hYWidLi4ejp4Bc3Rvb8wF3YYUZxksvRkolisyo2LS PZ7wlqm/ukltJ5L0j18xeB80xT+CmXMdvUsmsVHj6NYoQy1wQYYfcXrir1XWiIkin7O7 BiOaaDTqdF1rtwWubVtp3qwZuBPWXuGQagN7b4dH5z5HR7ZUpmjHU73dDEVfzdGRjKsV TaVg1VVAKikWyIttXzCZsgStFBEm1rcIW7cvX2JQ+wzmtTPp3y28D9+1DkuGSMz7xhe1 3ReQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dwR82LRB; 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=pass (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 x20-20020ac85394000000b00304b3679494si3431920qtp.445.2022.06.13.10.18.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:18:39 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=dwR82LRB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ni2-0006sa-Pt for patch@linaro.org; Mon, 13 Jun 2022 13:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0ncn-0001Jz-NI for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:14 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:38626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncm-0006xI-8Q for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:13 -0400 Received: by mail-ej1-x631.google.com with SMTP id n10so12428662ejk.5 for ; Mon, 13 Jun 2022 10:13:11 -0700 (PDT) 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=jmch1Xztp+sXlhSsR6daB9b/LdHkQtMGhG2GCOi2Ah4=; b=dwR82LRBfPWIQ58hVIH7St2nUZUrkZoAN19jd6GaGf6vA0+1pdAeMCmZkIXtXLjDY1 1oGsCk3YZDdbfJapjKM89Ge/9H895E4gLkIwbcGPJmH025wET6BuH0FSC2BqoCfQv/Tn KlOmIyXzcnFDVjPoh+wNWeBckoSCkJu3Tsucw2b0/hBNMgG6wZ4hdBprmGfZzOzfP0Bf e5G72RQU4Pb+R8BERPDC2Tmot/mpj2DtnaA23e0N9IvdASGllSiHLIwJwmgXYCIKlx03 L2mQd+7I2QX+z3DxSKgZS+j54kv3gmJP/fZkD7DoTb1rBY7vx1TuZNCQ2fJ3R4p390TL OD4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jmch1Xztp+sXlhSsR6daB9b/LdHkQtMGhG2GCOi2Ah4=; b=hdcOyKMt7wj/lz0xkC6QIbcUL1cc/XBNwR91OIEUfwVOHDtWR0Ij5FwrXpDiac7u2H yBzYw22BTKDZJvRJJnrnok8BT28VI9hiYpAJH6HAMrLSC1as1hZyTDxmFDXS8tkRWzJp wHHc775EebNOmew2Qy1mVDQ4GAzY4NZrabuYJvzCm1bQTA+jzvukVHQPcudNW5N4FSo2 56pecX/Pxn1Gz37jhf5qHbTkjnvpXfrdF1CgFHcKzDvhR2wjTNVPFpOQ50qJHvulgPHQ OBb3ljYiSfZ9FTUMVrt/F4O2WW+Sd+7o/zNBaasfxyGsgUhRmqQ6Q1rkAkQwX7JlwCZ6 04tg== X-Gm-Message-State: AOAM531pbsfTZQa30dFqklqXAm45oVzrj0dIM0udamhtSys+8tJh2sxW b/+Q9hGyYiNucy29qufb8/r0Og== X-Received: by 2002:a17:906:74c7:b0:711:fa45:4f88 with SMTP id z7-20020a17090674c700b00711fa454f88mr714625ejl.347.1655140390113; Mon, 13 Jun 2022 10:13:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s22-20020a1709064d9600b00705cd37fd5asm4050405eju.72.2022.06.13.10.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7AC901FFBE; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 6/7] gitlab: compare CIRRUS_nn vars against 'null' not "" Date: Mon, 13 Jun 2022 18:12:57 +0100 Message-Id: <20220613171258.1905715-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé The GitLab variable comparisons don't have shell like semantics where an unset variable compares equal to empty string. We need to explicitly test against 'null' to detect an unset variable. Signed-off-by: Daniel P. Berrangé Tested-by: Richard Henderson Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20220608160651.248781-1-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index f334f3ded7..69b36c148a 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -13,7 +13,7 @@ ############################################################# # Cirrus jobs can't run unless the creds / target repo are set - - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == "" || $CIRRUS_API_TOKEN == "")' + - if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null)' when: never # Publishing jobs should only run on the default branch in upstream From patchwork Mon Jun 13 17:12:58 2022 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: 581427 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2176666max; Mon, 13 Jun 2022 10:21:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Cl21C4SObDB7dSJMAyWn05Mxkrh28u6dwv6Jzd0ZK5uO5MlNdmBQMN/B82UZ0di2hlxP X-Received: by 2002:a05:622a:1646:b0:305:1676:c74e with SMTP id y6-20020a05622a164600b003051676c74emr680771qtj.399.1655140890994; Mon, 13 Jun 2022 10:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655140890; cv=none; d=google.com; s=arc-20160816; b=CZsUDxJWjAaXkW4jUkc45NFUumsbEOhnUkTadDUtylC1h1z8VVYAiTR1MHMHLQIDk2 NMrbUdntaXRRo8hp2q7U3miKHbVxfWBOXtEhErj93fen385pS5j9fakXMnqAn8Oh3BqL y1NUfDvvOtUnBSFbifASSVU9f4p16KiS0w/+Kp5oxmQWiyJaptvAh9xJGWM5mRocXy/A nOV6Kb2zwLIB8vDdyfTvlpKwF2IORt8DTgSzZZUNvSre7eFB1K/qrODoJjV3F5PzzvtF Gy2WAHhDb7n+0WE6tnLpGgbG1Ym7c+Y1c6VmDtyNaoz/ldjFgAxMVvVQESfZiRDezhoh ZXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=rZddIaoLD/ZTyoHMOhubaxrRGzNsR1qnEvTVtIqOZCA=; b=aY1iDdQhsCOVVxz5+88m0JEJ8WsG3WWQGej02frQdEi0zZ9ElO+QRPzrVjG5B5MaMS 8IwYQ+nn26k7/jqTue5p5pUf/tDXmkD57sXl3VA4qPLNn6Z7LuZJ/eUi04xypYgUynCk kR/fCrES35Kg28ZmqUWSijtcVUsoSLFieyFnjKohjMyFJkyExipYiT2E4uty4FPYVCmg jeSOPI0r3gYFjG+3HghR322iYO/qifAggHuuQ/xkmzAyHyQZ06pHp8PmZRCFYO+InhbV DAZLWH4B5h87Dl6nZ34ANMOFcPa8aAq25q1dLSJt7VzvqVsEUm69zXvPwxN63aV1YBOw xhDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BA4Pzvyv; 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=pass (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 f4-20020ac84704000000b00304ed471596si3471484qtp.418.2022.06.13.10.21.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 10:21:30 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=BA4Pzvyv; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nko-0003DT-Gt for patch@linaro.org; Mon, 13 Jun 2022 13:21:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0ncq-0001Md-WF for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:17 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:35578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0ncm-0006xO-8n for qemu-devel@nongnu.org; Mon, 13 Jun 2022 13:13:14 -0400 Received: by mail-ej1-x634.google.com with SMTP id me5so12462893ejb.2 for ; Mon, 13 Jun 2022 10:13:11 -0700 (PDT) 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=rZddIaoLD/ZTyoHMOhubaxrRGzNsR1qnEvTVtIqOZCA=; b=BA4PzvyvmRJQpxJKJDnlGReoQ426i0P6qPFLdKKB+NMNy1VkZWfke6kpqh1AcqsRT8 G+Sxtzc6mPOS+tRuKUIeF9Mzu3X3l4laI6K4DmaH3VB6BlELAcnV0p+5x6bNl0c7gYrR yAc7LaEJOa3TlWzKWJtkaexWDQEmrgCteXK7mLQhfDgAiJM13opZm9MT7PFkl/ij40Sb Wmfs7fySIHl6oxx6OEDrh/fcObSLWASNRR9LUTjMk7upETEu2scC4h5snM+9LGadjKX/ w4c1Ni9p2MetJiVT1ZOfnD9FxiHrYwyjL+tY1aubUZf4vA3rBvDHLCPTTyb/yleC+zKK IiJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rZddIaoLD/ZTyoHMOhubaxrRGzNsR1qnEvTVtIqOZCA=; b=5RWfUB+qAFA/bTWvjMw2cK6qiuKY17XfscxHf4FXuUBiTceekdBRMOpMhAjVdV9uSG N11DJN38gELf4qofvsLSxACU4Hpu5StacrAu2EhOIqKoZ5bI1XLVY4czfmZV7bqbvqTF K3EF1mQcZl8scZmgERu5xM4wlq7sQDv6K+zhDVifbaM/hRBrH43eIV/y+kui60gqM71Y rAn3VvIVl6cPif1WMca43o+YLeLDHd61Uo0xRA9BLEZ4HDUGauZcgsJ0hxherPeiHkMe qE+N2H30u/EMJa5fDwqNFEjx/Ga+ABA2pO9sdxoBUYRU0nGQo1CgCpDnLNujnWI2t3tt BUyw== X-Gm-Message-State: AOAM531d5BMBLTCyT+xgsIEdljt7e+6N0LQ++kSNmEeY0k+V4sMjurI3 jIblnC+w7QtBFfD9QSjLiNY03g== X-Received: by 2002:a17:906:7308:b0:710:dabe:d651 with SMTP id di8-20020a170906730800b00710dabed651mr730115ejc.75.1655140390904; Mon, 13 Jun 2022 10:13:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v24-20020a170906859800b007120e9573b4sm4045901ejx.169.2022.06.13.10.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 10:13:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88FD81FFBF; Mon, 13 Jun 2022 18:12:59 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, richard.henderson@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 7/7] .gitlab: use less aggressive nproc on our aarch64/32 runners Date: Mon, 13 Jun 2022 18:12:58 +0100 Message-Id: <20220613171258.1905715-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613171258.1905715-1-alex.bennee@linaro.org> References: <20220613171258.1905715-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Running on all 80 cores of our aarch64 runner does occasionally trigger a race condition which fails the build. However the CI system is not the time and place to play with much heisenbugs so turn down the nproc to "only" use 40 cores in the build. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Tested-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- .../custom-runners/ubuntu-20.04-aarch32.yml | 4 ++-- .../custom-runners/ubuntu-20.04-aarch64.yml | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml index 47856ac53c..1998460d06 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml @@ -19,5 +19,5 @@ ubuntu-20.04-aarch32-all: - mkdir build - cd build - ../configure --cross-prefix=arm-linux-gnueabihf- - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1 diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml index 951e490db1..65718a188a 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -17,9 +17,9 @@ ubuntu-20.04-aarch64-all-linux-static: - mkdir build - cd build - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 - - make --output-sync -j`nproc` check-tcg V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check-tcg V=1 ubuntu-20.04-aarch64-all: needs: [] @@ -38,8 +38,8 @@ ubuntu-20.04-aarch64-all: - mkdir build - cd build - ../configure --disable-libssh - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1 ubuntu-20.04-aarch64-alldbg: needs: [] @@ -55,8 +55,8 @@ ubuntu-20.04-aarch64-alldbg: - cd build - ../configure --enable-debug --disable-libssh - make clean - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1 ubuntu-20.04-aarch64-clang: needs: [] @@ -75,8 +75,8 @@ ubuntu-20.04-aarch64-clang: - mkdir build - cd build - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1 ubuntu-20.04-aarch64-tci: needs: [] @@ -95,7 +95,7 @@ ubuntu-20.04-aarch64-tci: - mkdir build - cd build - ../configure --disable-libssh --enable-tcg-interpreter - - make --output-sync -j`nproc` + - make --output-sync -j`nproc --ignore=40` ubuntu-20.04-aarch64-notcg: needs: [] @@ -114,5 +114,5 @@ ubuntu-20.04-aarch64-notcg: - mkdir build - cd build - ../configure --disable-libssh --disable-tcg - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc --ignore=40` + - make --output-sync -j`nproc --ignore=40` check V=1