From patchwork Tue Jun 14 00:42:03 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: 581638 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2472828max; Mon, 13 Jun 2022 17:51:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG7vs7aU8JxuxLooQjx8Qp5npRYSJrAiJYM+IqwhH4izzmFRixR5V/kuCrH68anrsO0U1V X-Received: by 2002:a05:620a:4413:b0:6a7:3c54:8046 with SMTP id v19-20020a05620a441300b006a73c548046mr2176405qkp.85.1655167911255; Mon, 13 Jun 2022 17:51:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167911; cv=none; d=google.com; s=arc-20160816; b=z5mnZVk99gOArmeb88os4Ir8px2jrCggbIfpyTa7FA4/Xv2NxLrP7yXP4yMKws2u2X 4b5g5/hn4qGbyrdGP5TxpqW/3bnVOUdQ6ccwyWhBTKPG/AODbOuuPHZ29vf8CPUReiR2 +EXhotDrS0pnLzuzdrdNCV8BrO6g34AGT0xAYgTQcdiSM3FlfKGVUIrJfAJWbk0yVXiZ k7xIipoMj2purWyHer67D4oxfJyLzMZkNlmWFKnYT1B3icQaR5KXMAPAMyP7o4Ji/i3+ t6cTyrNMTu+2yLVl8sWDRuwUarc1OL/Kz9GBzLjLqRi3HNDzBhLstLy3UMuHZa5E1efs uP4w== 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=PTYvOPYimtqM/KUU0VaNRoqw7uwfKMsI3e1IclJoUjg=; b=CQdur5aRMK2tkNq/aXdluftmuDozKdrMeZ0WeK3nubuUp8Wq6ZeNsqy7R9FO9Dr4y9 lhm7ebQeqYzD7WD4FiEF2VgweAXWtWMssD/8m9F5AY1Xfsjy0hk8NWYCXYVAZuLpiqmH 4FR716AGyLaxi1dxvMZmTci4Gp//hhJ3LkgR+RpN8cr7He3a3usBLDqHyOwEmocGQhXO z0HSwFsdw2VkKr4CmvifNk8s6FsgWj9nB2Q8xnnMXga7VpbAEi6FoiBQdciU1xJV6Q62 qkwEhiTOQKGbkG6k4MAaO2kuxW90+JqUSIRJBfSCJJQ/H7H35lUAY5Z8/8/27fhDKZsH ky8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hwg/LMkd"; 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 br42-20020a05620a462a00b0069eea440dd9si4908991qkb.396.2022.06.13.17.51.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:51:51 -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="hwg/LMkd"; 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]:43380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0umc-0002BP-Ra for patch@linaro.org; Mon, 13 Jun 2022 20:51:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udM-0008Lc-7y for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:16 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udI-00051k-LO for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id z9so3813520wmf.3 for ; Mon, 13 Jun 2022 17:42:12 -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=PTYvOPYimtqM/KUU0VaNRoqw7uwfKMsI3e1IclJoUjg=; b=hwg/LMkd26RImHJJSmAtPVmYbTnkPwAQtrjyISyJ5335zUkTx+tT+X5m75UGsQr8QI HbaXTmcoQv7Q2qK0M+YK+LFKmoLswwMBg1pkNbIJpUe291X5wwX2SbzktuF2Q12Sy0MV W9W/J5St8iNIRYeaeReAomEZsx4RubVTPOFCBkgXfSmuLM14foRn2ib+2V/bD9I0XSei L7S9gPFnZmhbaF8CJHUfb1UmR84gpv2NDAC+gzemwT+A6FRM8S4rf2/02kHfZ09t1yey X284vOj6pn6zoIN7+RoAenqgeYD115hcteZ+TZv9CSxoFe6ySDnXqDiQZWgqNQAxU/o5 MT7A== 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=PTYvOPYimtqM/KUU0VaNRoqw7uwfKMsI3e1IclJoUjg=; b=dvM7RTSZdvNAVGsfrMD8zKSFNgoUHnoUHUm9F1xqn+rRh1CqHOXHlN89rwG5NUvrZU N9vkM54LLAtjxNLe8v+FV7JLGbfGLFyer7Qm6e0aLd1jQ3Ev0fUD6OvuvUljX4QDvls2 7XYUpUpYt1f0I/ZgSIDjONWM6qDxKLBp1Sk0eP02QWHcHrYbP4YluQ5qFquG/x0/Rvfz lC6ebfGGwB4j2DrIP+D4CgSlf+bJdaK3T4tj8wvt93I7eTZcNoM64MkhkGGBlDcCDi3W aYo1gV6HfNTSWhXKnoRQm8FbvafxmUEZwKOjrlWUbV7EemcCyCLgpcT8O9LTUQ1s6zqH pMDQ== X-Gm-Message-State: AOAM530SdCqTSN+wuFs5MEXnmPYPjpwEksXM1M89T3LNEUiAlfMaznec Ep+fIj7Q518OVwRAJmLeFFKouA== X-Received: by 2002:a05:600c:4fd0:b0:39c:6565:31a5 with SMTP id o16-20020a05600c4fd000b0039c656531a5mr1360456wmq.60.1655167331252; Mon, 13 Jun 2022 17:42:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h12-20020a05600c2cac00b003942a244f40sm16096213wmc.25.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2A1361FFB8; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 1/7] test/tcg/arm: Use -mfloat-abi=soft for test-armv6m-undef Date: Tue, 14 Jun 2022 01:42:03 +0100 Message-Id: <20220614004209.1970284-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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=unavailable 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 Message-Id: <20220613171258.1905715-2-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:04 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: 581634 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2469838max; Mon, 13 Jun 2022 17:45:07 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uEsf26Hb8S/2e+EaJOi8WEyor3X/9PvDugRb2jBJ2Yrma4BMX6rQIa/Qq1aqCK/DTB4m6J X-Received: by 2002:ad4:4ae9:0:b0:46a:5726:58c2 with SMTP id cp9-20020ad44ae9000000b0046a572658c2mr1618621qvb.36.1655167507751; Mon, 13 Jun 2022 17:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167507; cv=none; d=google.com; s=arc-20160816; b=XI1quNVgcBZ81/MelV2e0zC7HY1c/gkr7PCy3te2RoCrm6GJzriW4CBK3SI0TIL8qN bi3XLeCe/1yVFFyWDNyKhkddVgtXMDA4soFQiRDkwQyUZhKCl3mU9oHITRSKCmo15EQ6 29aJBMmbJT0/A6WpXqKaBNkHmGBTqDOcl6qMWD3PMLzjzy3pMWeXeEdMdaq0dVyXj7Sa NSwnM2/pI3407uL6Ze2ZJCJYlfPwhm5l7UT8V+i0cSRGbUag0gGlX43rx2fB6meDsp1X Pbzxhc8P/UQud2pSwQjaM0tBcu+XC0KeNLGSvki8P1Grc59jj6busNBoyccaHrcd9Q/9 kgIw== 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=bZVHqgriaQwh2dR9fDU2lwwmFQGBOo2dO3rG0EeQBO4=; b=kdztIddcCPrWLoFrHz6NRYl4Np0YRtt/Nk12O8PmjRGlNPydiLUNBlVAqbYaxjlaK7 PxnxhKk+wyacKScIfsLPFcH22zDdWJEEZHs1puH6WQerGtNtGeCh06VLTmO5VEw2Cy2M 7mD6sLTamyjnJJO9AgiF/B3dQ7qb2A2HwS76isKiXWaxJO9T8//rLSEDTeU96+lZegK4 hMvbvZDp8I5ejXjs8VX+pM7Y8JaEDckGTiB3ePdPkwaozEmAqW6tNF8Zkt0k9L+R21Ws XipqJmFsGLac/f+Vf5ddiY+9++w1woI1dVW0dImk9ruOGbRjhQIUt0OvF9bYqj0zCnwk BJ3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eqRYwDRr; 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 x30-20020ac84d5e000000b002f935d30083si3788950qtv.433.2022.06.13.17.45.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:45:07 -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=eqRYwDRr; 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]:57312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ug7-0000ig-9H for patch@linaro.org; Mon, 13 Jun 2022 20:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udN-0008MZ-IA for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:17 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udL-000524-RP for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:17 -0400 Received: by mail-wr1-x42f.google.com with SMTP id x17so9077773wrg.6 for ; Mon, 13 Jun 2022 17:42:13 -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=bZVHqgriaQwh2dR9fDU2lwwmFQGBOo2dO3rG0EeQBO4=; b=eqRYwDRrL+ctyRiz9/NvsfDzqVpXl+cVpj/2s/fGXw0uN0Q88YPqQ7wyXbmYX4YO1C HYRxGsURYFQI9AzKfKjXYvs0G49Y3cPdHNPSPpKWmUYmyo90QXMIqUIwYQnaPtYq9EW5 jEubi/qGBYhtwTa5jYEJDfHncH7zYI+y+YsvTldqy5ma9A32YWfjohYlh0KAOv/KezI/ s9jd2j4HUhAQIy+Te5uuIkanX6VYxkwLUNda/RhglTMnjZoznDdZjLNJRfNjGvYetkWn fHMjmfr9CpjN0woyLNPJCGsDCP8/fgeSPetm5QkfoUIR2v+dOA2/+OrPrCqgbJiQVrl9 ipiQ== 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=bZVHqgriaQwh2dR9fDU2lwwmFQGBOo2dO3rG0EeQBO4=; b=wshis3PXSy/27dQy3bJTTPb4sJ87jW9VmFmX3cF4J+k7+he8wMyraXWrTF0dBEbR3j OGSpGgGrNELRwK5DbWQvNEpQa4uHqh7cMxwyrLelDFOHg0rOmCUIT0f54ODUAEuewiHf tZpKy5jzF0ZMmxzTOfxxm4NYqyjE4Xr1JNQJEpiD4pCcWxPVCSZq7jS4pkxJW/z4ljVq nec+4nbr5KYKdo2COcuXjpSzKIlFx3GFLTTDIhsvCLJZVqyqlAJ1ZtJfvt1CR5132m2p UERQUEnCXqvbjwPoKSZ7P38gt8DDDsKkXy1o+2EA0JBlcYLm16gyIC2l/0Ml11taTixR q+UQ== X-Gm-Message-State: AJIora93wEeU5wyn/qukntwpNXyY+CCydesZufTXmX3HizmE0bvMnN6O bdoHEH6dxlQJNPI03NsL149aig== X-Received: by 2002:a5d:4601:0:b0:20d:53a:2f39 with SMTP id t1-20020a5d4601000000b0020d053a2f39mr2081124wrq.347.1655167333046; Mon, 13 Jun 2022 17:42:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f6-20020a05600c4e8600b0039c6ce32a2dsm17754732wmq.33.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 41C301FFBA; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , Paolo Bonzini , Eduardo Habkost Subject: [PULL 2/7] tests/tcg/i386: Use explicit suffix on fist insns Date: Tue, 14 Jun 2022 01:42:04 +0100 Message-Id: <20220614004209.1970284-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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 Message-Id: <20220613171258.1905715-3-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:05 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: 581636 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2471296max; Mon, 13 Jun 2022 17:48:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTR5AG2HwbhstBgmvNjquxUzrX5pOLMcKQ05viGTWK+06eJH6nQF2VVaOAnfEBWTC87Nmg X-Received: by 2002:a05:620a:4156:b0:6a6:f8d2:6d9e with SMTP id k22-20020a05620a415600b006a6f8d26d9emr2324769qko.30.1655167700508; Mon, 13 Jun 2022 17:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167700; cv=none; d=google.com; s=arc-20160816; b=ZwBgrY2fftmcwP8g2MiIiCkFmfd49/2TrMWdrDV+s4AnQR3tphqxhbaQExaU0e5ftT 0gG0S7StTYOCallealrfPysThKspmsyD8PUjxLsrKfZlEr/f9pKLA7ureqXOlNadxafr /1fRFgvmQZu008BykLiU8PBZwXeKLcSPoT0cAqrMViUQLT/scCZqLjg5Sujq32THCnJA nFjweIdS+tTfnU6/OmyqctRVbTP12jYdvWoF0R6LgIrtvP32WtKUYg8y17xnGdD9V00j E76pNuJUXgfHENX6V6y+/O9a5uAJeMgZjddqMQqD3PYrXDBHTWiADOwh58qjv2YrA0s9 GgqA== 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=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=jg6M81HtB7083h/mKgenFw0qO4sRExeJ5zSVWGiRTi9Jcv6UMCNQjfkjkxw6dfiD3X llM8HIJ8LCOdjpokQB+UhbGoLFGDnKVtILoMceDpmwCKZ4r+GzmJwN6s+BW2aGdXAPTu XAc4QocVlgF86/888ZEcGwZPIY/azvRGF8r2OLupxRjwUz8Yi2ysRf4BBuJQpLZ6taT3 F2JOwC7Q6PvB1fUIwdPdRLuRBFNNoDADUiTVj0WFLEK6OkH9MziYo56PrTr5sChuq9XC 5pkOKRVz88heaCq9QgwIixXPAzX47o3qxs8ZrnVEogCt8TTH6Iq3BDnbzNdYmPAuTyH1 GR5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vfW22iCN; 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 v19-20020a05622a145300b002f347192afesi5496123qtx.125.2022.06.13.17.48.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:48:20 -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=vfW22iCN; 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]:37654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ujE-0006jU-2p for patch@linaro.org; Mon, 13 Jun 2022 20:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udO-0008Mv-EO for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udM-00052E-CF for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:17 -0400 Received: by mail-wr1-x42f.google.com with SMTP id c21so9102630wrb.1 for ; Mon, 13 Jun 2022 17:42:15 -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=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=vfW22iCNEvMUcoLasIUgBD+g2Z02LbbENqvFGssMIUcAZF7/oeGFE02xe6vvy5WXsS qhjOgZabRF53hwF0K2tioP5IZwUQ9Gqlq42IvRXv9XJfsm+wOAitYvxkVtg+8UcD/mWP X9/AObCVRXcLIA4oWVONVh8jFydwobrfumH40G5wJw9A9BKJyLC6aZwX8dqhIt+SlLZG UZNTZXtjoZtT+OPdB0P5uIpqYj1E/F/orZAbh6QjiZ1DhhRWApZgCeB+dmHWIcpB/XsF v4eRIJPunuGB6NuW9/+oE6n73xN1by0souDdSrofzKNTIwgNK0zzouUIlGTfUsmkeh4f gPRw== 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=LbJvesSj/XUONUT1pSTDj21cx22O0woqvcv66/J8IsI=; b=MCWEnmr405t5CA61M7Z640pju7kN2uQLqXL8LNZAvmbgfm2/UR6pdcPr5vIYa27szC g871RYx49zyw4gg/l4JCUxUnQMeR1VSF/fR/HBYQ9woDaWBBbltRB/OwqSkuJhcmNAOj cFVUd6rTEaMlMAGUgLeoGy98v4nEStlyZJ6Ceax8CKhj2+BFZ0N4WzippnpXHZ/JadQm BI8fU3zbpA7FSxIYsqTz1c2nQHuoOUO2ro30/nFze9Pr9mEoZQ9krA0aQc5Nn59RWTE0 jRT7QLPNQgWAl56XJg8GV7DMuftGrBFIFFWXpqftBE2HI5v3+nstbjHpvjovdHhy7BlZ cR3A== X-Gm-Message-State: AJIora/Ck0GgCVhpQ2YgaNweLtOM93/AmDE80WSDUFtCzGqQszbMnrqK oU3h3SGoz9go8qN8neIyNjSfrQ== X-Received: by 2002:adf:d1c9:0:b0:20f:c3dc:e980 with SMTP id b9-20020adfd1c9000000b0020fc3dce980mr2226192wrd.552.1655167334037; Mon, 13 Jun 2022 17:42:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g13-20020adffc8d000000b002102f2fac37sm11245006wrr.51.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 59B821FFBB; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 3/7] gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs Date: Tue, 14 Jun 2022 01:42:05 +0100 Message-Id: <20220614004209.1970284-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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 Message-Id: <20220613171258.1905715-4-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:06 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: 581635 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2470180max; Mon, 13 Jun 2022 17:45:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucD76lUqjTSK0x/kyR8W65m4zIxFqWRzMoClbQf8ZLFyQb6PReyZ9UfUqXW0o+dqKQlt1J X-Received: by 2002:ad4:5c4a:0:b0:464:5920:7c1a with SMTP id a10-20020ad45c4a000000b0046459207c1amr1526024qva.58.1655167551590; Mon, 13 Jun 2022 17:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167551; cv=none; d=google.com; s=arc-20160816; b=qQBruNcd4IXny28hgEEFXw6cxM+iWnYb9je9qJDN25AKTao6hNWrF5IimE5fj90mot M8erOGfSrJZK0r8emnjw7Qfyk+Ygoral9+pmdBKsKHE2U9oOKICSKbSyKcznubHPlRzE BvvENrbQqunvFYczGN62gyGlN6mmPqNnnFaekxqTDq+WerAjMKvDL4xHKwRJwJJQMzTa Jx3MO9djhTkUtSyCxdakS+2JnTEtM5wZSwvMJW5R25+2edVJyKcvbwcJ7JmFilYVraIw MRVIKLnO1bUiZynVjUV1TQ2vKe5H2vuT1+ac4YTFaFqShTpzG503yZXnNqyoPlI8LNaC e45g== 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=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=qTGN2EOTjXn7xBxQRlpl6g7lM0BFLOSD0vNiZrkfX3xaA449FF3K12zCKzSxEg7cTc 3G3Oqz6XgsjmsldosUHqF1G6YUNDy04PUU4/epj7MwdIUyxleOVdXTPuWFkGmGc3HMF4 lCACVsgDn8dk+CLhitimUR56hDG3RIwg3+yRGECY4ZKfmJbgj28m4QyloEwi9atRjSU/ OFDg51u3ml+d3+hBDXGVlHL4ix5FZqvd/Vl1+T/AGoK94tYc2bmyfn3y99ILGO1nm/wi M3ZuVvj94X4QBPheZ6KDBL1C/XrpUmmtTb9o3IUMHfaEzidepDt8ns33HVCu1kujm7Ca sRpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R16nslKp; 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 l11-20020a05622a050b00b00304d85c5d24si5862571qtx.3.2022.06.13.17.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:45:51 -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=R16nslKp; 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]:59088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ugp-0001vV-4n for patch@linaro.org; Mon, 13 Jun 2022 20:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udR-0008Q0-Sz for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:22 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udO-00052Y-84 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:19 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k19so9061229wrd.8 for ; Mon, 13 Jun 2022 17:42:17 -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=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=R16nslKp9bvhKZhgxAUwLbsQXAb7QSXxwacphLpbz2yxC5KuPhhOh6SouCt0jKexl8 Zw4QWos+TqLVZCGdZOseGcaNiH2jR0sZVRtZGIA4GzodJj74s9K6QlaJipZKMxu0Ej2Y 4urES5URbhW5kA6CaBbDTVzYX14Arb7CkEnUX5sC/TfIPKpB/5RTyjHfiX6uGDMd8thz PcoadWK/QrjrjIykGhqaGpiuk2Ir4+pVzb5srdJ5HmAUOV7LRUo8bgW9+PJcQWjC97QK 2F+36IgjAEjva6BDkciDl6qpRvyug26JZ+qWP5+VpPNNtK3eMln5x9JVEapaiHGFwa72 +SrA== 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=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=UB3+R/HC2v3Hk+HfL4js9BR75aWbhRzj9cLbm7y/O8mvTkk6UuakrkbA8j87u2W5OR UZ07KVx1yXGuXGepuRKEa3UkKiwciNE/cRRJbFBuXzdtc9823p8vVOgnapLwxGFm1/Ts p561EKyZ0hXcASg6mFcdNmejKQVfgmsLcyErDk6vISErh8LqeXOo03iEH9M/MqSzJ9Uf szS2OzofhbpGZJOdI85aVy4l4injCUV4bATC2tDtcU4nMCjPiaYs5zaspTR3mXRliILv PqEggbHDH2gh2n+yhOTGfs2BwRsE9yMSFbUqjksziqpQEzDhETo4pI4w2O4Q1rAMSrwb JtfQ== X-Gm-Message-State: AJIora8UjDnRPNsL40kkMu+Dp+X693Nh/i9QDTGhNInx5raA3Mg9Mt83 Bnn5anDsTTehnskgx/L9bMkQeg== X-Received: by 2002:a5d:4405:0:b0:219:e73e:8312 with SMTP id z5-20020a5d4405000000b00219e73e8312mr2175047wrq.499.1655167336247; Mon, 13 Jun 2022 17:42:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k11-20020a056000004b00b0020d02262664sm10065679wrx.25.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6540C1FFBC; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 4/7] tests/docker: fix the IMAGE for build invocation Date: Tue, 14 Jun 2022 01:42:06 +0100 Message-Id: <20220614004209.1970284-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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 Message-Id: <20220613171258.1905715-5-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:07 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: 581639 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2473526max; Mon, 13 Jun 2022 17:53:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUm2VSBMH5q8I/fmYYjnxIANP7fuX2hvPEGQPJarwJUbtOWJrvjxlpjZd5F18j2owiFFsz X-Received: by 2002:a05:620a:2992:b0:6a7:6244:e7fe with SMTP id r18-20020a05620a299200b006a76244e7femr2216135qkp.370.1655167996683; Mon, 13 Jun 2022 17:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167996; cv=none; d=google.com; s=arc-20160816; b=CXsoJ1j/CECe7pAhk/e1v2ZGra/kYQmUCmT4uodwDhkn7BmXWq/XhNy/XucFWmpx1y n6A5mz++D+Y/7IhGNbB7q8/x4Grjfx7g5ujh5PShoIoidi2NuKFGuOjguitTnU/UfK8J dIJuPJaUeMTTkG3dJFfBWkLrT9WQQpr0ACTJ2eIlC4Yrd4M2wA3kovfDXA4ZSgLNgTZw wVm2FDUTQ5Ewc/ynm947zoSmPk3bJiGPmJRTAR66f2PibZyAhZHNrxtqUez9z6nqx9NX NqE/F1gXTuJ8XBu+Kk+bq6IwRa62EQmaP1Di7jDysHtJQ0HnIpp6osF6gBK9NIsYKX9x Ho4w== 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=4NeIHFgFCW8Q9U3GCfrnTrsyzzh5Bh7ocDbzI2wH23g=; b=ca4lYINQJjdnOCqLjqlchp0fpLPkn2GrEpY4jG6JBRTGyYYcklkzn9u99virTeaMm3 OXupyVug9T3NH9ktpgCozZtbP83aUbd/QtCxiuQdwAK0zuC5F08mYtduyKmqgIky1Q4g Duv9bV6UQbCoWbT6RB2/1Fz6ehpXFp2i+rXM+ToEfzCJiOESCBN/LzAnySeqgtLSQbId gqPy1jHKkQSSW9njEYUOIph3oMftySsfhC9QiZ+kdfuof69mz+7O0ylsUHwY9EB6xNvi BjIHZyrljcXt18EF+uG6aNAbMLB56JPkt2te7k00AcvZQuVKTiK4InhDTnSiWxjBE9/a MZ1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QOeLblSm; 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 o19-20020a05622a139300b003052daa7225si4142379qtk.568.2022.06.13.17.53.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:53:16 -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=QOeLblSm; 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]:44652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0uo0-00030z-8v for patch@linaro.org; Mon, 13 Jun 2022 20:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udR-0008Q1-TM for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:22 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udO-00052r-Hk for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:19 -0400 Received: by mail-wr1-x430.google.com with SMTP id o8so9084442wro.3 for ; Mon, 13 Jun 2022 17:42:18 -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=4NeIHFgFCW8Q9U3GCfrnTrsyzzh5Bh7ocDbzI2wH23g=; b=QOeLblSmm9JUjpEzpisSNRc5O6U6MmTmFvTh+tMfJFpty6OdCQ7tFQMdYhp/txqPW3 dIW4igTBmAPUrHhzUjzjDFkS+4LMrzA5jlhT8HNHwuUQoIvFJPcxFRNJHQcItz/ewvfX OHcwJ/BwmLq9hKns9nOYE6c0g9K2pIo7KvRaRoDwczC/c4e+LgRWDWSUA489luP248BQ Dzyhq+GC/eBcBmZ+Uon+Xx+YoriTCJntulZHb5gcTwnyYEC1uwAr1HDBCHDBDnzkphVE Fh5yVnlQl7cqtyVlMh8TATo6+S+Cy2+0w56EYsB9lO4s9t4rHYVnAxfRhw7hSIZSP41e yDcQ== 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=4NeIHFgFCW8Q9U3GCfrnTrsyzzh5Bh7ocDbzI2wH23g=; b=p/ZnaFtg8gm48gXt/eBDvdtiUz2EcTpSdbHtwBWrEfEyjrvvp7KQI9kj3ZXHcd0Wke UTs1GhCVK8aUreY7AFDwrMtS6vNZMn3zHaMPwVgkvFOdj6J745+TTmATSi9fHwCA2nVW 0/497EN47xrHqQNJQ7rDzAuqjWoXyXrTi+lptcKddPU50Xw00ZxsyiB48ROs0FTlGAdT A8ZHNCyPloHdpevFY7a2r/GU7WnSOZaKBA9deDmdnU8nMab4whlRwp/3ueHaWCVwcDVo M3F2n17HqcTrYgGSGHG3zXtL/UWgTQoCeq9doQCzVookXf1m+yqLhg59QWt4Pa4yJUg8 dVSQ== X-Gm-Message-State: AJIora96NJaVmusb01wX29XKXNRSNBoyhINwnwLDqV4K58ASJsSbhZ8z zNEXLSpHxypMTZYxw21j9FJ1ww== X-Received: by 2002:adf:e189:0:b0:218:45f0:5c0a with SMTP id az9-20020adfe189000000b0021845f05c0amr2076824wrb.683.1655167337154; Mon, 13 Jun 2022 17:42:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z12-20020a5d44cc000000b00219e758ff4fsm9909573wrr.59.2022.06.13.17.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7A24F1FFBD; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 5/7] tests/tcg: disable xtensa-linux-user again Date: Tue, 14 Jun 2022 01:42:07 +0100 Message-Id: <20220614004209.1970284-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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é Message-Id: <20220613171258.1905715-6-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:08 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: 581637 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2471420max; Mon, 13 Jun 2022 17:48:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uJijwvScjEwn9IhmOJKlMgmBMHGQi2iOjq7q+J5fMJZyJx8U7dl/AoNvBuueyEFGEWE+RG X-Received: by 2002:a05:6214:d07:b0:466:63:25ad with SMTP id 7-20020a0562140d0700b00466006325admr1764980qvh.79.1655167716391; Mon, 13 Jun 2022 17:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167716; cv=none; d=google.com; s=arc-20160816; b=SAITEINGz4ObLzqj5xG+6KwEQmr4NQCZ7BrHujap+Hh7hNU0b1ax2l5shvRJV9Qrcu 5W3ecrsND/nVSABe9pL8FRIg12PY20dwoarxX7jIZdbOvw9ps7Gx1I4qO4W6IzjCytCh WJQmyZlLAq6hmY6+m/PJZwwAM4z/dv6WHG+BNMTyqnCFyxqOpk0yRVEya+xqv02jVPqA jkVNwAE3K8Sv10hd1Pbz9NQeln1Dm7JCRWLeRXqG3vzTlZ+Wd6YymzjDIxNottfxYU+/ 8l5OATN84v1HNgXKSdsciEIrcpvqddikA1WnUN2A4ccwL3DQH/UgzwNanohfoskUozvv hQGQ== 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=q0c1kKvZZ6jdaZbdHgPYukR8D8RtKbZc2WlNf6Bh1Lo=; b=p/50PgMRvLCMf3X1SszOAAR9cPFekFJ4xEM60+auvqent0WmGpPJnwElgr+P1MR1DK InBHydSM6M5J05b/Uc7pgH35Qrim/2hPFDR0Z3wqagdOhlCvtXZvtGAq1uVjep6+h7mG aGgEcIa7F47IRskAKG0DZpfTIksrefn4H+Ekz2OMVhTCJEx69r0wspIcKWgg0s0LZLxT L5IO8QnH4VJ8Xcg3Eo2SUkE+TCAfAQi7/dZprVaBT/AkpleiTeWaPI1g6bNpQoSPH8ej SJWiREk36ajjXlVG8wdIjt1U/fxkUGk82kUit1sJkYb24ewVgPdwWeSMWNyASeWvkC5N Wa8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L11vzqdv; 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 z2-20020ae9f442000000b006a711bb7498si4576289qkl.277.2022.06.13.17.48.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:48:36 -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=L11vzqdv; 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]:38734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ujU-0007SX-05 for patch@linaro.org; Mon, 13 Jun 2022 20:48:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udS-0008Q4-4H for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:22 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:39800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udP-000524-Hr for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:21 -0400 Received: by mail-wr1-x42f.google.com with SMTP id x17so9077773wrg.6 for ; Mon, 13 Jun 2022 17:42:19 -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=q0c1kKvZZ6jdaZbdHgPYukR8D8RtKbZc2WlNf6Bh1Lo=; b=L11vzqdvT0ngQIHAZELmxv+GuFcnfbahc9s0cznN34VMBfwHI1tj/Q6sI042YFtTQ4 vaYe+o6Ravi6mD+cBH0AIdiZ6jc/Nj54SiU/tqA9bkO/6x2bzia8IfMCvXckOEoD0DSf +bcpHf7RNGTKYkDaxcML3KthnhGS6PKTEHCNMb8rKc5GznZO4yzosAiA/YgvJzkO95+t 1HcS/j/QT7TgbJa1bmKERqSjnwr/cZGTMyJu2r1ZOUj+dIhpDfXsQlc1Cr+upk2Af8eZ HZW01+2oZoGTe4wzqSNUp2DOUoD2S0tr67kXKn7kEnnnO/pNK5zb6caiCzYOcsunTUOF tkhA== 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=q0c1kKvZZ6jdaZbdHgPYukR8D8RtKbZc2WlNf6Bh1Lo=; b=BduMJHTkeYT3hP5g/JTiintBA8wKQ0ujP3x5sXvTEFA/DJnNVqP/LILu48Usg7kqHX 7TltJFxm4tM6L16QgAc4TxGmsBT/0LgrKsVK3NGacot4oRHii5DPIf8gFFnLUI5an0O2 F1uvWSSoQUDOcvMuGJOkAZY0YyFCx9wz09ugEhfmPFeeRMC9LLAO1QDRCDzleWk8iCv+ 316sJt7hwRu/d2/n+ZlPQy/RtLiJtp3UP76YakGaBuZsI4AhOZw14jNFXN6XWC/P5fJ6 PNquvGKXXxtAfokHcv2msET7PfSwrKMMQtCsN62tdU2sWuj0qG95mVq08OiJdzlqytS+ a30w== X-Gm-Message-State: AJIora94Kf+Zv9CdFg63tL98XgEF6Ht55GgocREqph6C/fpOXfHhB4k/ Y7kTAMaVnX/CdDlbB4PoWPvAag== X-Received: by 2002:adf:f646:0:b0:210:32ea:e679 with SMTP id x6-20020adff646000000b0021032eae679mr2041126wrp.395.1655167338784; Mon, 13 Jun 2022 17:42:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c16-20020a7bc850000000b0039c96b97359sm4398288wml.37.2022.06.13.17.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 854881FFBE; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 6/7] gitlab: compare CIRRUS_nn vars against 'null' not "" Date: Tue, 14 Jun 2022 01:42:08 +0100 Message-Id: <20220614004209.1970284-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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 Message-Id: <20220613171258.1905715-7-alex.bennee@linaro.org> 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 Tue Jun 14 00:42:09 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: 581640 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2473721max; Mon, 13 Jun 2022 17:53:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3cFCCkbbyI7P1nSGA16TfmZbsLeeemuWW5NGtTYE2pI/Rfxgl2JQXx6ezNerh4y300/yP X-Received: by 2002:a37:a7cc:0:b0:6a6:8b1d:f601 with SMTP id q195-20020a37a7cc000000b006a68b1df601mr2312539qke.218.1655168019772; Mon, 13 Jun 2022 17:53:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655168019; cv=none; d=google.com; s=arc-20160816; b=NVY1NwVKjVFSlG+AlCs+osQHtOmo+8awKrw32X6IWZ7qJtZv5urH/8/+vyEmApNU9m GXG5v7iQbpkCmSyvlFa2d/b7SJfymDWShiTB0ZKVIXMwp7Oao6LZpPjXD2YlZyYDaHng hxWmxUlFbfk8POCxNCEdm6OTtfIUu0kvx1Bj9Hz/4QWeiaJywuoR2vzc4BqLU/FCi5Hi gWuJ6PtAgaypSZNeK2OuFs4Cq6e+9F6kaALQH3aUOXL6FBUYhbXnSRVhCZTQpsM5+Ijd 4TnBFaxS/hYs+zPCz2DSjEN91TGbZcFno3kyw0CZTiyBPFEw+mymuGO9V2CXEjLDoa6B 7GDA== 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=6W2OhkT13Bqd3qEKUsCAt2ot9YsgaiLRb6IaOc9KPSA=; b=J4m2WqRwITrxvNg28b9ooZi5zDp3dNsKqGkKj5ei5VbLIfTTDx3A6J8uSoGKHWN0h9 BI/tSw3GZv9uLlAQS8srxtCY8JO7V7D6+6DQVkY6cbBwee9DU8dgRzZ/vIZpDvA7YJsQ eSy/H/Eg/RYpRjiQ9oEZhxw9ikrc0Wz/kFxJer3TfY/xbif6u9Z1FrKJVJGaWMOQAGRK tdlVYVO2d3oxn2/2d1/z32U+6Uwmv75iy/ES/AijlZOGy9JnwP3lBVQs4WVU6SQc9oAr OtoFRI6+j5W/EkTJ4kqx9LHHm4/ubGPe9zGQ+EH42r9wBrOusl9TcvIFdJ1ugHifCkv8 L3BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UeG9Ku5K; 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 gg3-20020a056214252300b0046bcb1f01fesi6286060qvb.432.2022.06.13.17.53.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:53: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=UeG9Ku5K; 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]:45254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0uoN-0003XQ-9j for patch@linaro.org; Mon, 13 Jun 2022 20:53:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udS-0008QK-R5 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:24 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udR-00054D-99 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:22 -0400 Received: by mail-wr1-x432.google.com with SMTP id q15so9034803wrc.11 for ; Mon, 13 Jun 2022 17:42:20 -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=6W2OhkT13Bqd3qEKUsCAt2ot9YsgaiLRb6IaOc9KPSA=; b=UeG9Ku5KpZ/yAKj8SXk5xkzo/hbGVflEGRuvPWENoZ8f0fX4hczfVEnmVrKbHiyzDc 7IFbx/Nu3Y8BciPjZeMH3EKJRabiq9/A8koqcE08nhZXeiwNFKz6XpAhCWtnxy5pw5Zd t1mUdLFaNKFea5PBF2K/O1Pdp32l2cICQidAp7RY2+6C+n9LRlR6DZZKtwj7BATfCUEd 5FD8B7jgEBFHL6T8dXSSXPSSo5nOMkvNgnDfGu2rrjulhlyDs/ujeIeicfZmG35D4IkZ rRpXrnnwzoVxgJFFvBT+DJIPm0jgUTJv/fMmYWZlXdtrdZ3C0q4H4rnci4w3hl6DOpUj FaXA== 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=6W2OhkT13Bqd3qEKUsCAt2ot9YsgaiLRb6IaOc9KPSA=; b=ZChYhDLnMeEonKHrSiomIGHgJstPlRkocCNkt9h2GAN49Fcv9mV3gZsvZNk1CeJGt2 sm6+vqeuUTG08gYs+5Ui0DDkShpLP5CFg+errUktP8LR/kxT0us99f3lXPPOz5B+EYTW sEJ9N0HGvbZ05HaLN/aIDIALDrXggHJHotTHwSp3t6eN2xJ1pXq1VK+7NEO0mleruMwu xNi5YljAkjngHfhDzDX5HUwp98inmenrGoJAQi4Qe7cA+Q1Z3BXcra5onM0/KtzBMgl/ Np7kwDGRbQgy/Caw/3mu4jyp2+4D3SgihiuoFcYFnnwtzGy3Qi0addvg19E8xwUAW2aM AiqA== X-Gm-Message-State: AJIora+k2HRVnUN2TtcROfDGtfYEj/8nOoL0cBZj+VyvXo14DoUHr6LL z3ul97zWYl5Yol1YKmxHKa7Zzw== X-Received: by 2002:a05:6000:1883:b0:205:c0cb:33c6 with SMTP id a3-20020a056000188300b00205c0cb33c6mr2198894wri.39.1655167339508; Mon, 13 Jun 2022 17:42:19 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o6-20020a05600c510600b0039748be12dbsm15802228wms.47.2022.06.13.17.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9D6FF1FFBF; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 7/7] .gitlab: use less aggressive nproc on our aarch64/32 runners Date: Tue, 14 Jun 2022 01:42:09 +0100 Message-Id: <20220614004209.1970284-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-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, 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é Message-Id: <20220613171258.1905715-8-alex.bennee@linaro.org> 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