From patchwork Mon Jan 3 17:33:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529633 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1012779imf; Mon, 3 Jan 2022 09:34:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3o4z+zEYTN0foTqYCiaUX81bYptVSUmKE7OyHBVb+Sb3Cuv0mPr/fcSDTgKMmZc4qe2wf X-Received: by 2002:a25:69c9:: with SMTP id e192mr13302005ybc.164.1641231270764; Mon, 03 Jan 2022 09:34:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641231270; cv=none; d=google.com; s=arc-20160816; b=aZ8vTDOxT9sDGi3M2F30VxruCm1JzniTYwAvrgWi2103mcx6F7Cpwcwm3IK1UO3Nq1 ICzCTZWWUmqtIW1KYqtV8pZEX6h0xwp8IDSwGpbtPKBy4Kgw2uFg5jGkh4ke3GljcGkT ywC91XAxAocpzqFsMl40hQmRx7wQiSeuV/DtXvlGvC5eIV9i+txRvKH6wyyOSFGhEB8x Y6MrnCDVNvkC9/qiYPO+ZDXMgVzPSM99pWjDr6MbDUAPjmZlA0hGu++/JZLUUdwili0J g1yjZ0rkm4mmAgedPh8ovDOmF2LFP6hwg2fGTkCIR5HuW5FqQ2Te5FjyzVH6coGknxkq wjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=rtX+oau2Kkwaxn71ob4NUphWtYqvpaDJFcq1DdodN9/pCTlpN7t3EBlsFYd4bTmW4y 81Swj42vNUcbj13NcqeQedo3h8eQF2zjZxXUFZLp5kKjUQIoemXKr2MeUSdjeiMPPNv6 guFL0ATBtwkdM74flFbkpZc3+AZjCpWMjfcCoP6Xs0u0aY/IPrtgAOXiOiWtKHvprs6o IGbyTy7x/uHTZBvDCMixSAN6T1+tqeUGoklBoByU5Ais/Cvpiz77cViBTsheiN0vnMzQ AfzU/rncwwjI2vpdM7gLVjpA+bLPDSURcBJZxSCQjObQbdrMut1rbu5P7cBzOKbZyrsv eTpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gW+H9mMp; 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 k18si19209282ybf.809.2022.01.03.09.34.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 09:34:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gW+H9mMp; 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]:44994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4RE6-0004bQ-8V for patch@linaro.org; Mon, 03 Jan 2022 12:34:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4RD9-0004au-Hp for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:31 -0500 Received: from [2607:f8b0:4864:20::62a] (port=43792 helo=mail-pl1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4RD7-00088n-US for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:31 -0500 Received: by mail-pl1-x62a.google.com with SMTP id l16so13226137plg.10 for ; Mon, 03 Jan 2022 09:33:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=gW+H9mMpOQ7xUmG6jUQ9pHc/5dSwbi94lom5aBmw9nUoHdv7CoE9cdLTWuURP8ZtOj CeKUZO674+A7Knvql+k9JkOPvIg6GSveq0wH+2DAGxPyvAcRhp4VeViMjLbhsYdYTzvr sJJgq2VK+ucrVsgR+a0ApObMnr4Qg4kl7WLFUfgtb5BQ3KxCKX+EjwrtKZNE02dB9hxE B7cT2OBSIUpfGEgYequHzZY8u/cSwN4pY4TUS5ZyDfj9FKS9JwmQpfwb6bbONsC9wF3p Ufyt8jWmok/hUwH9fEKhbLRmc+r4HukgpCFLWiN7j/xxym5QI79+w+SycqwZpyrgAnYy rPTg== 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=d5gaGDZ+99ggf9ZXPhFh9Enr0XUZOvFdyJRvEuhLCgk=; b=lzQfAGlB6jUM15KVm6Pd/0Wgo0Joo4aUP8egLVP/itG7OhBVNNVNv4rGiJFzFzC74D YzcrnBRXJzV4tpyV9XxrycRmGMeUxY2fJZ64MS3v5tFnyxzJfKhKyA0XnHrbdKm+VZ3e ur1R/Il6vutgP0Xid2uEcPYDjzo8uqS8EAM8bRdXklgbOtByo27CLes8ih0WCmhTWxlq hsT13uqZbJlQgKy2bB/Kvt98leCl7hru/rMxpuwkf2Oyr3CBnmrPsrh5ODbABC5rwSuE yPbRy9OGMJglJOsxVejXnGOlvrf3JpT2b/l+txYssWwCi/g9r1ph1ZMVRYYpP920nroq c53w== X-Gm-Message-State: AOAM530Nu4jxfK/iilcZ/ejAu0rw2st/zgUhs8C6CpKsNLlOdm2VzZI+ zJDksYsDHFrBoIjRwgA4GEdbu1YywHeRwg== X-Received: by 2002:a17:902:e0c1:b0:148:fef1:37c9 with SMTP id e1-20020a170902e0c100b00148fef137c9mr46266721pla.3.1641231207861; Mon, 03 Jan 2022 09:33:27 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm39348564pfk.171.2022.01.03.09.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 09:33:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/5] meson: Unify mips and mips64 in host_arch Date: Mon, 3 Jan 2022 09:33:22 -0800 Message-Id: <20220103173326.257152-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220103173326.257152-1-richard.henderson@linaro.org> References: <20220103173326.257152-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fixes the build on a mips64 host. Prior to the break, we identified the arch via the __mips__ define; afterward we use meson's host_machine.cpu_family(). Restore the previous combination. Fixes: 823eb013452e ("configure, meson: move ARCH to meson.build") Reported-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meson.build b/meson.build index 886f0a9343..53065e96ec 100644 --- a/meson.build +++ b/meson.build @@ -74,6 +74,8 @@ if cpu not in supported_cpus host_arch = 'unknown' elif cpu == 'x86' host_arch = 'i386' +elif cpu == 'mips64' + host_arch = 'mips' else host_arch = cpu endif From patchwork Mon Jan 3 17:33:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529638 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1016014imf; Mon, 3 Jan 2022 09:39:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyAxCWyTN/QaUdVcFkAPXZ5hQ7B2NdDzSSku85rsU6+jHbGcGj/+LZ7AJB7atnodxrjDy2 X-Received: by 2002:a25:ca86:: with SMTP id a128mr46496202ybg.365.1641231564479; Mon, 03 Jan 2022 09:39:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641231564; cv=none; d=google.com; s=arc-20160816; b=a1P9LqYwJJjovT9AUB6v8SkabQACdO62HiwvgNY6i3axSV+eCl7iuVwVHwMkXk6on8 Ixfld9aItAULIBzAEeVoxxjCsfPxukypQdJRR5TgRRry+hzyP5SPNa5jr+PVTjVWBEGw /MjqlOFh3hzKYStyqQtYx0pRNS2rYLpxoMzdq9dKjZL6NkoBVYzXp7yGa2WtLEsYm0xC 6jGUVmUt0agBPF6WD79kcXUKmDR8L3SxwKnvMa3f2cklA8SN/DdNOy5C0sIVRvfW0zpC hQZMqP7npOekzjE6C2MziI7G8vF0Zv5zmWMUe6K7zMDfR8N/pjbWjkcWEl0PcX0BcSar zcnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=6qDMOLWgWfCZR+6HLA+1KBnQYln9LrfklhmxozHAFZM=; b=nujHaYGsT0j0YPPnxBISrKqpN0mUkXkYVATNw+SJrzVupAJ0Jgfiyqj6vioAXLtLnp Hxa7gMVu8FUdlEQC3WJy+kh2fhgXXKH4x8I7HegdKDJSs1clW41dy6o24KdCnfFK/JNB XW9Cq9e1M8OKPWfljCQXb3ENvx5gN0x2d5x6ur/NekbAAtXqFlIA7Qxmrxm53S40ibIf mhs2MX9dhwnF1QhmVUFAC0AZ9Z/wJeDKG5X6gOyO+OBySu910PwGevIoYEQOaBme3Gik 51cNylU6TfdwsTax4jNbNAXFXD0YsWTBrZX8/WYkAFKTa1xj4wdfEDp075tHWmQ3ebwP S4Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O1Dry9Em; 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 o11si14322005ybu.681.2022.01.03.09.39.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 09:39:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O1Dry9Em; 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]:32784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4RIq-0005kn-0y for patch@linaro.org; Mon, 03 Jan 2022 12:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4RDD-0004gf-UE for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:36 -0500 Received: from [2607:f8b0:4864:20::1029] (port=41827 helo=mail-pj1-x1029.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4RD8-00088r-1L for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:35 -0500 Received: by mail-pj1-x1029.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so456323pjp.0 for ; Mon, 03 Jan 2022 09:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6qDMOLWgWfCZR+6HLA+1KBnQYln9LrfklhmxozHAFZM=; b=O1Dry9EmAjKFh9HmB6f89wLFrVUJ3F4VITWSofLq3780kQDPNVA6zsFP8NyEznHh1L YKw9bB+t4oC9zQb3miRB2DNdwCzdbTldP/m5+LJe3KhrAXpjQnpCAMzW3jUAx6+4njwD BdTBaKwSq9JHE5rSwPna78ddJUkJmNg0FV16PhUfiL139mF/ZONA5++jBNKZZ7je163y Id2VHTuHQF3lmvBCyqqNSU1ghkS0bPt8qC8r2rhhSllrwyWQLKbfn4DlUWaKM+EYdP84 0rd//vhR0Ite15JG5Fogs9RWjTJVnTZSXzXWICR9ZGEgeJhbeiO/eICeGZC5hM51m4rD i74w== 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=6qDMOLWgWfCZR+6HLA+1KBnQYln9LrfklhmxozHAFZM=; b=fvwIJMx6W+PW2AAQikEr71brP2DYb89w16Vgi9NBoRMDDuPlM71maEKiPk7o29xaiQ zghqjCGlvLPIlG0tnjkNen10ehiKm1qhJ6CHo8ijGKGWPcfECHu9oxwu/HYeetAqESBW JTOxSu3H4saNVFm8YPRqepLDmnI0EC4zRFxrbzjy5wN88Vq/f2FBn87qnIU3NjePsc0E 1HN12lafjBAULOfcQLcSPC0up0GI1bPcT3lYxoNyLOjLlPpsvlyXlrcHWRSb95BcVKR6 2HM/4qSbhGAMJ4I0SEcVY61L5wUrohqM0F2tPT8Lv46lykNIwUMf0q5MFHxCWwltEvdz yqQA== X-Gm-Message-State: AOAM533eP5U37CewQmWNGG+eAPLG1VPYdG7P1iibebHzfe7ilqr7GyT5 PXCj13d6M3ae3Mohf+Nx8npHk63CMbBv9A== X-Received: by 2002:a17:902:b718:b0:143:72b7:409e with SMTP id d24-20020a170902b71800b0014372b7409emr46423130pls.28.1641231208390; Mon, 03 Jan 2022 09:33:28 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm39348564pfk.171.2022.01.03.09.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 09:33:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/5] tests/tcg: Use $cpu in configure.sh Date: Mon, 3 Jan 2022 09:33:23 -0800 Message-Id: <20220103173326.257152-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220103173326.257152-1-richard.henderson@linaro.org> References: <20220103173326.257152-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1029 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use $cpu instead of $ARCH, which has been removed from the top-level configure. Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Fixes: 823eb013452e ("configure, meson: move ARCH to meson.build") Signed-off-by: Richard Henderson --- configure | 2 +- tests/tcg/configure.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index eb977e5b6f..030728d11e 100755 --- a/configure +++ b/configure @@ -3821,7 +3821,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path use_containers ARCH +export target_list source_path use_containers cpu $source_path/tests/tcg/configure.sh) # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 9ef913df5b..8eb4287c84 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -326,7 +326,7 @@ for target in $target_list; do elif test $got_cross_cc = no && test "$container" != no && \ test -n "$container_image"; then for host in $container_hosts; do - if test "$host" = "$ARCH"; then + if test "$host" = "$cpu"; then echo "DOCKER_IMAGE=$container_image" >> $config_target_mak echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \ $config_target_mak From patchwork Mon Jan 3 17:33:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529634 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1012790imf; Mon, 3 Jan 2022 09:34:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFYJzm/MPJcEFt/uuroNu5lY/aj/NimJA7UZF3Wxs3AMyh9VjmRRu8DLDUvIRV5b6fHbSy X-Received: by 2002:a5b:14a:: with SMTP id c10mr57808228ybp.586.1641231271500; Mon, 03 Jan 2022 09:34:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641231271; cv=none; d=google.com; s=arc-20160816; b=LZptXeh6Z/R3jz+tF+pQg3tcThp8AjD+8Cn8fX4l/Y7h6ABW3wZ6VPQFkyKcD/3VS5 AsenV8Sy2+06bINKvURwI+6dqgAYFLFch/7DmlQNHTnq0ZNvdrNKFIap1NFjtdGgr4HV M8oYvyRcSWLLzKGjkGPwIXfamBsuHhhOqz0Rm+RiSAcXAFzgQ/yzocObv9FT/XNRzImP T0XM/TuLZFDyzRudy6AL45OYq5hRK9xyehhsTHHI7Itxcv7LJJKHob8d2mBwKK0CWMy2 kyHvAQZUfxoea1vcg1qJBVV9pb9N5nnX4Lp5Y6ZgmykI6QlBPac1cRfrr6kf1UZbol28 35Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=PYKClXpJtU0sbwcLNNlE4HcrlQsUkribNTZlWe3q2PU=; b=ebr4vl0g2efOddaAZI68Kcyzkaa+vyAmA03YqNCxqUvZrz+2w5jwNg5MpIa/ah4CxB xiVBlbGliufyUjq0r8HUEQ9mZJCdNixu/JCW5WjMQ469UQpVF3LXzIfRDJeCkUpNSRhd kJzExjesK4odcTDGhfCsCBb2VSfb8EXLD+sB7fPGmqa8vL0S9NWVMrBoItNsuYkdWlkY sHvFwBXg1lmldxPgX2v1zSAM0VNL/HJpLKSCBGkUy9abxlTAvo0Og3N0DiHs9waT2S3m xIJH6TPxGTl+3D3WuZNr/AY+KZVcpZNwDZhs9Pc+uTkF75BrP1fuEtsh+fcYQt6pKh6S nRlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d8N8L1K0; 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 x67si26275159ybx.99.2022.01.03.09.34.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 09:34:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d8N8L1K0; 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]:45032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4RE7-0004dh-05 for patch@linaro.org; Mon, 03 Jan 2022 12:34:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4RDA-0004bL-OR for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:32 -0500 Received: from [2607:f8b0:4864:20::630] (port=42563 helo=mail-pl1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4RD8-00088z-AP for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:32 -0500 Received: by mail-pl1-x630.google.com with SMTP id u16so25299836plg.9 for ; Mon, 03 Jan 2022 09:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PYKClXpJtU0sbwcLNNlE4HcrlQsUkribNTZlWe3q2PU=; b=d8N8L1K0aYrkfoQLM0BPBgIrjv5Z0FfBG7uqf1xEuqrYimGr0RW6ktXpI+z5hrbB8Z +pivI5t2VPtGmSKCc4W7rD6od5HowcKBEeP38wUBznQEkmzYr19TV4rUGBood4LLAB/v hW7Akp1e8vKhZmszS0wk1sSvHbQqy77kbHO3dGcB1knUQKq1I8De2k+6jbD1ugrvEFPb YbHWznRJGSZbJl+dgCahf/ftQtpztFVSmomU9bEPsgqDafaqk7Z1venJJZLkbJFVHS/a Zo7QaReVsjcKrLMn83Mgp0PQ5qAWeRcu2hi/g7EOOiL+iUuED5WJD5O4o9NaVU3+VQS7 FByw== 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=PYKClXpJtU0sbwcLNNlE4HcrlQsUkribNTZlWe3q2PU=; b=C1wphrfI9CMLusG23Qr2HRgcHCC2zJcqdLZnRbPTzUs9BhsJ9xiNFxUSiBBPuR+5KY Ml/+BcQRPCHcngSmgsRLE3yzbUyvmvtfuBDP7/bl4JgkSQbuLGnFZ/erAZ8kWVKuT2OD W2Ba/lMu+kDw/ruKuAG8Xvjf13syT8S/WDUBDA102B66IbhfzjitpRloRvrkZCzh/4d4 FxHbaku2ZqkXQ1X7nV7RjZyOt89pZu/pYfB77ehQQu7w0Pd27+ljNsJgnkI1gDe4gdQE 1kYXYydgSnZc1bvOhqUluAe8H6TQm1DUMDsaQinBAlwxvaSK94maNuhCkqCmp9OvuSQe jcZg== X-Gm-Message-State: AOAM533ZWAa8F86twFQ4iNpdNZffcYeD0EEo2hpf3GEjU7zkag2F+N9l sy4VhXhFYLeVfG0gdgeERxutTxKMbQ7NOQ== X-Received: by 2002:a17:902:9343:b0:148:a2e8:2c49 with SMTP id g3-20020a170902934300b00148a2e82c49mr46090317plp.152.1641231209081; Mon, 03 Jan 2022 09:33:29 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm39348564pfk.171.2022.01.03.09.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 09:33:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 3/5] tests/tcg: Unconditionally use 90 second timeout Date: Mon, 3 Jan 2022 09:33:24 -0800 Message-Id: <20220103173326.257152-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220103173326.257152-1-richard.henderson@linaro.org> References: <20220103173326.257152-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::630 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The cross-i386-tci test has timeouts because we're no longer applying the timeout that we desired. Hack around it. Reviewed-by: Philippe Mathieu-Daudé Fixes: 23a77b2d18b8 ("build-system: clean up TCG/TCI configury") Signed-off-by: Richard Henderson --- tests/tcg/Makefile.target | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 63cf1b2573..0f8645f782 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -82,13 +82,12 @@ QEMU_OPTS= # If TCG debugging, or TCI is enabled things are a lot slower -ifneq ($(CONFIG_TCG_INTERPRETER),) +# ??? Makefile no longer has any indication that TCI is enabled, +# but for the record: +# 15s original default +# 60s with --enable-debug +# 90s with --enable-tcg-interpreter TIMEOUT=90 -else ifneq ($(CONFIG_DEBUG_TCG),) -TIMEOUT=60 -else -TIMEOUT=15 -endif ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch first and @@ -144,7 +143,6 @@ PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) $(foreach p,$(PLUGINS), \ $(foreach t,$(TESTS),\ $(eval run-plugin-$(t)-with-$(p): $t $p) \ - $(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \ $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) endif From patchwork Mon Jan 3 17:33:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529637 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1014677imf; Mon, 3 Jan 2022 09:37:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzaNaiDESvLXK69SCz516Krw/OH1Pe/yuFYtiWvF+0sfvYlEf2XPym1pf/8GTX5+IwSw0xD X-Received: by 2002:a25:3405:: with SMTP id b5mr7485270yba.758.1641231425744; Mon, 03 Jan 2022 09:37:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641231425; cv=none; d=google.com; s=arc-20160816; b=xuM2w3HmqsY5tKiOkHetkm0V8i8HwDovvGKlbsgY5nLkMAX0yYI0g4cTWWLgmaV+F2 aUB+cYmWK4dydtCI+w0taJUthErieLQvOAhbD8sebq9OD/mNAwuY89HSCTAWnKOfgayt JWyf36kb2cEo6zLzzzL9uzQwrMJ5hOHm0wD/ykmJpe1WUHabufPafTzKCOz1DOXtOzjo hoth8etOH86ERL7Pi7gM09XzcfHXPQfkoGorg5aO0rQhLCfH+LRTR7JNn9Iwtmk4UUv2 hVp7vR6YGu7D2+NxmS/fsiwrtZUyLJVkJOpH09ZsVotcaFeu1ix71k7jn2iQOoL941S/ 0loQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=V/XmR5r7vnfDEx+x3RwUHAJeWLeuzJf+sIncQbFpqFc=; b=vMhVFbNudMZWispj75rTPYHc+m4UV68LlV6dwvS1Dv1I1nxT8GRo2RHeyrEd1W9FRa Aj5FAYeNLr5/MDaSqIPfAUMOSkDrVxAKd9MItzn2wugemcw8DLMtzglmjWqh+k8HAMJi Pm/zjdYSwnFLX7EDMXcl/Bcj/MHZK8JqUEd1uqoORgreqHSGafZ5lj4tw3HkGb/cIIno IeqdEvBG0QQizpApOYhXnTAJGw8UR1lseH3Gy4XtaWmGMrFzgD3u1Cz2ozP0wjj9YCI4 POsh1AdrwSBEzBHEWK6Ao00BDY4f62i+K26QdaK77ZXjnREUyfbVAvfR4o4HHwRA6s3x 4AGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AHOwLVXm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p74si3032937yba.489.2022.01.03.09.37.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 09:37:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AHOwLVXm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4RGb-0000pD-7i for patch@linaro.org; Mon, 03 Jan 2022 12:37:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4RDC-0004dc-CR for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:34 -0500 Received: from [2607:f8b0:4864:20::1034] (port=45712 helo=mail-pj1-x1034.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4RD8-000896-Vk for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:33 -0500 Received: by mail-pj1-x1034.google.com with SMTP id l16-20020a17090a409000b001b2e9628c9cso416070pjg.4 for ; Mon, 03 Jan 2022 09:33:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V/XmR5r7vnfDEx+x3RwUHAJeWLeuzJf+sIncQbFpqFc=; b=AHOwLVXmIL0uKlnSjw5bRtkN4iYdnLoU3Ibs0TO8B+EeCLGhbOSsIe7hu1iBQTljBC w4fn/Ybtclpjwkamku8Bx47piEv817gOUfh9QiIqbAnRdKW6iQL2d46kXeH6LxiOZ7Xe qkqhK/8mpZucsgykVA3XpwUjByNKuZ5KoHHIUa8nC6xaqMrx9oKkSKqklBSrtXs6y752 xDNzBYV+dikmfh1QCv7UzisyDfrMl7E1EXYcJIJRn/1q8Mx+/VPrCMS9iKh2RIBG0P3V p8zQCNDi34Rh2201SOJiRs68k/SuVqIydno4ad4kcQKJe820JvMOF5/a45d/3LWyKuJx Vrig== 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=V/XmR5r7vnfDEx+x3RwUHAJeWLeuzJf+sIncQbFpqFc=; b=eL3+jdqJojiwvZZCx43uaYOrho/jy43DYm7N6Qpr2qBSZWZkv3beF/gzOvursJdXye GtKIjh9IiIKWGdDoXHBCI+C5e0zTOHSRzKQDfJSqM9eOAR+cgognRazpxzkVmrpaTyBI o4N1IR6B7HGrUc08hoJo4mKcKqaX/eCrT4dXseSGDA6wigfG8cyVCzUq7MlnQ0kug9MB 3+a/PyIdgMraUHLDywrP3aW3u06rW1sofHb53M76R1JVZfrYsLw2zF8hTCaPPzsFyffl m0S57xBJxBTHD91QuswH0tL0UNkdm2v6ju3f3vAIHVvnn7GJHbzqiaBcrfIlEXX2+1RG V04w== X-Gm-Message-State: AOAM5313Wo8RKD/DJlP/qKT6NSiFH1p7KlzuYZ11jIrVf0u7NBakmqUv kxJ0b8Ck8w5rXC3SPJvc8l+cYhGznYIcXA== X-Received: by 2002:a17:902:aa43:b0:142:6919:73da with SMTP id c3-20020a170902aa4300b00142691973damr46302920plr.39.1641231209741; Mon, 03 Jan 2022 09:33:29 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm39348564pfk.171.2022.01.03.09.33.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 09:33:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 4/5] target/hppa: Fix atomic_store_3 for STBY Date: Mon, 3 Jan 2022 09:33:25 -0800 Message-Id: <20220103173326.257152-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220103173326.257152-1-richard.henderson@linaro.org> References: <20220103173326.257152-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1034 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Helge Deller , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The parallel version of STBY did not take host endianness into account, and also computed the incorrect address for STBY_E. Bswap twice to handle the merge and store. Compute mask inside the function rather than as a parameter. Force align the address, rather than subtracting one. Generalize the function to system mode by using probe_access(). Cc: qemu-stable@nongnu.org Tested-by: Helge Deller Reported-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/op_helper.c | 27 ++++++----- tests/tcg/hppa/stby.c | 87 ++++++++++++++++++++++++++++++++++ tests/tcg/hppa/Makefile.target | 5 ++ 3 files changed, 107 insertions(+), 12 deletions(-) create mode 100644 tests/tcg/hppa/stby.c diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 96d9391c39..1b86557d5d 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -57,26 +57,29 @@ void HELPER(tcond)(CPUHPPAState *env, target_ureg cond) } } -static void atomic_store_3(CPUHPPAState *env, target_ulong addr, uint32_t val, - uint32_t mask, uintptr_t ra) +static void atomic_store_3(CPUHPPAState *env, target_ulong addr, + uint32_t val, uintptr_t ra) { -#ifdef CONFIG_USER_ONLY - uint32_t old, new, cmp; + int mmu_idx = cpu_mmu_index(env, 0); + uint32_t old, new, cmp, mask, *haddr; + void *vaddr; + + vaddr = probe_access(env, addr, 3, MMU_DATA_STORE, mmu_idx, ra); + if (vaddr == NULL) { + cpu_loop_exit_atomic(env_cpu(env), ra); + } + haddr = (uint32_t *)((uintptr_t)vaddr & -4); + mask = addr & 1 ? 0x00ffffffu : 0xffffff00u; - uint32_t *haddr = g2h(env_cpu(env), addr - 1); old = *haddr; while (1) { - new = (old & ~mask) | (val & mask); + new = be32_to_cpu((cpu_to_be32(old) & ~mask) | (val & mask)); cmp = qatomic_cmpxchg(haddr, old, new); if (cmp == old) { return; } old = cmp; } -#else - /* FIXME -- we can do better. */ - cpu_loop_exit_atomic(env_cpu(env), ra); -#endif } static void do_stby_b(CPUHPPAState *env, target_ulong addr, target_ureg val, @@ -92,7 +95,7 @@ static void do_stby_b(CPUHPPAState *env, target_ulong addr, target_ureg val, case 1: /* The 3 byte store must appear atomic. */ if (parallel) { - atomic_store_3(env, addr, val, 0x00ffffffu, ra); + atomic_store_3(env, addr, val, ra); } else { cpu_stb_data_ra(env, addr, val >> 16, ra); cpu_stw_data_ra(env, addr + 1, val, ra); @@ -122,7 +125,7 @@ static void do_stby_e(CPUHPPAState *env, target_ulong addr, target_ureg val, case 3: /* The 3 byte store must appear atomic. */ if (parallel) { - atomic_store_3(env, addr - 3, val, 0xffffff00u, ra); + atomic_store_3(env, addr - 3, val, ra); } else { cpu_stw_data_ra(env, addr - 3, val >> 16, ra); cpu_stb_data_ra(env, addr - 1, val >> 8, ra); diff --git a/tests/tcg/hppa/stby.c b/tests/tcg/hppa/stby.c new file mode 100644 index 0000000000..36bd5f723c --- /dev/null +++ b/tests/tcg/hppa/stby.c @@ -0,0 +1,87 @@ +/* Test STBY */ + +#include +#include +#include +#include + + +struct S { + unsigned a; + unsigned b; + unsigned c; +}; + +static void check(const struct S *s, unsigned e, + const char *which, const char *insn, int ofs) +{ + int err = 0; + + if (s->a != 0) { + fprintf(stderr, "%s %s %d: garbage before word 0x%08x\n", + which, insn, ofs, s->a); + err = 1; + } + if (s->c != 0) { + fprintf(stderr, "%s %s %d: garbage after word 0x%08x\n", + which, insn, ofs, s->c); + err = 1; + } + if (s->b != e) { + fprintf(stderr, "%s %s %d: 0x%08x != 0x%08x\n", + which, insn, ofs, s->b, e); + err = 1; + } + + if (err) { + exit(1); + } +} + +#define TEST(INSN, OFS, E) \ + do { \ + s.b = 0; \ + asm volatile(INSN " %1, " #OFS "(%0)" \ + : : "r"(&s.b), "r" (0x11223344) : "memory"); \ + check(&s, E, which, INSN, OFS); \ + } while (0) + +static void test(const char *which) +{ + struct S s = { }; + + TEST("stby,b", 0, 0x11223344); + TEST("stby,b", 1, 0x00223344); + TEST("stby,b", 2, 0x00003344); + TEST("stby,b", 3, 0x00000044); + + TEST("stby,e", 0, 0x00000000); + TEST("stby,e", 1, 0x11000000); + TEST("stby,e", 2, 0x11220000); + TEST("stby,e", 3, 0x11223300); +} + +static void *child(void *x) +{ + return NULL; +} + +int main() +{ + int err; + pthread_t thr; + + /* Run test in serial mode */ + test("serial"); + + /* Create a dummy thread to start parallel mode. */ + err = pthread_create(&thr, NULL, child, NULL); + if (err != 0) { + fprintf(stderr, "pthread_create: %s\n", strerror(err)); + return 2; + } + + /* Run test in parallel mode */ + test("parallel"); + return 0; +} diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target index d0d5e0e257..b78e6b4849 100644 --- a/tests/tcg/hppa/Makefile.target +++ b/tests/tcg/hppa/Makefile.target @@ -12,3 +12,8 @@ run-signals: signals $(call skip-test, $<, "BROKEN awaiting vdso support") run-plugin-signals-with-%: $(call skip-test, $<, "BROKEN awaiting vdso support") + +VPATH += $(SRC_PATH)/tests/tcg/hppa +TESTS += stby + +stby: CFLAGS += -pthread From patchwork Mon Jan 3 17:33:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529636 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1014656imf; Mon, 3 Jan 2022 09:37:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiVguPODrRSD4ueoXKNNGzK+tcj/x8HHmMr2lVqDe9MzfjAnja64VIx9B5EUogpHqoJc1s X-Received: by 2002:a25:9b02:: with SMTP id y2mr22043175ybn.210.1641231424057; Mon, 03 Jan 2022 09:37:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641231424; cv=none; d=google.com; s=arc-20160816; b=a2eY5T7vlDm9qbeLKzDLFeuVUXMWuw8OFm3+STS9Gh1JF3W9BQgoRtE9IGlQ9MOn13 QkPkGsEGu5Ht5+69R9THfiJCU33eRpuIEujLxpP1pQ1qDCilhFvBy6wqrwQbqNotbXZa O/Zunhwra50wNStRgwTUiSCuxxs1Ea97u2m7kWWIlMAbOebcGI+7J3GSczQ6MBrFtEL5 488Qguk8ZXNhkBuKopJibF1PGoJcSH8nlcyrr5/xHYF5dymVf9ldRs5pt5obd2+zL58X FjdZ+Ys3cOvEAgDOjlkLtAgMHHJZJNVlqUoUIvV+iAnKqsjnzUiZL11xHhgyUZJPxzNB E7bg== 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:to:from :dkim-signature; bh=l8/JTxqLKUGwdAqbnIsmpEc7Ppe6Hvg01DjhP7L3th8=; b=oQuwHRhNtViHWfuiqx3EicaCpC/J74vqpGN6VkfOxBmM3IYtPyzaJ6te3LLUdWFpsS WzTsmL4n92fRhvAGv3eeNlGGfV4UDNmSoPo80IoUagsyuvD9Y3ya889ubLOIF9YMBhGk 0AG9SBKcp8/3SvE9K6Zpz4maKuka2WGM2/q6Y3FqcbyFQlQsXnYeIbBI+WKwry6RQr0k hmDDzctkOLxqRSMsKck9hhxy5T5jNqUYEwbDnKTz0DTQdQ7Mmqmc8S9eHqNFqpPdHsS6 hAVVdFVP6OTs1vE5M5CtSxeislYUwdYc8qbAVl47iTnsr7kYjXZ5GtHnA1Mktgl2cJTx xZHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MmUvEQVY; 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 s14si1378180ybu.167.2022.01.03.09.37.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 09:37:04 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MmUvEQVY; 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]:51960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4RGZ-0000kw-IM for patch@linaro.org; Mon, 03 Jan 2022 12:37:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4RDD-0004dl-A3 for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:35 -0500 Received: from [2607:f8b0:4864:20::630] (port=36855 helo=mail-pl1-x630.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4RD9-00089A-Iq for qemu-devel@nongnu.org; Mon, 03 Jan 2022 12:33:33 -0500 Received: by mail-pl1-x630.google.com with SMTP id p14so25320885plf.3 for ; Mon, 03 Jan 2022 09:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=l8/JTxqLKUGwdAqbnIsmpEc7Ppe6Hvg01DjhP7L3th8=; b=MmUvEQVY+x5Ujwq0IWn8pWprXa9vHylI6BGIbe6JxC7W5PeKbqgaF/oXaAo+e6RbEX upSox5KLTgnRIS2R0d4Pd/zY/G7MV/41MCGSqM5DfdgDWZa+JOTp5lP2XnxSY+emkFt0 c8bYjXWwtTaiMfrVp2GKlNXJZx0Ja+38oCg53Ast08NTl32FrsjY96QtuUhD4tn9MOvj YdyzBb5/ucdy9k3RBFfJINwim6ctQiukJv1p7MFbdqmp+xlAnXmpuZRtV8CtcXAJrYX9 ADiapVX1hXti6gq7UtKSaCSk88+zv/Rg2PPUrsHYC6L4lmznm1lySk2E4Ap3JwtxSvha N28Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l8/JTxqLKUGwdAqbnIsmpEc7Ppe6Hvg01DjhP7L3th8=; b=ekLhY9D7is2wTr8uZlUQHPTCe5n1OY7HxfAljXOZP4jRD2acPDlWesHFMwTsOSIBru Gn9y8LIklUO+xRkSzkVoHzvfNgw+CWrZRSDUhOZbsViqae633dW9+iDsHNf8dMbOQGMG yNDeHR2/z0K1eIU5IgPs9IRygugREj3sUwISUHSnfELnsDCnjH3XnlsIH3ztTIF10jGz 9cLos5KFRMIfQjJy8s0Ehk8OXkIFTdb+EPYogxMnBY0ilUx0VYjxmCAdBiXq57Lz86cW Lk+g6BQlaoOBGx4idI3dUVrWAntdUKyspU9XFbON6aMZrRVGWvuLNqYVeZD8YlilO98C w1uA== X-Gm-Message-State: AOAM5333ARpOdPAQiVgnGzsDhj6Zux6boIJVFmmfGnefl9XRLZb7ohOM zTC0wjsXA0A807HR1WvoLfmMVShviqhi/Q== X-Received: by 2002:a17:902:ea04:b0:148:ccbf:f2cc with SMTP id s4-20020a170902ea0400b00148ccbff2ccmr47352533plg.134.1641231210390; Mon, 03 Jan 2022 09:33:30 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id s14sm39348564pfk.171.2022.01.03.09.33.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 09:33:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 5/5] gitlab: Disable check-python-tox Date: Mon, 3 Jan 2022 09:33:26 -0800 Message-Id: <20220103173326.257152-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220103173326.257152-1-richard.henderson@linaro.org> References: <20220103173326.257152-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::630 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" Set this test to be manually run, until failures can be fixed. Signed-off-by: Richard Henderson --- .gitlab-ci.d/static_checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 902843f8b3..5e955540d3 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -46,4 +46,6 @@ check-python-tox: QEMU_TOX_EXTRA_ARGS: --skip-missing-interpreters=false needs: job: python-container + rules: + - when: manual allow_failure: true