From patchwork Sun Jan 28 17:48:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 767243 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp559393wro; Sun, 28 Jan 2024 09:55:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFnEiUiS5j1XC7FoeAvms3aB21uWP6EVnkti+uZUupc1Mtm8QY3AbC+fGlBgiDRA9l0wxRC X-Received: by 2002:a05:620a:22e:b0:783:dc4b:57d9 with SMTP id u14-20020a05620a022e00b00783dc4b57d9mr3852644qkm.18.1706464505746; Sun, 28 Jan 2024 09:55:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706464505; cv=none; d=google.com; s=arc-20160816; b=FZ6dLWhdqAf+6AadFiSKQmHsSRLlaHYI+chZ8vfEE66unoLXe/3rmQN+INorM4h0Os i9CtfRqqR2CvLD1eCeyeLYQUIj2j16sZ+B9+0p3qbmjgXDGGf++SYtPLtF0CORfKd0+1 ejAxlLvjT2sY4BUSNtLaWU9BL1oueBDIZb9rWs2/YspGvE1vkcAowx/iJ1Cag06prSlz FvRyLn2MHFHFiZyvr3lCY5NZ4YcrziL81MKxHHZeqAqQPuTFmc+ULo/rMlAhYnoQbQ1X VCDBjloJWNm6BcuIxdiYWxYF9OuyAmyjvpSlFkPSNnsRr2BPdL/e1hiqn+ltUgJbAkKB KdAA== 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; bh=eCTS4PH6AkRKunGpcyJL7wmYzasC2Mg1ZzUpYU9cZhI=; fh=1XiLD5f78faZJlkwpWWCXgPag3QjEy/bcGCMurGEfbo=; b=S9nGCsMy4kcD3zAPzbmAziG4y7Y6gz+KByKiBz6ei1Ei92UsI2HrZYwbBZ/PB5jf/D GUxnivshgBRRl+tAnw1sOL21Gx9lsdBD2XE4zjBnbWoqT5ki8P82alRy2jc1kCmmNgQE hG7KkHM5L0YKeCtIlvnd979aqVIOXzoNXPfS8l746feSd0dBCJGYei9g53Uvftv3jUcw yJIxW911pIUQdkYtii/6Rk+cAOZx1YnS0jtxwLpAXI9+UEu93ChCMmdKu9xZQ4RMh/4T Cjl6OdQDoP0dQBP1faSwpN7em9KqVjM7YzykEKwvs/O6gakl+2VgeFb4WA+9GEcAtn/B 66UQ== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bq33-20020a05620a46a100b00783fce71374si770831qkb.443.2024.01.28.09.55.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2024 09:55: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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU9Hf-0007Fk-DU; Sun, 28 Jan 2024 12:49:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rU9H0-0006O6-Iz; Sun, 28 Jan 2024 12:48:51 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rU9Gy-0000Nh-Os; Sun, 28 Jan 2024 12:48:50 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 395E9480E8; Sun, 28 Jan 2024 20:49:38 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id DCD016D50F; Sun, 28 Jan 2024 20:48:46 +0300 (MSK) Received: (nullmailer pid 811696 invoked by uid 1000); Sun, 28 Jan 2024 17:48:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev Subject: [Stable-8.1.5 25/36] readthodocs: fully specify a build environment Date: Sun, 28 Jan 2024 20:48:30 +0300 Message-Id: <20240128174845.811654-1-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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-bounces+patch=linaro.org@nongnu.org From: Alex Bennée This is now expected by rtd so I've expanded using their example as 22.04 is one of our supported platforms. I tried to work out if there was an easy way to re-generate a requirements.txt from our pythondeps.toml but in the end went for the easier solution. Cc: Signed-off-by: Alex Bennée Message-Id: <20231221174200.2693694-1-alex.bennee@linaro.org> (cherry picked from commit b16a45bc5e0e329a16af8a2e020a6e7044f9afa2) Signed-off-by: Michael Tokarev diff --git a/.readthedocs.yml b/.readthedocs.yml index 7fb7b8dd61..0b262469ce 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,16 +5,21 @@ # Required version: 2 +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + # Build documentation in the docs/ directory with Sphinx sphinx: configuration: docs/conf.py +# We recommend specifying your dependencies to enable reproducible builds: +# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/requirements.txt + # We want all the document formats formats: all - -# For consistency, we require that QEMU's Sphinx extensions -# run with at least the same minimum version of Python that -# we require for other Python in our codebase (our conf.py -# enforces this, and some code needs it.) -python: - version: 3.6 diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000000..691e5218ec --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +sphinx==5.3.0 +sphinx_rtd_theme==1.1.1 From patchwork Sun Jan 28 17:48:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 767244 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp559574wro; Sun, 28 Jan 2024 09:55:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZU2QmEaZ/UPlZ9eJ5Hv9cSUSp7QTX2eSBbVpwinM2m8nHFjG/Pxniu7XgpjBsERF3V2oj X-Received: by 2002:a05:620a:2481:b0:783:f223:b68 with SMTP id i1-20020a05620a248100b00783f2230b68mr3593272qkn.153.1706464544281; Sun, 28 Jan 2024 09:55:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706464544; cv=none; d=google.com; s=arc-20160816; b=CgNLwyoztI7bG2lCALQd+nf3KE2ErnmsUFI5zEKKo6XJkVFi7IHmIBoHpo2yeTgphq HtOqApHJMAAyU7xBmw8aj1AJ1p8pLKEt50HvPKXUmtHTEM3TUNe5/rvPzL9RXoU1f/1T DxAmLIc8zZndon2TnRlMXT+kvWq1f7S8RILpYrT9ehlHQkrwhRtBqu278plrgP6E7Tiq xzcVWi17reMIbotTRwHH62N6WHpbghlAMbNvjER6Kb89Wrjs6QuGyUn53aHAFq9xtERg KcOwlr0C8AOimgQBOTotb6IJSwC5afoO9nYOqKNMibs0M7tud+HB36687rSWrU/pnhnl oN/g== 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; bh=A5/44LXWbv1EOTs07gxnCR6ryBglwLjAa90e85A2Ezo=; fh=xJ1URYKcMN3TM0/XAv5v+aCN+5tIbzAdcfBx5UNgoLw=; b=bimWms02kz3A7XKEFAVt1Ahx3WpvJYKDpHC4ku67DhoWRTeTJrd/B5qwGMGLsdMDZw RKnCuHbuNmStb8RAH6A/h0JiLFNMQgvtFWuxQUmwAPMZ9bGgj9rFZjSYrGG5oBbALIfV fJ/2ZtMjV5CbV4+dRLunAq4fUWHSFGOSMeaHblKPptU7+q9L03g02FykxvobRP5sfOfV OADcmrkiMtPlfjTBOIo7uPU/8+BMlkGaZbW3sro5gSyHhyedveohXmnGFGGK2BFPlBoC GbnfAPyK3B0MEwXIYZ8jspBnWkMCazxNM9Xfiaoflsx3Z/llNq8rYZsTV3rRz14+eCmL JSAA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay17-20020a05620a179100b00783e46aec27si3832054qkb.598.2024.01.28.09.55.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2024 09:55:44 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rU9It-0002Rx-S3; Sun, 28 Jan 2024 12:50:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rU9I5-0001s5-MD; Sun, 28 Jan 2024 12:50:07 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rU9I3-0000Uc-Ty; Sun, 28 Jan 2024 12:49:57 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7FB7D480F3; Sun, 28 Jan 2024 20:49:46 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 140E26D51A; Sun, 28 Jan 2024 20:48:55 +0300 (MSK) Received: (nullmailer pid 811729 invoked by uid 1000); Sun, 28 Jan 2024 17:48:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-8.1.5 36/36] target/arm: Fix A64 scalar SQSHRN and SQRSHRN Date: Sun, 28 Jan 2024 20:48:41 +0300 Message-Id: <20240128174845.811654-12-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In commit 1b7bc9b5c8bf374dd we changed handle_vec_simd_sqshrn() so that instead of starting with a 0 value and depositing in each new element from the narrowing operation, it instead started with the raw result of the narrowing operation of the first element. This is fine in the vector case, because the deposit operations for the second and subsequent elements will always overwrite any higher bits that might have been in the first element's result value in tcg_rd. However in the scalar case we only go through this loop once. The effect is that for a signed narrowing operation, if the result is negative then we will now return a value where the bits above the first element are incorrectly 1 (because the narrowfn returns a sign-extended result, not one that is truncated to the element size). Fix this by using an extract operation to get exactly the correct bits of the output of the narrowfn for element 1, instead of a plain move. Cc: qemu-stable@nongnu.org Fixes: 1b7bc9b5c8bf374dd3 ("target/arm: Avoid tcg_const_ptr in handle_vec_simd_sqshrn") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2089 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20240123153416.877308-1-peter.maydell@linaro.org (cherry picked from commit 6fffc8378562c7fea6290c430b4f653f830a4c1a) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 7267f172d7..4e54cb7502 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -8116,7 +8116,7 @@ static void handle_vec_simd_sqshrn(DisasContext *s, bool is_scalar, bool is_q, narrowfn(tcg_rd_narrowed, cpu_env, tcg_rd); tcg_gen_extu_i32_i64(tcg_rd, tcg_rd_narrowed); if (i == 0) { - tcg_gen_mov_i64(tcg_final, tcg_rd); + tcg_gen_extract_i64(tcg_final, tcg_rd, 0, esize); } else { tcg_gen_deposit_i64(tcg_final, tcg_final, tcg_rd, esize * i, esize); }