From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026541; cv=none; d=zohomail.com; s=zohoarc; b=hMMj51cojO29NMPD3uj1uU3uMY+Bo6Lim1Z2X6ti8APler6qG+U1brIyfMliFAPwBmyMSZBp61GyWdncYO6ou0LpuLAmqFx6KuVFAsnt369DBrcL6Q7jrWUzbh6BhsYi7KA5/TkmQc0L4d1tDze6FCK6CeqiVDn2ZcbjsOHKi34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026541; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=czFfn3mdhb3cc0K7eXA/dlkeA2fEfLq9sRo8IDRWWf8=; b=eCWFsXhaVCiRE0CCTxOxlJAzQY9ggxPTv0ACa2NyigWFo3wI6JvrwFNwS8laQR3BwAqN4FPtTZHBEU15yZ5uIG32HVz0tB31npMSQkTYCCXfc9W7EPhMJwEacaa4+AVKw/vH0NcKnXpPEK2jeB5wTXsibI0vIlnzCgUh0Usjzoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168302654104163.857528282426756; Tue, 2 May 2023 04:22:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3d-0000cz-Lz; Tue, 02 May 2023 07:20:33 -0400 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 1pto3c-0000cK-Om for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3Z-0003D0-Gn for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f315712406so164142545e9.0 for ; Tue, 02 May 2023 04:20:28 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026425; x=1685618425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=czFfn3mdhb3cc0K7eXA/dlkeA2fEfLq9sRo8IDRWWf8=; b=IRVd2Vwb0TdoBgUwmVtAFHzAS+H/1hph9EcoWK6yXDvJYJ3XoW+q2U80NJksO9bhJd DZ6Q4EIQ9HshCyn+5c7S+rbzHu42DWPn3sKzs3PBjpAoPm6k7zOCckN/Ji1MO9ZTiwp+ nDVRjWnJVoj6sFI3BD+qGmeTIqaZRs9dYaY2EdDGhsu5bw+/iX7MLo5TDmhSmtPgXn/Z 0f4Hw1RfpO2gxrXGNWfRLlknJFzIawEsP/8L7Yjlut9sK3hcd2CzCzEtz0mZ6znedNpk jtgtBCUmluIqt9fd50XMguUH8e6z9GHY1m95SEarfAkXBCqp8xaGw6sUKPzYn3XX6a92 Dvsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026425; x=1685618425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=czFfn3mdhb3cc0K7eXA/dlkeA2fEfLq9sRo8IDRWWf8=; b=KNfDsEPkgL+JRETsEb2I0toKVVW/hNgvr1YOs8YUuiCP4MmOC9npo1oo3Cnlz/DMLD 0Drc6G87x1dCoBdHBO4ym2m8em9wCloa3vrSGJp+mV6Lie/wz0crCNtlLuje/NZ6ykmU 1aNOt7z08iJyDQRp5b7vO6C5DB488E1jupuX/IMjXRQ6mH0Xv+Wt825M5HRWmoufQZ54 VgDoAn5V9Ew17zQtrzJEvJ1oOMtmPhTEur6k54xJXc82pTWkMsSrw+j21dMX641Rgl/g GUOFPTXfY7s6kIZAMTsK7cST9uh58bY4pN4dqFlJ5AhI7a7fu2r3arUwv57unfr6LkwJ Qf7Q== X-Gm-Message-State: AC+VfDwgvs1IW0gQxPuR0nV1jdTbQN/ZcVKyItYH+8m8jgT2eGpzPPfY dvknkbkws+AceQ3fw9egZCpXWylJzRpSNRTplT+ltg== X-Google-Smtp-Source: ACHHUZ4sAROn5F4sj65B8M1QfnrLHPx5m8Oondb1ARq/4R8UV0JBmWwg10JEPYJbstC2FACkbBCR6w== X-Received: by 2002:adf:db4c:0:b0:306:31cb:25fb with SMTP id f12-20020adfdb4c000000b0030631cb25fbmr3214433wrj.17.1683026425307; Tue, 02 May 2023 04:20:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Juan Quintela Subject: [PULL 01/12] softmmu: Tidy dirtylimit_dirty_ring_full_time Date: Tue, 2 May 2023 12:20:12 +0100 Message-Id: <20230502112023.776823-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=richard.henderson@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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026542734100003 Drop inline marker: let compiler decide. Change return type to uint64_t: this matches the computation in the return statement and the local variable assignment in the caller. Rename local to dirty_ring_size_MB to fix typo. Simplify conversion to MiB via qemu_target_page_bits and right shift. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Juan Quintela Signed-off-by: Richard Henderson --- softmmu/dirtylimit.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c index 82986c1499..71bf6dc7a4 100644 --- a/softmmu/dirtylimit.c +++ b/softmmu/dirtylimit.c @@ -232,18 +232,23 @@ bool dirtylimit_vcpu_index_valid(int cpu_index) cpu_index >=3D ms->smp.max_cpus); } =20 -static inline int64_t dirtylimit_dirty_ring_full_time(uint64_t dirtyrate) +static uint64_t dirtylimit_dirty_ring_full_time(uint64_t dirtyrate) { static uint64_t max_dirtyrate; - uint32_t dirty_ring_size =3D kvm_dirty_ring_size(); - uint64_t dirty_ring_size_meory_MB =3D - dirty_ring_size * qemu_target_page_size() >> 20; + unsigned target_page_bits =3D qemu_target_page_bits(); + uint64_t dirty_ring_size_MB; + + /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ + assert(target_page_bits < 20); + + /* Convert ring size (pages) to MiB (2**20). */ + dirty_ring_size_MB =3D kvm_dirty_ring_size() >> (20 - target_page_bits= ); =20 if (max_dirtyrate < dirtyrate) { max_dirtyrate =3D dirtyrate; } =20 - return dirty_ring_size_meory_MB * 1000000 / max_dirtyrate; + return dirty_ring_size_MB * 1000000 / max_dirtyrate; } =20 static inline bool dirtylimit_done(uint64_t quota, --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026536; cv=none; d=zohomail.com; s=zohoarc; b=n6Z+KcGOUeuElqgzSJHd3etu/vbXeLsMOyGN0XWQmdpZH2h1MGGm31afNiyz00sPtMXo8yj+2m77RMXC8p/9gyix2AeA9yKRg6+LcAvmiGsF+//wEJfZAtZiYVxqmLNoKuJ5CyIh0ViyGHLJxSN6b+pcwgnNgd5ucJtDaOBBHwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026536; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=j3aWoQu1aYNV8oYZkH4XWDFrN2g2se4RRgdsH/NszU9ILHvAn6u5d7zRcnD0iugdNvqG4nEcA4ZdSPHvNYmuiJGfEaoJCVnpUR1x615/hU0aI1gp6CedX0fOYpF+/umtAQT6DpJNLXzoPJ3rhs91sCoYGn1CjNQmSFhiTy3pQeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026536617651.918096933756; Tue, 2 May 2023 04:22:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3e-0000dX-QV; Tue, 02 May 2023 07:20:34 -0400 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 1pto3d-0000cU-0w for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3a-0003DB-5e for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f199696149so22194655e9.0 for ; Tue, 02 May 2023 04:20:29 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026426; x=1685618426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=L95KvQ6rBgD+qvawWChW8rAILSp8WVgzuGzmQSyi1Uk6UCsT1LttKIuoHxklZJ+trd xGv+NRi9+5Wa16J1D9k+42+WsvkkjH1jM2/vVxo/vUaq5nPrGMqNCUnUj+jV5c1aiBDr tXzvnm5zY0Bvr4F9v5dQ81Q8uQFGZ3+KE/Rppz9/+3l8AKnBChj+fUa9MFHZpZQdUKJv jlL0I22Qxg92yAqmSeAL1fmvnK274v50nu34aIvIkpaVTGg1A+Mjq5fA1YV94bBVZdQz Ahk9bSN6IOyFNdFPa3IlBmrgFPBVMoyimrk8YX2Ex4LUBFw6IWwM0HrSYYq4c53cYHNf f8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026426; x=1685618426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lK51qYTnNnXJZN0e/9Jj4Bv1cCHWx7/0IfdphjJpI60=; b=JX8Czp9EQ3Pfa2TqC8V292zB9K1Ssx6mGdHvqnM32wSVvihZLiaCCCvlpuHcSVgLAr fuJEOy4NJq9mJtpD6wzcQaVhD0hslKj4oQP5U5v90SujzUdEuLt1i2W18cLX9zuGNuxc 886/g4vHSd080VZubsQ7XX03wY16efmAuWZZosCeTkvVu+HN5BZpmYXY4WyF8dSdVaWH FMaUbtbUQ/ZCdXcRl4DViQ4JtU8OyqYzVVwDlyN4wsmxA3HrElK1DOl4P1tPK/llWD0a b2m/dKrv2N30uqDCFX2vY9yplodeGFy/k7RB+2GXxMSOcEBnfWdihTMJhzjGhoHppc2A 8SBw== X-Gm-Message-State: AC+VfDwHbu6ECVo+J/dWFatk7eEJfNTrPpF+c5qN7Q1GZ4Bs4qiYqxm2 RF1qKhnGrhSwRVRwbYyhPGLpv4d8orW/BDX2J8H6vA== X-Google-Smtp-Source: ACHHUZ7EFNhQdLy7GGZmGoTXCdrL8gWL5tCWtZe5oKXfYLlfO5JREu6q8SDntNT23necnF0Ni0NpRA== X-Received: by 2002:a1c:7502:0:b0:3ed:af6b:7fb3 with SMTP id o2-20020a1c7502000000b003edaf6b7fb3mr11664221wmc.2.1683026426025; Tue, 02 May 2023 04:20:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Weiwei Li , Junqiang Wang , LIU Zhiwei Subject: [PULL 02/12] accel/tcg: Uncache the host address for instruction fetch when tlb size < 1 Date: Tue, 2 May 2023 12:20:13 +0100 Message-Id: <20230502112023.776823-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026538761100009 Content-Type: text/plain; charset="utf-8" From: Weiwei Li When PMP entry overlap part of the page, we'll set the tlb_size to 1, which will make the address in tlb entry set with TLB_INVALID_MASK, and the next access will again go through tlb_fill.However, this way will not work in tb_gen_code() =3D> get_page_addr_code_hostp(): the TLB host address will be cached, and the following instructions can use this host address directly which may lead to the bypass of PMP related check. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1542. Signed-off-by: Weiwei Li Signed-off-by: Junqiang Wang Reviewed-by: LIU Zhiwei Reviewed-by: Richard Henderson Message-Id: <20230422130329.23555-6-liweiwei@iscas.ac.cn> --- accel/tcg/cputlb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index e984a98dc4..efa0cb67c9 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1696,6 +1696,11 @@ tb_page_addr_t get_page_addr_code_hostp(CPUArchState= *env, target_ulong addr, if (p =3D=3D NULL) { return -1; } + + if (full->lg_page_size < TARGET_PAGE_BITS) { + return -1; + } + if (hostp) { *hostp =3D p; } --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026511; cv=none; d=zohomail.com; s=zohoarc; b=VSWvqJ3HGtXtrYtxioAQgSDnee777rR24BMjKJuFdDscaUyMR9ACxO5Jp0nXxJIhv6uxb6ztwOEFSEdYEy7Dr78g1z7AYY0hrTCOhyQRCQr9ViIoAE1IuRePtAmOv9rdHtPN0gnhuOIPYAzGQ8nOAXA+mOdUMP9YC+UuGc6oNxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026511; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LwU44caHLzwnuUU4efWp0isf3CaogQy6f09UO9nNvLc=; b=jgAUzgVmguu4XUgyZcI+AAazWom0E0afJDJWKLB+pOPi6EDyx3YzgoxvYfG/4FCyJ/ox57Kvmtk7/4Dy8qKzlyW6W17Xz0S3vB0/cnLNTQJMHzvqHrDg86hzOIc2FvlsbytJXj73yfYiZ5KIdwxZM4mDchjG19dy84E8jh7xPjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026511676457.7157309237472; Tue, 2 May 2023 04:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3e-0000dT-AT; Tue, 02 May 2023 07:20:34 -0400 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 1pto3c-0000cQ-Uy for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3a-0003Db-94 for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f1958d3a53so35981365e9.0 for ; Tue, 02 May 2023 04:20:29 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026426; x=1685618426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LwU44caHLzwnuUU4efWp0isf3CaogQy6f09UO9nNvLc=; b=g2vsofwH8NtgVeI3htnKYu44AJsoo6vEdonGNkS386QGcFuSVIBbC0ENos6QPXwC3n pdgETZiU77uoLnSvatm/jUqNe0XZI9dGC7oowi6wOgNZsrcPgfMUGnQAAFc3jctQZ2pd DISXjY34wA3wpAMTXcBiV+l3ITFnsRdVOialB+Ccpu0TcgqCV2jHkOpSQG8GixJDik6t wSl6k0LSFFdxFitutpWyvxoOjP2uRuiu01kZ+MG+jUx+QraArKogs8GlUgwcRev/laAm 9e1osmqvCgFE4YVRPOJ624OUD2yUtGWq2g4I9qCSXdgEjnWVv1cSx5N5Yw4VvuOGZTMB ioBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026426; x=1685618426; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LwU44caHLzwnuUU4efWp0isf3CaogQy6f09UO9nNvLc=; b=P1sYNuXxxYNrK8ymGo6uw7jtnLGoq407fDkYy6+dSXfo9OaUWD++QOd7ZA51Tuwg7b JvLiY6bJTayuYgsrenV0klglqZlhGN/hwJWMH/65fIMpRRw+bugzb6fFM4Yu/Y8d6ABM HsNH4a//oUvsoAM8+2BygOEPBIS/kLsJBOYGvgZeCuYicO0b75Sssse8V/1FYLzN1L/p Xyf81O0MJ1CHvTEi93HepLhyWnLifRnNlEdvyUh2sJErZ83Spkw0jVAcKP+mPeNjqgPE x7Qt2euUSCK/jQVNADfPe/uGkFceBPEScthOEnEbdOgiDYSyfkBgogbltd8VnSFNl2Td z0Iw== X-Gm-Message-State: AC+VfDzlvgXDhjRans2r9mPr8neGJxpjTjr1dGcNzF+/vPfdRiY+NKPk NW56Ym3hzKwLYIYD/dC+yP3MLba0OSo7A9uyOJ4WvA== X-Google-Smtp-Source: ACHHUZ7yquLRotG6/K7zPIWqzoZ224JMyEsxqUBdej0MpaZnyBeJbqge629rk/CbqYI3/s2cURkx3g== X-Received: by 2002:a05:600c:378e:b0:3f2:549b:3ef2 with SMTP id o14-20020a05600c378e00b003f2549b3ef2mr11501957wmr.17.1683026426622; Tue, 02 May 2023 04:20:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Dickon Hood Subject: [PULL 03/12] qemu/bitops.h: Limit rotate amounts Date: Tue, 2 May 2023 12:20:14 +0100 Message-Id: <20230502112023.776823-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026512432100001 Content-Type: text/plain; charset="utf-8" From: Dickon Hood Rotates have been fixed up to only allow for reasonable rotate amounts (ie, no rotates >7 on an 8b value etc.) This fixes a problem with riscv vector rotate instructions. Signed-off-by: Dickon Hood Reviewed-by: Richard Henderson Message-Id: <20230428144757.57530-9-lawrence.hunter@codethink.co.uk> Signed-off-by: Richard Henderson --- include/qemu/bitops.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/include/qemu/bitops.h b/include/qemu/bitops.h index 03213ce952..c443995b3b 100644 --- a/include/qemu/bitops.h +++ b/include/qemu/bitops.h @@ -218,7 +218,8 @@ static inline unsigned long find_first_zero_bit(const u= nsigned long *addr, */ static inline uint8_t rol8(uint8_t word, unsigned int shift) { - return (word << shift) | (word >> ((8 - shift) & 7)); + shift &=3D 7; + return (word << shift) | (word >> (8 - shift)); } =20 /** @@ -228,7 +229,8 @@ static inline uint8_t rol8(uint8_t word, unsigned int s= hift) */ static inline uint8_t ror8(uint8_t word, unsigned int shift) { - return (word >> shift) | (word << ((8 - shift) & 7)); + shift &=3D 7; + return (word >> shift) | (word << (8 - shift)); } =20 /** @@ -238,7 +240,8 @@ static inline uint8_t ror8(uint8_t word, unsigned int s= hift) */ static inline uint16_t rol16(uint16_t word, unsigned int shift) { - return (word << shift) | (word >> ((16 - shift) & 15)); + shift &=3D 15; + return (word << shift) | (word >> (16 - shift)); } =20 /** @@ -248,7 +251,8 @@ static inline uint16_t rol16(uint16_t word, unsigned in= t shift) */ static inline uint16_t ror16(uint16_t word, unsigned int shift) { - return (word >> shift) | (word << ((16 - shift) & 15)); + shift &=3D 15; + return (word >> shift) | (word << (16 - shift)); } =20 /** @@ -258,7 +262,8 @@ static inline uint16_t ror16(uint16_t word, unsigned in= t shift) */ static inline uint32_t rol32(uint32_t word, unsigned int shift) { - return (word << shift) | (word >> ((32 - shift) & 31)); + shift &=3D 31; + return (word << shift) | (word >> (32 - shift)); } =20 /** @@ -268,7 +273,8 @@ static inline uint32_t rol32(uint32_t word, unsigned in= t shift) */ static inline uint32_t ror32(uint32_t word, unsigned int shift) { - return (word >> shift) | (word << ((32 - shift) & 31)); + shift &=3D 31; + return (word >> shift) | (word << (32 - shift)); } =20 /** @@ -278,7 +284,8 @@ static inline uint32_t ror32(uint32_t word, unsigned in= t shift) */ static inline uint64_t rol64(uint64_t word, unsigned int shift) { - return (word << shift) | (word >> ((64 - shift) & 63)); + shift &=3D 63; + return (word << shift) | (word >> (64 - shift)); } =20 /** @@ -288,7 +295,8 @@ static inline uint64_t rol64(uint64_t word, unsigned in= t shift) */ static inline uint64_t ror64(uint64_t word, unsigned int shift) { - return (word >> shift) | (word << ((64 - shift) & 63)); + shift &=3D 63; + return (word >> shift) | (word << (64 - shift)); } =20 /** --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026482; cv=none; d=zohomail.com; s=zohoarc; b=PSxbMOl3KOHxXs2VTGG+vjpcZYRAPW794l1jBWfGAhbfMv5+78RaFUm/60o8iOmDoHd+A1feNbNT1hacxy7N4yi3szM+dBcSMJFTxeXLh9EI5VNubUGwy7nZGuoV9GVW2j5ZXuLlY004QNNnMy5dNT5K4waPxhEBryAYWCyYY9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026482; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m4s47C7gmYdUlM0SIov8ZnFiPUvDgmGeRG+O+etXAiw=; b=J99bxHxb2OccgHM1cfbxgttGvYTi8mLkXi4rdD7mJgJkFe4nFM10e6ip/ly93oVIroxU/fZihToYMupukZE3jP5eVOsRxrhVrXpoYoIKwFPGlR13RXbN+kb+2lyMkNV6ciwlB1ZP6vbvmcTrMmBNq3R8EQcWJUd5HkWlfetW+I4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026482873265.3991199990204; Tue, 2 May 2023 04:21:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3f-0000dy-EV; Tue, 02 May 2023 07:20:35 -0400 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 1pto3d-0000cW-33 for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:33 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3b-0003ET-1W for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:32 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f1cfed93e2so36138235e9.3 for ; Tue, 02 May 2023 04:20:30 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026427; x=1685618427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m4s47C7gmYdUlM0SIov8ZnFiPUvDgmGeRG+O+etXAiw=; b=Rik5Jyi8agbWTbZ2L6uXb3+C0C6XXC4PYQhOyqMNj8Kjhb0F38/xI3EgUZkJ7dUSqO YB2PEvYu/Qrayo59r01wwB70FZuVl64DBr23KZj2ASAIiErhuIbKYQgFqsMs7HnQLGOT D4jEWcnKquVVqlmzrICs/qL8ouXx/w63aq+9+mgu+gmWBvg3k67WWEVRzsvl6WJ3K7CK VklLLM+TTOboSEAvRjTPmqGdWj0Eh7XHVNgcZKQkrgpXMNLoFOX3KmMRM3FfO/zQNPo6 su7y6zJLZsY1kYh5ea/VgDOM+gO1on4Vu1DQUucmOZabAzvmgVmpk6HUhr6a982Ty7Lg ck9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026427; x=1685618427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m4s47C7gmYdUlM0SIov8ZnFiPUvDgmGeRG+O+etXAiw=; b=HNq01OMXoApIl80Q5/JKFIsaRJyBqyShOD4/l5Uth/1w0Ev9JN783RLdosIICCOz19 nghKnVXQcfwfZo7dk8TXUsaoZJ/1y1CRr7up4oaZypf5ZEeg0CJ2rH3HG0STGI0G9fLv VxtV+LNdPUxmk41AVSOW22fXAKiq8Q5p6qI9YdQdHT2UHnVEwsJBn8w41lICLLBUQNfG 8/ZLnrUGlXhdjwSNQqNr+ouCLTh3QvLlUIZoKS1n3MC9BbemZvoc6h4ffLKrqION7aiw qbQ5xVe2Ftq7/OEMcVqwQ+VB4vg0oEUcE493Jxl6aeQwGzpa9RZ95MVq29o+9ua/pVZm 2DiQ== X-Gm-Message-State: AC+VfDxVVRcaKIl8XzbDW+LK5zOf33WEu69MH9QOw4qqHan2AoG8kxYy oeQaxjt+AHpmF53YwvVHtiQftt2tntzATn8/48b8UA== X-Google-Smtp-Source: ACHHUZ6Wstb7PoykikEJGQooCfoKaNvi2AqNe6MPaEf5CiMYXuo6J1XuwhL6zUqXtBsP1TChFs337w== X-Received: by 2002:a1c:7317:0:b0:3f0:46ca:f201 with SMTP id d23-20020a1c7317000000b003f046caf201mr11940086wmb.1.1683026427098; Tue, 02 May 2023 04:20:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Kiran Ostrolenk Subject: [PULL 04/12] qemu/host-utils.h: Add clz and ctz functions for lower-bit integers Date: Tue, 2 May 2023 12:20:15 +0100 Message-Id: <20230502112023.776823-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=richard.henderson@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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026483838100007 Content-Type: text/plain; charset="utf-8" From: Kiran Ostrolenk This is for use in the RISC-V vclz and vctz instructions (implemented in proceeding commit). Signed-off-by: Kiran Ostrolenk Reviewed-by: Richard Henderson Message-Id: <20230428144757.57530-11-lawrence.hunter@codethink.co.uk> Signed-off-by: Richard Henderson --- include/qemu/host-utils.h | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h index 3ce62bf4a5..d3b4dce6a9 100644 --- a/include/qemu/host-utils.h +++ b/include/qemu/host-utils.h @@ -107,6 +107,36 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b= , uint32_t c) } #endif =20 +/** + * clz8 - count leading zeros in a 8-bit value. + * @val: The value to search + * + * Returns 8 if the value is zero. Note that the GCC builtin is + * undefined if the value is zero. + * + * Note that the GCC builtin will upcast its argument to an `unsigned int` + * so this function subtracts off the number of prepended zeroes. + */ +static inline int clz8(uint8_t val) +{ + return val ? __builtin_clz(val) - 24 : 8; +} + +/** + * clz16 - count leading zeros in a 16-bit value. + * @val: The value to search + * + * Returns 16 if the value is zero. Note that the GCC builtin is + * undefined if the value is zero. + * + * Note that the GCC builtin will upcast its argument to an `unsigned int` + * so this function subtracts off the number of prepended zeroes. + */ +static inline int clz16(uint16_t val) +{ + return val ? __builtin_clz(val) - 16 : 16; +} + /** * clz32 - count leading zeros in a 32-bit value. * @val: The value to search @@ -153,6 +183,30 @@ static inline int clo64(uint64_t val) return clz64(~val); } =20 +/** + * ctz8 - count trailing zeros in a 8-bit value. + * @val: The value to search + * + * Returns 8 if the value is zero. Note that the GCC builtin is + * undefined if the value is zero. + */ +static inline int ctz8(uint8_t val) +{ + return val ? __builtin_ctz(val) : 8; +} + +/** + * ctz16 - count trailing zeros in a 16-bit value. + * @val: The value to search + * + * Returns 16 if the value is zero. Note that the GCC builtin is + * undefined if the value is zero. + */ +static inline int ctz16(uint16_t val) +{ + return val ? __builtin_ctz(val) : 16; +} + /** * ctz32 - count trailing zeros in a 32-bit value. * @val: The value to search --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026536; cv=none; d=zohomail.com; s=zohoarc; b=ckzEYH1q0C/A0cnKypdqA6vOB1OeXeE6xv/v8StunKq9cFcFs8A2i35KgQRCjVCgkvEsZ8uH2BN3Xp0q2bINy6AfnyD22WWtH3EjTgfnJdeScF18hFC7KkG+siFyGSPAsAIqXL3UB5/k1RenQ7ukft9E5cHYva+A/KobiKEZs3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026536; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ee+/tZtVXx1HapVlpwz6x03LyQaqO+PtTzdE1w9ii1A=; b=RdNanehEnqZdAlbRd7vhTCi3Fhqe1zAOqXAppr8kIA3wfL2s5YWdCtbPaIaIOuCakIzgrq2f8m2PqpH8CMeTLhIXCeWeQ5NNqKucKgK8z7GCkH/AvMsDNNatJ/m3DfzDMirgJnmKpmbljklOnDe5fFxPd3j7aSOXh0q0p59HdHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026536229628.237897488515; Tue, 2 May 2023 04:22:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3h-0000fA-4a; Tue, 02 May 2023 07:20:37 -0400 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 1pto3e-0000dK-2G for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3b-0003F8-RL for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:33 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f18dacd392so21781105e9.0 for ; Tue, 02 May 2023 04:20:31 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026427; x=1685618427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ee+/tZtVXx1HapVlpwz6x03LyQaqO+PtTzdE1w9ii1A=; b=le8Xs9Pl+NaJ/z3rk1AUbsD9rFF+L/g/N3jCMcQ2t+r2PLhc4cAu8ouRBBTm0y2GYS pqYDGXCVHi0aiBoh+5JGBactqSE+sPNIbuY3zz9IPl7TN4JMrUoS6MC8fZlGy+/sT5og jqHpB9bBA+Pr7qxHkgXALpzkL8Gqbkb1qM54bb30xveaNxCBPgVOnCbvACPAXzx96Q6c v41SnACGPHGWTmdrmMCZaD5LG8a4GBBipVqiwQwHBdakHX6qmBK6sASmBVHwnTqkHUkn 3qj+IaQoKks+FdbWklPVpK5f9RWoC3+lddjReQIGbXzvnPJPz341OcUY5DmfvRguoDwB jd6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026427; x=1685618427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ee+/tZtVXx1HapVlpwz6x03LyQaqO+PtTzdE1w9ii1A=; b=SE3B12E9ZxhcOD3hlWuSonUqBzGmlGzw/XjNMpsDhHUKwpH4ham6lchJXSnYwv9+15 TmvI5S+JLbAoGuG8hV7K/1Tqug9diMXlD2wD+uAt6ldOYWKoLCC2gMcXSFdw+99Lz3iW o/C5i/mtyoTlN+VenlX1IsW9icxpExvlIZ/pp5W4arzSXa9JcBLdxiqlt3vUeEVSuG6C CqalCZLZpo9BFjgDUUEpKYYHY9nLSIyzg1U0L88jQj6fdxFYfLV5T4DgFLOCza/D9s3D SM+uiS8nFgghcRvOvsKqIO/Tpa8ODH8zzGaFJfSbSK0MY+bYpyITl1tVHhe9+wTXh5aW m9Yg== X-Gm-Message-State: AC+VfDwjwUYBWZ91nc1HXGQFf/ygVplpZyjctMXlO028PsepUgHNYIFe K6fJsGh62wLjV3TCO3WxmB2aLI58Igt8dbMeagygwA== X-Google-Smtp-Source: ACHHUZ5qMBLCDn3nIKnOFe9ykJOHaWbGJe0tBrJas22UVSzi+3j0W7F1vnd869sneG3Qix6BmJRWzQ== X-Received: by 2002:a1c:7502:0:b0:3ef:6b97:f0c3 with SMTP id o2-20020a1c7502000000b003ef6b97f0c3mr12530716wmc.15.1683026427634; Tue, 02 May 2023 04:20:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Nazar Kazakov Subject: [PULL 05/12] tcg: Add tcg_gen_gvec_andcs Date: Tue, 2 May 2023 12:20:16 +0100 Message-Id: <20230502112023.776823-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x332.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026536851100001 Content-Type: text/plain; charset="utf-8" From: Nazar Kazakov Add tcg expander and helper functions for and-compliment vector with scalar operand. Signed-off-by: Nazar Kazakov Message-Id: <20230428144757.57530-10-lawrence.hunter@codethink.co.uk> [rth: Split out of larger patch.] Signed-off-by: Richard Henderson --- accel/tcg/tcg-runtime.h | 1 + include/tcg/tcg-op-gvec.h | 2 ++ accel/tcg/tcg-runtime-gvec.c | 11 +++++++++++ tcg/tcg-op-gvec.c | 17 +++++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/accel/tcg/tcg-runtime.h b/accel/tcg/tcg-runtime.h index e141a6ab24..b8e6421c8a 100644 --- a/accel/tcg/tcg-runtime.h +++ b/accel/tcg/tcg-runtime.h @@ -217,6 +217,7 @@ DEF_HELPER_FLAGS_4(gvec_nor, TCG_CALL_NO_RWG, void, ptr= , ptr, ptr, i32) DEF_HELPER_FLAGS_4(gvec_eqv, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) =20 DEF_HELPER_FLAGS_4(gvec_ands, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) +DEF_HELPER_FLAGS_4(gvec_andcs, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_xors, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) DEF_HELPER_FLAGS_4(gvec_ors, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32) =20 diff --git a/include/tcg/tcg-op-gvec.h b/include/tcg/tcg-op-gvec.h index 28cafbcc5c..6d58683171 100644 --- a/include/tcg/tcg-op-gvec.h +++ b/include/tcg/tcg-op-gvec.h @@ -330,6 +330,8 @@ void tcg_gen_gvec_ori(unsigned vece, uint32_t dofs, uin= t32_t aofs, =20 void tcg_gen_gvec_ands(unsigned vece, uint32_t dofs, uint32_t aofs, TCGv_i64 c, uint32_t oprsz, uint32_t maxsz); +void tcg_gen_gvec_andcs(unsigned vece, uint32_t dofs, uint32_t aofs, + TCGv_i64 c, uint32_t oprsz, uint32_t maxsz); void tcg_gen_gvec_xors(unsigned vece, uint32_t dofs, uint32_t aofs, TCGv_i64 c, uint32_t oprsz, uint32_t maxsz); void tcg_gen_gvec_ors(unsigned vece, uint32_t dofs, uint32_t aofs, diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c index ac7d28c251..97399493d5 100644 --- a/accel/tcg/tcg-runtime-gvec.c +++ b/accel/tcg/tcg-runtime-gvec.c @@ -550,6 +550,17 @@ void HELPER(gvec_ands)(void *d, void *a, uint64_t b, u= int32_t desc) clear_high(d, oprsz, desc); } =20 +void HELPER(gvec_andcs)(void *d, void *a, uint64_t b, uint32_t desc) +{ + intptr_t oprsz =3D simd_oprsz(desc); + intptr_t i; + + for (i =3D 0; i < oprsz; i +=3D sizeof(uint64_t)) { + *(uint64_t *)(d + i) =3D *(uint64_t *)(a + i) & ~b; + } + clear_high(d, oprsz, desc); +} + void HELPER(gvec_xors)(void *d, void *a, uint64_t b, uint32_t desc) { intptr_t oprsz =3D simd_oprsz(desc); diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 047a832f44..9c14908a46 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -2761,6 +2761,23 @@ void tcg_gen_gvec_andi(unsigned vece, uint32_t dofs,= uint32_t aofs, tcg_gen_gvec_2s(dofs, aofs, oprsz, maxsz, tmp, &gop_ands); } =20 +void tcg_gen_gvec_andcs(unsigned vece, uint32_t dofs, uint32_t aofs, + TCGv_i64 c, uint32_t oprsz, uint32_t maxsz) +{ + static GVecGen2s g =3D { + .fni8 =3D tcg_gen_andc_i64, + .fniv =3D tcg_gen_andc_vec, + .fno =3D gen_helper_gvec_andcs, + .prefer_i64 =3D TCG_TARGET_REG_BITS =3D=3D 64, + .vece =3D MO_64 + }; + + TCGv_i64 tmp =3D tcg_temp_ebb_new_i64(); + tcg_gen_dup_i64(vece, tmp, c); + tcg_gen_gvec_2s(dofs, aofs, oprsz, maxsz, c, &g); + tcg_temp_free_i64(tmp); +} + static const GVecGen2s gop_xors =3D { .fni8 =3D tcg_gen_xor_i64, .fniv =3D tcg_gen_xor_vec, --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026537; cv=none; d=zohomail.com; s=zohoarc; b=fEr5aLhT/lT0fMXcu8VscRSfhb7OGIaahtYUlQncU3uzQONc75wUEahClxt+pw0QxpPoA7tABs8y3cq8EvjocBxk8qFQVaduNyoCZWU54d9kQj/hOReQhjz5GoJOnZId2rtR8RMSyFmbY+aug0M/uNDQBrFy8+mvo/WYkxchxzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026537; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aGVAM5f/fVkyzn3zO3fNGB1yt+oMwQWHTxZuqdKZ/tI=; b=dGq9X6RGE3NU8O6v30OeDKGVVFDZpbSGImkFwQk506q5Lbz1M7RYgMVb9yozKM5d6LxSZuZ/dWJCUVrOYKC+cCsaMsMwjyC+cOn2dD7pfg0KEsS4UOys810VJPD7i4Mj6oYaFOLam0MrZjIajkrls6geBemf6FgrnZqJfyIK4Bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026537887702.6718801141845; Tue, 2 May 2023 04:22:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3h-0000fk-LL; Tue, 02 May 2023 07:20:37 -0400 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 1pto3e-0000dW-LX for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:35 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3c-0003FZ-QE for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:34 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f19afc4f60so21756245e9.1 for ; Tue, 02 May 2023 04:20:32 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026428; x=1685618428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aGVAM5f/fVkyzn3zO3fNGB1yt+oMwQWHTxZuqdKZ/tI=; b=MMvkvteQQtaDubChUo5EHNTqGPea+2/tARF/OyghVSyZcor4/jTVxpzAarvntgRO0C Cb80cAcRUrXer4fXRYOu3UIlA38MEQHa/KiscEP5Boy2O0lF37LOZZw41O565DdxRwhw tm29W0TC+WmUliLlcnXLgzfWMCFPkfC9CYDsJ6PtHwtV2c5NhoJ4ULqZUQzEe+Xzok5w VpiklY9tgNeGKlbVo8KjTcBO6ShCOR7+hNI4U9V/cP8+fussGJZLusI3EU5KlD6vWdaQ 72FYYvwJspEiUTCLyuTjyvLgRtbmVNVtEsl23Tl3yiK1OMm6I5Kk3qbAZrMpAa4mvyLb ViMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026428; x=1685618428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aGVAM5f/fVkyzn3zO3fNGB1yt+oMwQWHTxZuqdKZ/tI=; b=BLuQWl1LYsw+GHRHtpVetuWnfJz0uLJY9EEPeSCEJ/LPAbBKs1rL3yB4PYe+ifBOZt yGYY5XGsZkQP3RojF8TkqJ6lavPLZ1+sAzP6ehW2plTLA83pphRr9iWZ9TP56JoVwt9x Yn5luitmEeOYv15abeVq72f95BdHFuizeAid14RFVvI8buVKoJJCDXRhf9WDZ5Txqxgx ae69eAAsiEjvwUoGpN9QT/Tyw1bwiZAfZ8vdw3UNRx+gNSRW+vbtF3/xiIMF1Iky3a0L cB26FzzPlZetkWaihN6fJHfl1M8ItGx9JEk0sfxkVsTMdj+3+0pUqdAqANLiW6Vn0u0K OV6A== X-Gm-Message-State: AC+VfDyaNH/S+4/YewY/tclmW2u3PbcYbz1Xz9jWz9Av3QKKpiRoRLjB Dp0TgZlBEqh9/YEmB7/t5qaO5C33t7qp0K5roaeHzw== X-Google-Smtp-Source: ACHHUZ6/a57Uk6tNoLLl1C7nSGuCik5HcUEUGsjY5QsDz3A7CcLPgPXHfht+QlNS0Htq/k0ho5BPRw== X-Received: by 2002:a7b:c5c6:0:b0:3f1:9acf:8682 with SMTP id n6-20020a7bc5c6000000b003f19acf8682mr11421281wmk.17.1683026428208; Tue, 02 May 2023 04:20:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Nazar Kazakov Subject: [PULL 06/12] tcg: Add tcg_gen_gvec_rotrs Date: Tue, 2 May 2023 12:20:17 +0100 Message-Id: <20230502112023.776823-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026539045100011 Content-Type: text/plain; charset="utf-8" From: Nazar Kazakov Add tcg expander and helper functions for rotate right vector with scalar operand. Signed-off-by: Nazar Kazakov Message-Id: <20230428144757.57530-10-lawrence.hunter@codethink.co.uk> [rth: Split out of larger patch; mask rotation count.] Signed-off-by: Richard Henderson --- include/tcg/tcg-op-gvec.h | 2 ++ tcg/tcg-op-gvec.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/tcg/tcg-op-gvec.h b/include/tcg/tcg-op-gvec.h index 6d58683171..a8183bfeab 100644 --- a/include/tcg/tcg-op-gvec.h +++ b/include/tcg/tcg-op-gvec.h @@ -371,6 +371,8 @@ void tcg_gen_gvec_sars(unsigned vece, uint32_t dofs, ui= nt32_t aofs, TCGv_i32 shift, uint32_t oprsz, uint32_t maxsz); void tcg_gen_gvec_rotls(unsigned vece, uint32_t dofs, uint32_t aofs, TCGv_i32 shift, uint32_t oprsz, uint32_t maxsz); +void tcg_gen_gvec_rotrs(unsigned vece, uint32_t dofs, uint32_t aofs, + TCGv_i32 shift, uint32_t oprsz, uint32_t maxsz); =20 /* * Perform vector shift by vector element, modulo the element size. diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 9c14908a46..f51bcaa87b 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -3353,6 +3353,17 @@ void tcg_gen_gvec_rotls(unsigned vece, uint32_t dofs= , uint32_t aofs, do_gvec_shifts(vece, dofs, aofs, shift, oprsz, maxsz, &g); } =20 +void tcg_gen_gvec_rotrs(unsigned vece, uint32_t dofs, uint32_t aofs, + TCGv_i32 shift, uint32_t oprsz, uint32_t maxsz) +{ + TCGv_i32 tmp =3D tcg_temp_ebb_new_i32(); + + tcg_gen_neg_i32(tmp, shift); + tcg_gen_andi_i32(tmp, tmp, (8 << vece) - 1); + tcg_gen_gvec_rotls(vece, dofs, aofs, tmp, oprsz, maxsz); + tcg_temp_free_i32(tmp); +} + /* * Expand D =3D A << (B % element bits) * --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026507; cv=none; d=zohomail.com; s=zohoarc; b=RNBvbgtg9repMPVw/5Gy5vw8JJZDHS8QEHKnFOg9nLw6LCXawfKgzoAIfRWXokicGGWy5J2vuRPIQUunNTgGyNhOkYUam7PQYaz6RafMtwE+hMthai3KUAJ/miW31m0N6ILQ/s1ZOo50XEc50+TOWB+QkYOAu+q+Ku2RWcCxWQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026507; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wY72rBTCusrC/WPaiwfzmoq60/uULSGfuUcD5/U5TwY=; b=NSCZnt0hxtkWDqJOwPcjqnfZqYaIxHSAO70pYWiNb9XhtvgaEXwHAUvig/HvvYLbnioGMczRBXYb19g2yEWaZrxPD93tyR+gAJlY68IiqpJP/48NILOsur+IX8fLxz3VoeulB255AIWkvVrbQysUSVo8RXDbbfcjpyB15Np9dPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168302650704497.05153717512792; Tue, 2 May 2023 04:21:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3g-0000f9-W1; Tue, 02 May 2023 07:20:37 -0400 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 1pto3f-0000dc-1y for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:35 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3c-0003Fh-Ta for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:34 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-2f40b891420so3497727f8f.0 for ; Tue, 02 May 2023 04:20:32 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026429; x=1685618429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wY72rBTCusrC/WPaiwfzmoq60/uULSGfuUcD5/U5TwY=; b=GNsOKbJwpHz7i1wn7ETbd7GGFUV/S7mblkMoHCcZqn9bXV2m4QUav+4mm9AgqmWpq9 WQ4byszQtqq1A0eJsVupempRajYkQzj4cnWZcxHgOURR3JGJ5sEpFimoia8UdYTYc6Id N5xz9EzY22Ap2cD98Zod+asI5UM9WhOIbiahxBkgSz0SKAdplfp3gdN1X+kbpNLyehhP g8LBWDatuVEGq3a0kFsaHv3b+L5rPZwFS7/pxGeWJ+z4zUBJJzFW1BGPGi8ZiIN33uVI EQDn5bAyzx2TwQx/hh+Rq5f45zkSq9dxQ1x1Aofy/fo9XUKGaozLG64D8Kr91r1HbGzM aCjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026429; x=1685618429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wY72rBTCusrC/WPaiwfzmoq60/uULSGfuUcD5/U5TwY=; b=W4iVX5KDRgh6YMn6AyTuF6QKhAbwih5ZTbOfUVY8BW7Xv5wA66amzP92MpBbzs6Poq 95ozG1ynMkVJaAWUi1yTohmB1ajYYgbkc5LRf6lFEnNY75Hlr6Onts7EV77hJoojyXyh TBh7gZq0cuPtT2NP/bSMerzVHwYVqgR6F+iMoQMVnX5m8Uc2kBqDq9VZXjZOdIMUv+v5 9wOhZk+CGyX7Yf0pk5iUicYvRerx8SV559vO7FMBj0897r9i3JV+GXMC+NIdy2pQX68D q3EUvo1mFfAOe5k28MpqHANZ0LMuspkCfTdvNHwBOX+gx+KjE2XIiZj5eMgvKLn3vbem BCIQ== X-Gm-Message-State: AC+VfDysDmZX9Gxj+cfDzch4cp8sg+lyo3HaPQpplGhxrweBp9rRfgWy 78/io8cQogFqdg2BjyUAz4M/PLgEsY+pIeySy/huHQ== X-Google-Smtp-Source: ACHHUZ6+ML0T420IJEff4r8IFhQKL7bkLWephK86r0r2GO/KprMzxBt5CeS86WwxqHaBIyeZyD6Now== X-Received: by 2002:adf:f212:0:b0:2ef:b4e1:cf59 with SMTP id p18-20020adff212000000b002efb4e1cf59mr10869975wro.58.1683026428907; Tue, 02 May 2023 04:20:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 07/12] qemu/int128: Re-shuffle Int128Alias members Date: Tue, 2 May 2023 12:20:18 +0100 Message-Id: <20230502112023.776823-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x42d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026508473100003 Clang 14, with --enable-tcg-interpreter errors with include/qemu/int128.h:487:16: error: alignment of field 'i' (128 bits) does not match the alignment of the first field in transparent union; transparent_union attribute ignored [-Werror,-Wignored-attributes] __int128_t i; ^ include/qemu/int128.h:486:12: note: alignment of first field is 64 bits Int128 s; ^ 1 error generated. By placing the __uint128_t member first, this is avoided. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Message-Id: <20230501204625.277361-1-richard.henderson@linaro.org> --- include/qemu/int128.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qemu/int128.h b/include/qemu/int128.h index f62a46b48c..9e46cfaefc 100644 --- a/include/qemu/int128.h +++ b/include/qemu/int128.h @@ -483,9 +483,9 @@ static inline void bswap128s(Int128 *s) */ #ifdef CONFIG_INT128 typedef union { - Int128 s; - __int128_t i; __uint128_t u; + __int128_t i; + Int128 s; } Int128Alias __attribute__((transparent_union)); #else typedef Int128 Int128Alias; --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026489; cv=none; d=zohomail.com; s=zohoarc; b=aMUmw6tE06o1A6FgeE9LRGyBdZ+/QaGxUzshnHByvHWgHxEOnUPW8naYEmAEQhsUHqJ8CyrWHqmjmbTv2B9palwVeG1QC4J8Y/CHkpkRC82EY5Lyouj2gRGCCEyNjHUyPwubt33liDgG+jdfFiFeYd2Lk6HjEQblAtCoTm3dbuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026489; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lj2D2cXdtATJYKpTPKE6VX0lPTFHJNgX6DGhwMqHkxw=; b=G/sV4G1o8E/5oqXHS3HEz0q0njKXElF+InYdZMLKZU+8LIcG4RhsObgtgwC85QTuZl54gbg/t5f8oyrw8QHGXiOoQ+fLyqYeWWUGdvav8s5hf7hcVE7o3jMWg9NvuGqi93eQ7jfFVNnYdXOtKuK0qbek2IQTdtBNErKAXKiVPbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026489689812.7998332444187; Tue, 2 May 2023 04:21:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3l-0000h7-M5; Tue, 02 May 2023 07:20:41 -0400 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 1pto3g-0000es-EO for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:36 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3d-0003Fn-7U for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:36 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-3f193ca059bso21556665e9.3 for ; Tue, 02 May 2023 04:20:32 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026429; x=1685618429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lj2D2cXdtATJYKpTPKE6VX0lPTFHJNgX6DGhwMqHkxw=; b=WPkKvB2CAMRkFtOdXRXZRQ914DBu4y6s4PSOR7ST92BO7xCLm5Ep4kJ7TKOFieqp5C dmqyKM9mFgQqlG4maT70FsEdnw8Vc/ew0QC10nYsU6C8P4xPze2DmW2OilIFpNg0gDLT JRGA85oihZvJJJ4gdrHT/K+wsM2dWtqGR6irbfuP2aA4+IYtUf5pBksS1+46MoedsXhQ /+rtk6fJ1waMABVRGgE/ngUGgv+Dl5RzcnQjz/F9krqeXVkNDj6XRdSS2WpipPqdUFA8 bdU+Beu9D1zjziU41tx/IAWRKf8+aqsdp/ajGOiggsix+lG7VgSbX1DK0HF/EvSHqvAe 7Hsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026429; x=1685618429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lj2D2cXdtATJYKpTPKE6VX0lPTFHJNgX6DGhwMqHkxw=; b=AOamun6WY1xSTLMnPXpnrRJxJ/+D2o4e+GF6kLTospwN8tNOgbeMN89pqn6iyxP3k4 o6vw/F5H23W49UL90Maa4PI67ho8O9h3z6RrJVqjOMAb8JDR+YplIwJ5AE6MCxEcai7O u6gMnOesambmfhqT830Ly6EFni0uQyvP+6cW8ZpV+7wzlalhFBY4FIoMEgVT7k0FbUSA Bq6gTnqwAbrsM5Mv0obXSLV/3mRiDuPiUja5rGM+Rfc55Kpw6LPbVUHgDfDQFLYoa/ge N1PqMjukw3HI+v+zV3LcokxtTmuxn7eJ3YBXErHR4euZy1N3lgYFvj6wYZCL02IhvHh0 vSLA== X-Gm-Message-State: AC+VfDz03AGq/ZZNKig67joWN8U/ruB3UWhDAKUrLyAYo2Jq1WjEvQMj 97yQa2kKhzYr41XLlHa/twGlBWfMy/GU+pOdcvJBIw== X-Google-Smtp-Source: ACHHUZ5VeVs270UCyNIbMOhwM2DpQ89c2bk6o5orHpjkMIJQCsEJpbFdnZd9qIx/bONGnYTXu9/6zQ== X-Received: by 2002:a05:600c:3797:b0:3f1:82c6:2d80 with SMTP id o23-20020a05600c379700b003f182c62d80mr11937607wmr.5.1683026429400; Tue, 02 May 2023 04:20:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Juan Quintela Subject: [PULL 08/12] migration/xbzrle: Use __attribute__((target)) for avx512 Date: Tue, 2 May 2023 12:20:19 +0100 Message-Id: <20230502112023.776823-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026490036100001 Content-Type: text/plain; charset="utf-8" Use the attribute, which is supported by clang, instead of the #pragma, which is not supported and, for some reason, also not detected by the meson probe, so we fail by -Werror. Signed-off-by: Richard Henderson Reviewed-by: Juan Quintela Message-Id: <20230501210555.289806-1-richard.henderson@linaro.org> --- meson.build | 5 +---- migration/xbzrle.c | 9 ++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index c44d05a13f..77d42898c8 100644 --- a/meson.build +++ b/meson.build @@ -2370,12 +2370,9 @@ config_host_data.set('CONFIG_AVX512F_OPT', get_optio= n('avx512f') \ config_host_data.set('CONFIG_AVX512BW_OPT', get_option('avx512bw') \ .require(have_cpuid_h, error_message: 'cpuid.h not available, cannot ena= ble AVX512BW') \ .require(cc.links(''' - #pragma GCC push_options - #pragma GCC target("avx512bw") #include #include - static int bar(void *a) { - + static int __attribute__((target("avx512bw"))) bar(void *a) { __m512i *x =3D a; __m512i res=3D _mm512_abs_epi8(*x); return res[1]; diff --git a/migration/xbzrle.c b/migration/xbzrle.c index c6f8b20917..258e4959c9 100644 --- a/migration/xbzrle.c +++ b/migration/xbzrle.c @@ -177,11 +177,11 @@ int xbzrle_decode_buffer(uint8_t *src, int slen, uint= 8_t *dst, int dlen) } =20 #if defined(CONFIG_AVX512BW_OPT) -#pragma GCC push_options -#pragma GCC target("avx512bw") #include -int xbzrle_encode_buffer_avx512(uint8_t *old_buf, uint8_t *new_buf, int sl= en, - uint8_t *dst, int dlen) + +int __attribute__((target("avx512bw"))) +xbzrle_encode_buffer_avx512(uint8_t *old_buf, uint8_t *new_buf, int slen, + uint8_t *dst, int dlen) { uint32_t zrun_len =3D 0, nzrun_len =3D 0; int d =3D 0, i =3D 0, num =3D 0; @@ -296,5 +296,4 @@ int xbzrle_encode_buffer_avx512(uint8_t *old_buf, uint8= _t *new_buf, int slen, } return d; } -#pragma GCC pop_options #endif --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026550; cv=none; d=zohomail.com; s=zohoarc; b=QIvMDwtPcMfeK3NCS/H4OLotzu3AMB3BGwrgSjwwoMxcMJ1l3yggBtHD/R4sFCPCJrRYO4bJVaXm5kc4tABCg7GyZI8L7gqx7lAja/RjgIdhbSbE5ARje8OsreBRMQzBRbXUQQdL8PmJ25G0WV3XDnTJBZyRfCj49dubej5k5hI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026550; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hv/l59D9/l35x4T8g8G++KyGPDKdt+S8r4eHYGHsDds=; b=aEHwSekI1jejzkfhiLY+IXNV+G0vSARow0rJN//CWXNLWP5LGj/ek/P+plGQnr/taTtEfERicl0uFVPj5H3KHusu1WDiE2RUmSbNdjMGa39LuTkk2oOmOk82U2G2YgaKFzeKh9teOd7hb7lsvLnkz5amHeFulHjrlxeROozTtyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026550246578.0491058877146; Tue, 2 May 2023 04:22:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3h-0000fH-Ag; Tue, 02 May 2023 07:20:37 -0400 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 1pto3f-0000e5-QU for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:35 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3d-0003GP-J4 for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:35 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f1950f5628so35027265e9.3 for ; Tue, 02 May 2023 04:20:33 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026430; x=1685618430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Hv/l59D9/l35x4T8g8G++KyGPDKdt+S8r4eHYGHsDds=; b=B9JJfr0zwaDlp/Rkaeme0R+miRcSuPi74Hdd6nUPJX81DHZjJ8Fdgg26Do6DIcO8zT WjngYuWWVd4qeTsR00+wnXhH+9zLcO+4OHTe56ruAVItPByS7nncP2AvgygqW/7t/LEu /au5ZV//59uK+Gjs670ZEErSIS9EK+bsV+j1QBj3lKtyxt4El2Selj8Lh099THrO2aK7 tcB8LBnHcb8FqJgKWH0SBIoegwHESvihpC1v0VX+g5+BP3akIwq/yU77EgzCXsubec2Y vrQG5LXurQ//hw6+VwYVmw2/0XlK7DtN4xmhlJgxnfPW9qBbcskYyKPEu/JZekgLp6vj ZDsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026430; x=1685618430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hv/l59D9/l35x4T8g8G++KyGPDKdt+S8r4eHYGHsDds=; b=OkhQj35z5lAjesFsvnmNjbE5Tm91pejG0a4h79Tgm39IpAfxlq/levhVoDbC9+xPKI oT1QgzaaPACk534CFcZFhymAa8cTCalsd+Z619P+0Cx9Sn+U5pnpL/Q6mjVR+35XRAC1 PyIBvgePi5zd5SrkRPn67bo7hE7lr/QO/WT0HBY0LF+PwY1GnLZphg3tMz+cajcTklcB Q6URuu5a45MnZgP9MDj0AMEa/fUFJQtwyRuT0RQVPgR/XvGNDe+5DjjOQfMSjVUVRiVy OK5Edr79mp/8eQBK9ZdG3BQ/j8ciLQL3LnY9HZGlyVrV7DmnPlM+VdvsKK+czQOg1dej LLiw== X-Gm-Message-State: AC+VfDwm2wJITFnNI2zkbfobB/DP1k3+b9ORXW/HEWjGyVbSpk8XZEUa aecAfn7+PfXkX196Thq8I/O8kXfljGvUNRfvqmIehg== X-Google-Smtp-Source: ACHHUZ6HpyxsiXalHjEDkaWze/SI6yjnovLidyCmV7OteU+wLrbjVNd+33a0vvyAcxvW7gfjwiTm9Q== X-Received: by 2002:a05:600c:24a:b0:3f2:51e7:f1f4 with SMTP id 10-20020a05600c024a00b003f251e7f1f4mr12611214wmj.10.1683026430005; Tue, 02 May 2023 04:20:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Alistair Francis , Weiwei Li , Daniel Henrique Barboza Subject: [PULL 09/12] accel/tcg: Add cpu_ld*_code_mmu Date: Tue, 2 May 2023 12:20:20 +0100 Message-Id: <20230502112023.776823-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026552332100001 Content-Type: text/plain; charset="utf-8" At least RISC-V has the need to be able to perform a read using execute permissions, outside of translation. Add helpers to facilitate this. Signed-off-by: Richard Henderson Acked-by: Alistair Francis Reviewed-by: Weiwei Li Tested-by: Daniel Henrique Barboza Message-Id: <20230325105429.1142530-9-richard.henderson@linaro.org> Message-Id: <20230412114333.118895-9-richard.henderson@linaro.org> --- include/exec/cpu_ldst.h | 9 +++++++ accel/tcg/cputlb.c | 48 ++++++++++++++++++++++++++++++++++ accel/tcg/user-exec.c | 58 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 09b55cc0ee..c141f0394f 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -445,6 +445,15 @@ static inline CPUTLBEntry *tlb_entry(CPUArchState *env= , uintptr_t mmu_idx, # define cpu_stq_mmu cpu_stq_le_mmu #endif =20 +uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra); +uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra); +uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra); +uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra); + uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index efa0cb67c9..c8bd642d0e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2773,3 +2773,51 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr add= r) MemOpIdx oi =3D make_memop_idx(MO_TEUQ, cpu_mmu_index(env, true)); return full_ldq_code(env, addr, oi, 0); } + +uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t retaddr) +{ + return full_ldub_code(env, addr, oi, retaddr); +} + +uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t retaddr) +{ + MemOp mop =3D get_memop(oi); + int idx =3D get_mmuidx(oi); + uint16_t ret; + + ret =3D full_lduw_code(env, addr, make_memop_idx(MO_TEUW, idx), retadd= r); + if ((mop & MO_BSWAP) !=3D MO_TE) { + ret =3D bswap16(ret); + } + return ret; +} + +uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t retaddr) +{ + MemOp mop =3D get_memop(oi); + int idx =3D get_mmuidx(oi); + uint32_t ret; + + ret =3D full_ldl_code(env, addr, make_memop_idx(MO_TEUL, idx), retaddr= ); + if ((mop & MO_BSWAP) !=3D MO_TE) { + ret =3D bswap32(ret); + } + return ret; +} + +uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t retaddr) +{ + MemOp mop =3D get_memop(oi); + int idx =3D get_mmuidx(oi); + uint64_t ret; + + ret =3D full_ldq_code(env, addr, make_memop_idx(MO_TEUQ, idx), retaddr= ); + if ((mop & MO_BSWAP) !=3D MO_TE) { + ret =3D bswap64(ret); + } + return ret; +} diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index a7e0c3e2f4..fc597a010d 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -1219,6 +1219,64 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr) return ret; } =20 +uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra) +{ + void *haddr; + uint8_t ret; + + haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_INST_FETCH); + ret =3D ldub_p(haddr); + clear_helper_retaddr(); + return ret; +} + +uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra) +{ + void *haddr; + uint16_t ret; + + haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_INST_FETCH); + ret =3D lduw_p(haddr); + clear_helper_retaddr(); + if (get_memop(oi) & MO_BSWAP) { + ret =3D bswap16(ret); + } + return ret; +} + +uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra) +{ + void *haddr; + uint32_t ret; + + haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_INST_FETCH); + ret =3D ldl_p(haddr); + clear_helper_retaddr(); + if (get_memop(oi) & MO_BSWAP) { + ret =3D bswap32(ret); + } + return ret; +} + +uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr, + MemOpIdx oi, uintptr_t ra) +{ + void *haddr; + uint64_t ret; + + validate_memop(oi, MO_BEUQ); + haddr =3D cpu_mmu_lookup(env, addr, oi, ra, MMU_DATA_LOAD); + ret =3D ldq_p(haddr); + clear_helper_retaddr(); + if (get_memop(oi) & MO_BSWAP) { + ret =3D bswap64(ret); + } + return ret; +} + #include "ldst_common.c.inc" =20 /* --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026558; cv=none; d=zohomail.com; s=zohoarc; b=hqs+51JTvTvaj7Wizkz3lk75VQaE0u+OIquwhblv4WS4/MbwLME+WHqRpHjOHetBatv/j8sBwmScSL4L9/EHpZeLkc3AfmB7MS0TZgQhluOG/18+VxTsTXNMopwAozmW1eNwR5nalrSr2gb9TrQWYiaNsA1F1OpUs66/lRLPJM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026558; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EoXYOQHQNeBbfwjUDNzuW/Is90ENoYHXRPtx24KBX6U=; b=LXNFr0jeLOnpUO9N/fJg356fLlc159LnX0JPzg04Dq4L79cZKZVlUpLSY95HPJeNAjnwGb6+ZBeX6qd/EKCa0ouSUtQDL49JjJUHR1cq9EWmQ2VfLs/DgQNIX3ZH/tbx6tqhps8oOSfLf/Qyjlx0Xgf5Bhtnpu0g/mpwNkDwEuc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026556892778.1022251533692; Tue, 2 May 2023 04:22:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3n-0000hf-8F; Tue, 02 May 2023 07:20:43 -0400 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 1pto3j-0000gT-Kk for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:39 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3d-0003Gb-L8 for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:39 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f19afc4fd8so21546685e9.2 for ; Tue, 02 May 2023 04:20:33 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026430; x=1685618430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EoXYOQHQNeBbfwjUDNzuW/Is90ENoYHXRPtx24KBX6U=; b=fcvibkHtVI4CAQdVLjvckJfkVEEA/7Ly7E01KhoAOiFamjNkZFW5nFysORDqWUNJ/K XKOt1rLLL2kIelyWG+Vq1Jzx2oEdaubcDaZj36qnF1WK2MpGiihvuNCnWbC+3/REk5oT 2R/uOx6POCZfRtroSyVhcmJTUZWgqtYo3ka3e2BoBZOy2ZtHMxrdjCouLEgR41eh5Zca rid9DCa98SjhvyFTjF75m4LdcVEJc/2xi9PiaebHNmwIzRTZAh7U0CSGVoYTZkVSi8Cu rJpsXk3ZEN3f3h+8Fu7qa1BnorXtatU/l5P1V4OvMkqbRcmbSE41MbqKPGC8lVHuzLiP 4jXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026430; x=1685618430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EoXYOQHQNeBbfwjUDNzuW/Is90ENoYHXRPtx24KBX6U=; b=Kvymx6bDLF4HQEHMhgLCfV4SAsmbtLOEe9vsDy5+9i+HpMVOXZkmMEz/58fctN+Iai F/u2xl2mdcmVnuESvIV3yZ6mIdjMRuMlg5O4voMm8tj5QQ+Re0VJZmvfyI2VLAys5Bbr KvMRJsGI15o/9PojflEkDlgNnvaouEkF2k88VjhZ3aB2SsNjA8WVdU4euQqt2WL9Vkwb ZBss8XswEArTA68sMzXHnx6o9tkSenZ3y62O9zrNowyipFOzW19r0/Z0jDfrDbOpMWk6 ffGZy6CIZNrz9N9viBtCs7+GdPtHuxpDwL849EvivD+FHmbZJQAwZQ9qpBTZWBBisomn yA0Q== X-Gm-Message-State: AC+VfDy8+oyIvM8HMK3/uQR4w+4won8SwnPJI+BCV0k4CXSWR9WqPMPm 27R7bchG9FXfdojU/QsLOlYlQC0PbDGb9aDNFaVCYQ== X-Google-Smtp-Source: ACHHUZ4urDmsR4wlklGCGo+1h/3fdNxt9bOneoceVGIOKSj6STuD+Y+f2zpXs3vclyBjUJjwT16JRw== X-Received: by 2002:a7b:c407:0:b0:3f3:481a:902e with SMTP id k7-20020a7bc407000000b003f3481a902emr827794wmi.15.1683026430530; Tue, 02 May 2023 04:20:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/12] tcg/loongarch64: Conditionalize tcg_out_exts_i32_i64 Date: Tue, 2 May 2023 12:20:21 +0100 Message-Id: <20230502112023.776823-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026559147100003 Since TCG_TYPE_I32 values are kept sign-extended in registers, via ".w" instructions, we need not extend if the register matches. This is already relied upon by comparisons. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/loongarch64/tcg-target.c.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tcg/loongarch64/tcg-target.c.inc b/tcg/loongarch64/tcg-target.= c.inc index 21c2fc9e98..0940788c6f 100644 --- a/tcg/loongarch64/tcg-target.c.inc +++ b/tcg/loongarch64/tcg-target.c.inc @@ -463,7 +463,9 @@ static void tcg_out_ext32s(TCGContext *s, TCGReg ret, T= CGReg arg) =20 static void tcg_out_exts_i32_i64(TCGContext *s, TCGReg ret, TCGReg arg) { - tcg_out_ext32s(s, ret, arg); + if (ret !=3D arg) { + tcg_out_ext32s(s, ret, arg); + } } =20 static void tcg_out_extu_i32_i64(TCGContext *s, TCGReg ret, TCGReg arg) --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026480; cv=none; d=zohomail.com; s=zohoarc; b=Hw4+jcw+9egZl7mTaLfISLL55yW5j5wfXT8FZ6RU5pws7w0w9XvXzZuL6X4t6COn9Lz35h/7LHf0b1p+xYdJB6fghfPiza0zXZzszSQQbz93E4mRbbpiDcZJwA9Y+bNkOENqrCKSSL4pTdnQX9EBJuBKJH52QqmH7NRNCVYOul0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qjnRB+rrhPhBqqBICpJ5x+fzhQt0vgTrWO9uJRMoXeU=; b=cpUuiMn5+aOgEOLApD+z0dwUuYjHGpbnT5FUw8QPll/WYygXiTyQafsvNqZRZ4ORnwjo7LmBus31LvzBtJvPJ8v8J4GqWiBq7zd7SUPxEFD1mvQRR10RDq3dVJCxZDMfhUFmZVUneATF2IfM+goAP7vAqwjWj5eVH5iWvwrM8mk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026480973392.9342479723234; Tue, 2 May 2023 04:21:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3l-0000go-5C; Tue, 02 May 2023 07:20:41 -0400 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 1pto3g-0000ez-O6 for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:36 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3e-0003Gt-Tt for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:36 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-2f9b9aa9d75so2175659f8f.0 for ; Tue, 02 May 2023 04:20:34 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026431; x=1685618431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qjnRB+rrhPhBqqBICpJ5x+fzhQt0vgTrWO9uJRMoXeU=; b=vHwelGMaq9zszloEpIfn7eT5RC9hnTmVdG/x2F/ymd6kQvM/x0uXAwF+iTkuBKh76s BmDXXyhS2QLp0/gsnLbNPaozsIudYn4VYO//vZNugoJFJ6OKU6kjzWs0Q4rPkA/0BJfm POAFlQWxMkYxxbQYdfBvBhLOzCkCNUA4Q75u+PTkGwvVkc3eB8Jxy0mggm9FMFBz9qY7 kyIczdpAMM/HlB5DF6lnd/6p2SSE5/Hfe6zUkURzNwkPxcJSAlJZAFTsXf7cMjqbUooc fTvHFp19Gzkt/BhGHx8DJMFrTszC0NeNoPbjs6oUFIu0Xa+rS0jFiT/Fjz4+GdwcSEYm xKbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026431; x=1685618431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qjnRB+rrhPhBqqBICpJ5x+fzhQt0vgTrWO9uJRMoXeU=; b=N2D5vQm3dXkVspv86w/oL82xyWEv+MIBjQvF6Pkr3D+1jkmcoTPxFqUJloHLnAk4qW qOLSbU+ACyMDS1j4AR40oPkfYGCytmHjx6soUJwSFhyEFM/IcCtgrHjPmNfmSRsbtJp2 9A9mWCx43eLd6o5H/bQxVg6NA/AOHXpgVIc+kS5iHsiQM5CiTTR9yn69NRkzqkh+997/ q5lOt1INBrhfVeCts91mn1vKWQg3W1l5yR4kz9mfPCg/QkZNRJuJNLRJtZfNUze2ad55 TlCA8khSLh6eeB6TNXiAtRW9S9NItcqinkR/F3kJDQ3XmS8MCdOY2W9ieSRCQYOMoARc X+Qw== X-Gm-Message-State: AC+VfDwRkymb1jEVU/LvID/Mnx15tUBDiIKAZCBRXJEzM4RqJ3c3rFvW qHhHpsx9fwM8M6XXhbs4otc2GSw1GUpWQEenKpDGdw== X-Google-Smtp-Source: ACHHUZ7ulTHXFa6xzZJ63nrbJSCMd8h9BKQxr53KPnC1Ji9RAK4IkxM9bpVBh++7YTO3tuj4LKdqOw== X-Received: by 2002:a05:6000:136f:b0:2f0:e287:1fbc with SMTP id q15-20020a056000136f00b002f0e2871fbcmr12278203wrz.11.1683026431148; Tue, 02 May 2023 04:20:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/12] tcg/mips: Conditionalize tcg_out_exts_i32_i64 Date: Tue, 2 May 2023 12:20:22 +0100 Message-Id: <20230502112023.776823-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x434.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026482714100003 Since TCG_TYPE_I32 values are kept sign-extended in registers, we need not extend if the register matches. This is already relied upon by comparisons. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 346c614354..a83ebe8729 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -582,7 +582,9 @@ static void tcg_out_ext32s(TCGContext *s, TCGReg rd, TC= GReg rs) =20 static void tcg_out_exts_i32_i64(TCGContext *s, TCGReg rd, TCGReg rs) { - tcg_out_ext32s(s, rd, rs); + if (rd !=3D rs) { + tcg_out_ext32s(s, rd, rs); + } } =20 static void tcg_out_extu_i32_i64(TCGContext *s, TCGReg rd, TCGReg rs) --=20 2.34.1 From nobody Sun May 19 23:34:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1683026545; cv=none; d=zohomail.com; s=zohoarc; b=CM8g03c6B0C7/4ie6UU6SBklx1v0ZPCP1u0uLgMSTc7tJaGU0WNiT34wC2YMb2YmLf3GoPnPUXk3nsIZhnrfTwXWD8OGQ3+9PSjcivWLSeLfYIx1qv+qEw5SUsQ9NNa0dDaBuPdYIgdDn9H5uGx/g7evW1dY+TOSLn3d9GY/aXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683026545; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gu7vxvZ5ut7SntMoC4haOf2WVE2SH+RaE9TYSeOj0k4=; b=IkUbDb+di/cIT2CYQcDaYdUtbjFcONmqJwqW24v3sRJGqi03bYKIqBaN5QsKeLpOl73gVcHR+57Z7FIqas0CUbnCEw+uuMdSvhnFbWh3uILfx7DWPkT9FjUocw9WPlbjHGf0PHqJ7g4ceZIWLYUW3zBCH69yBXmAk/veYsKwcrI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683026545096918.9796942638285; Tue, 2 May 2023 04:22:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pto3m-0000hO-PJ; Tue, 02 May 2023 07:20:42 -0400 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 1pto3i-0000g2-0g for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:39 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pto3f-0003H3-IQ for qemu-devel@nongnu.org; Tue, 02 May 2023 07:20:37 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f315735514so163912935e9.1 for ; Tue, 02 May 2023 04:20:35 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:ad29:f02c:48a2:269c]) by smtp.gmail.com with ESMTPSA id z16-20020a05600c221000b003ee1b2ab9a0sm35182623wml.11.2023.05.02.04.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 04:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683026432; x=1685618432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gu7vxvZ5ut7SntMoC4haOf2WVE2SH+RaE9TYSeOj0k4=; b=Edcss+wKC/p7Cp4jc4VCicz/kRWA01li9rtoSwMVEeBfueCuslzWtH4uk5tfXfgXcv gIx4r3fR4r3Mdw9Iwj1ZAFmzWHESppHYdzfKhE4LPmRmzQ14FoFoPtyHUxzt9/goj5NU csvtL6oKX9ofdXd4DV19rs0xynqwjaR7E96dZadASjfvdAUuvWB3GOpQpYuDkh9sHRD1 nn96jEwMvQcKyNfQEv63hXqCyCXSu2Y0Jwlc3m7PQk2FkL5TeUaHQ6D7wQ0pPH6TeURF fy/7TGAcm5TgG5PlZvIY5JP4jPqxxiUgpyaYulfxudgCxOC5oi3vH6obJlRZmahRQBgM l9Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683026432; x=1685618432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gu7vxvZ5ut7SntMoC4haOf2WVE2SH+RaE9TYSeOj0k4=; b=T9ng7DZd3l+6TomImyRZoQSqWwT2kHW9NzrTiCpqK62yo7BwqB8B5LCmv7PdVCCEYm ClPfi4t3oh9MShNwxkgal32uIs8hWbHmdYYns9TvoB4zJKoCpKMN16RgLSh9Zg8l6vxJ cGJzayaGpbSv2nPEXGU6TU5gg0wMFYUH9eyYo2+d5EDAW9ZKMLroAm+veJ/1H59gAzXl kLzrtMYfp74e5FBiZ4TU4JMDHODDDhBUytHem/1ad36rOKBil/R5L+nhBEHhoT2nD1Vl SyLjkTRBt78BnrPB2bCaovzwJ4FYJN1bzAT+3aAEiwqc2CfzT2oLsq6/wisSPoLw2YDv urxA== X-Gm-Message-State: AC+VfDwjJheN2XilwQY+e2+9lTBPQFq6SANJPgKHMjD9LaSWJ3u1yqEF UMEpp5bpGic1yDE+yLSTRhjkPiAzihu5WB8Www9YBg== X-Google-Smtp-Source: ACHHUZ7xVyo/Ue7mKWEq/YaU2gRlKg9biOYXjuYwC4sOpSiNXLMA9c5cs39Wc/vUK7ooQazXgT3LjA== X-Received: by 2002:a05:600c:2198:b0:3f2:5be3:cd6b with SMTP id e24-20020a05600c219800b003f25be3cd6bmr11749145wme.3.1683026431938; Tue, 02 May 2023 04:20:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/12] tcg: Introduce tcg_out_movext2 Date: Tue, 2 May 2023 12:20:23 +0100 Message-Id: <20230502112023.776823-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502112023.776823-1-richard.henderson@linaro.org> References: <20230502112023.776823-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x334.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1683026547076100003 This is common code in most qemu_{ld,st} slow paths, moving two registers when there may be overlap between sources and destinations. At present, this is only used by 32-bit hosts for 64-bit data, but will shortly be used for more than that. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/tcg.c | 69 ++++++++++++++++++++++++++++++++++++--- tcg/arm/tcg-target.c.inc | 44 ++++++++++--------------- tcg/i386/tcg-target.c.inc | 19 +++++------ 3 files changed, 90 insertions(+), 42 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index fde5ccc57c..cfd3262a4a 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -115,8 +115,7 @@ static void tcg_out_exts_i32_i64(TCGContext *s, TCGReg = ret, TCGReg arg); static void tcg_out_extu_i32_i64(TCGContext *s, TCGReg ret, TCGReg arg); static void tcg_out_extrl_i64_i32(TCGContext *s, TCGReg ret, TCGReg arg); static void tcg_out_addi_ptr(TCGContext *s, TCGReg, TCGReg, tcg_target_lon= g); -static bool tcg_out_xchg(TCGContext *s, TCGType type, TCGReg r1, TCGReg r2) - __attribute__((unused)); +static bool tcg_out_xchg(TCGContext *s, TCGType type, TCGReg r1, TCGReg r2= ); static void tcg_out_exit_tb(TCGContext *s, uintptr_t arg); static void tcg_out_goto_tb(TCGContext *s, int which); static void tcg_out_op(TCGContext *s, TCGOpcode opc, @@ -354,6 +353,14 @@ void tcg_raise_tb_overflow(TCGContext *s) siglongjmp(s->jmp_trans, -2); } =20 +typedef struct TCGMovExtend { + TCGReg dst; + TCGReg src; + TCGType dst_type; + TCGType src_type; + MemOp src_ext; +} TCGMovExtend; + /** * tcg_out_movext -- move and extend * @s: tcg context @@ -365,9 +372,8 @@ void tcg_raise_tb_overflow(TCGContext *s) * * Move or extend @src into @dst, depending on @src_ext and the types. */ -static void __attribute__((unused)) -tcg_out_movext(TCGContext *s, TCGType dst_type, TCGReg dst, - TCGType src_type, MemOp src_ext, TCGReg src) +static void tcg_out_movext(TCGContext *s, TCGType dst_type, TCGReg dst, + TCGType src_type, MemOp src_ext, TCGReg src) { switch (src_ext) { case MO_UB: @@ -417,6 +423,59 @@ tcg_out_movext(TCGContext *s, TCGType dst_type, TCGReg= dst, } } =20 +/* Minor variations on a theme, using a structure. */ +static void tcg_out_movext1_new_src(TCGContext *s, const TCGMovExtend *i, + TCGReg src) +{ + tcg_out_movext(s, i->dst_type, i->dst, i->src_type, i->src_ext, src); +} + +static void tcg_out_movext1(TCGContext *s, const TCGMovExtend *i) +{ + tcg_out_movext1_new_src(s, i, i->src); +} + +/** + * tcg_out_movext2 -- move and extend two pair + * @s: tcg context + * @i1: first move description + * @i2: second move description + * @scratch: temporary register, or -1 for none + * + * As tcg_out_movext, for both @i1 and @i2, caring for overlap + * between the sources and destinations. + */ + +static void __attribute__((unused)) +tcg_out_movext2(TCGContext *s, const TCGMovExtend *i1, + const TCGMovExtend *i2, int scratch) +{ + TCGReg src1 =3D i1->src; + TCGReg src2 =3D i2->src; + + if (i1->dst !=3D src2) { + tcg_out_movext1(s, i1); + tcg_out_movext1(s, i2); + return; + } + if (i2->dst =3D=3D src1) { + TCGType src1_type =3D i1->src_type; + TCGType src2_type =3D i2->src_type; + + if (tcg_out_xchg(s, MAX(src1_type, src2_type), src1, src2)) { + /* The data is now in the correct registers, now extend. */ + src1 =3D i2->src; + src2 =3D i1->src; + } else { + tcg_debug_assert(scratch >=3D 0); + tcg_out_mov(s, src1_type, scratch, src1); + src1 =3D scratch; + } + } + tcg_out_movext1_new_src(s, i2, src2); + tcg_out_movext1_new_src(s, i1, src1); +} + #define C_PFX1(P, A) P##A #define C_PFX2(P, A, B) P##A##_##B #define C_PFX3(P, A, B, C) P##A##_##B##_##C diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 8d769ca0a2..83c818a58b 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -1545,7 +1545,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool i= s_ld, MemOpIdx oi, =20 static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) { - TCGReg argreg, datalo, datahi; + TCGReg argreg; MemOpIdx oi =3D lb->oi; MemOp opc =3D get_memop(oi); =20 @@ -1565,22 +1565,16 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s= , TCGLabelQemuLdst *lb) /* Use the canonical unsigned helpers and minimize icache usage. */ tcg_out_call_int(s, qemu_ld_helpers[opc & MO_SIZE]); =20 - datalo =3D lb->datalo_reg; - datahi =3D lb->datahi_reg; if ((opc & MO_SIZE) =3D=3D MO_64) { - if (datalo !=3D TCG_REG_R1) { - tcg_out_mov_reg(s, COND_AL, datalo, TCG_REG_R0); - tcg_out_mov_reg(s, COND_AL, datahi, TCG_REG_R1); - } else if (datahi !=3D TCG_REG_R0) { - tcg_out_mov_reg(s, COND_AL, datahi, TCG_REG_R1); - tcg_out_mov_reg(s, COND_AL, datalo, TCG_REG_R0); - } else { - tcg_out_mov_reg(s, COND_AL, TCG_REG_TMP, TCG_REG_R0); - tcg_out_mov_reg(s, COND_AL, datahi, TCG_REG_R1); - tcg_out_mov_reg(s, COND_AL, datalo, TCG_REG_TMP); - } + TCGMovExtend ext[2] =3D { + { .dst =3D lb->datalo_reg, .dst_type =3D TCG_TYPE_I32, + .src =3D TCG_REG_R0, .src_type =3D TCG_TYPE_I32, .src_ext = =3D MO_UL }, + { .dst =3D lb->datahi_reg, .dst_type =3D TCG_TYPE_I32, + .src =3D TCG_REG_R1, .src_type =3D TCG_TYPE_I32, .src_ext = =3D MO_UL }, + }; + tcg_out_movext2(s, &ext[0], &ext[1], TCG_REG_TMP); } else { - tcg_out_movext(s, TCG_TYPE_I32, datalo, + tcg_out_movext(s, TCG_TYPE_I32, lb->datalo_reg, TCG_TYPE_I32, opc & MO_SSIZE, TCG_REG_R0); } =20 @@ -1663,17 +1657,15 @@ static bool tcg_out_fail_alignment(TCGContext *s, T= CGLabelQemuLdst *l) =20 if (TARGET_LONG_BITS =3D=3D 64) { /* 64-bit target address is aligned into R2:R3. */ - if (l->addrhi_reg !=3D TCG_REG_R2) { - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R2, l->addrlo_reg); - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R3, l->addrhi_reg); - } else if (l->addrlo_reg !=3D TCG_REG_R3) { - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R3, l->addrhi_reg); - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R2, l->addrlo_reg); - } else { - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R1, TCG_REG_R2); - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R2, TCG_REG_R3); - tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R3, TCG_REG_R1); - } + TCGMovExtend ext[2] =3D { + { .dst =3D TCG_REG_R2, .dst_type =3D TCG_TYPE_I32, + .src =3D l->addrlo_reg, + .src_type =3D TCG_TYPE_I32, .src_ext =3D MO_UL }, + { .dst =3D TCG_REG_R3, .dst_type =3D TCG_TYPE_I32, + .src =3D l->addrhi_reg, + .src_type =3D TCG_TYPE_I32, .src_ext =3D MO_UL }, + }; + tcg_out_movext2(s, &ext[0], &ext[1], TCG_REG_TMP); } else { tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R1, l->addrlo_reg); } diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index c8e2bf537f..caf91a3151 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -1914,7 +1914,6 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, = TCGLabelQemuLdst *l) { MemOpIdx oi =3D l->oi; MemOp opc =3D get_memop(oi); - TCGReg data_reg; tcg_insn_unit **label_ptr =3D &l->label_ptr[0]; =20 /* resolve label address */ @@ -1951,18 +1950,16 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s= , TCGLabelQemuLdst *l) =20 tcg_out_branch(s, 1, qemu_ld_helpers[opc & (MO_BSWAP | MO_SIZE)]); =20 - data_reg =3D l->datalo_reg; if (TCG_TARGET_REG_BITS =3D=3D 32 && (opc & MO_SIZE) =3D=3D MO_64) { - if (data_reg =3D=3D TCG_REG_EDX) { - /* xchg %edx, %eax */ - tcg_out_opc(s, OPC_XCHG_ax_r32 + TCG_REG_EDX, 0, 0, 0); - tcg_out_mov(s, TCG_TYPE_I32, l->datahi_reg, TCG_REG_EAX); - } else { - tcg_out_mov(s, TCG_TYPE_I32, data_reg, TCG_REG_EAX); - tcg_out_mov(s, TCG_TYPE_I32, l->datahi_reg, TCG_REG_EDX); - } + TCGMovExtend ext[2] =3D { + { .dst =3D l->datalo_reg, .dst_type =3D TCG_TYPE_I32, + .src =3D TCG_REG_EAX, .src_type =3D TCG_TYPE_I32, .src_ext = =3D MO_UL }, + { .dst =3D l->datahi_reg, .dst_type =3D TCG_TYPE_I32, + .src =3D TCG_REG_EDX, .src_type =3D TCG_TYPE_I32, .src_ext = =3D MO_UL }, + }; + tcg_out_movext2(s, &ext[0], &ext[1], -1); } else { - tcg_out_movext(s, l->type, data_reg, + tcg_out_movext(s, l->type, l->datalo_reg, TCG_TYPE_REG, opc & MO_SSIZE, TCG_REG_EAX); } =20 --=20 2.34.1