From nobody Thu Apr 25 20:01:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610519363; cv=none; d=zohomail.com; s=zohoarc; b=kok3gSXw4Wn+lcXD7MBEOBPxLJSqUwAsqjrmHW/w9JY0yBToZS0LDRDUwM313SDmMgzKpJ2ysWtcvi08vtso0+1RgE70fuOsfrpmz1VNLthYDHMKPJslV/xoSHOD7JvwJVulrmM5RXhh8QP5e7YTCBRdl1eQpKhG5repmekJbqs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610519363; 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=T7qIiA2TxHKspGb/1E//xY6dg2vkOf+MJQ6vthvW+io=; b=a/2Z/Ishr0wpvhs6q5DNKNiGn4vT1NlgLlAStIxWXbUW9pGPSSRRlWgZcIIZbDIyLCyplteB7/Zwf9sc1rDcGHyHi9jp8P80aQ4z97q9lGf7xFpAdfO1FDTQy9PB+QCC81+qp2L6IosEjQ17Kx+OmqYD9kdzhp8bHpOJX4kbdZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610519363714333.35723061263025; Tue, 12 Jan 2021 22:29:23 -0800 (PST) Received: from localhost ([::1]:37888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzZek-000603-JZ for importer@patchew.org; Wed, 13 Jan 2021 01:29:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzZcS-0003xr-T3 for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:00 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:36721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzZcP-0007E0-QU for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:00 -0500 Received: by mail-pj1-x1032.google.com with SMTP id l23so527195pjg.1 for ; Tue, 12 Jan 2021 22:26:57 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id k25sm1138241pfi.10.2021.01.12.22.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 22:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T7qIiA2TxHKspGb/1E//xY6dg2vkOf+MJQ6vthvW+io=; b=jJ6Ws/2w+p97yRAO18F8fzwrOqQQ6U4ayRQ1xdosoE51b9ptNJpM7p5cNKpPHd/Uaw iTKtxO7cjcceaLErOI3OJdGAv8vLmPaatOKufTaziBwKDNfucPj1TPsDtINPwc59Fk0p n6bl/g6vny2kgpSIy0elhzMF/6S8slJO2RgkKWv2Wf1CXD/1cO5KUwSgkYcQrcCL1RBZ UiTkzaOoEbVOSxaK7A+smRTJzrRbpoGTiQMRTcdH+q2Y9tscpgJ6awPjjZuRj5Ib8iFA v2Bf4wQOWP5A4Dd1rOo5dqtIsfrYPIjm051xp+bFYJrPdINZYfCe+ENPL4mwy6yM6M0m 2eDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T7qIiA2TxHKspGb/1E//xY6dg2vkOf+MJQ6vthvW+io=; b=JyuCh2bKB60cZ3mr+Y8W5oQZ86b6TMI4H/+bEp+trXilSWghCloNLx6CvAuWgwJIA4 3u6DHwAGJwNcRLNSGQWylw1SJy9bpjS/2TssQxOHR/1sM5MugNAgNv1QqqDDD+2bFqjj sgrBNK1IhMgcuRT02pVorBByOnMI4h6VA76bDw1ajJaJuOmrc7rRqDSrLHdq50LI5Rzh a4uys9jMN2CdYtQJlvO3KhjphlUM9C9stffDk9tY0gmM/OkYMD2WTIHnnYvHGOCD6Rx9 5OXo2SQVu45HTR2Bzfk/v+kLEb9zROp/xibLv3iLResAEp2+dJkSWbkj/Xo1XZafmLQK NuCw== X-Gm-Message-State: AOAM533yylCv1r9+Am86rY4TzX4PjDigHqc+HlQvMReBZxpdcQymkJqF xIfNlReGc3SgjbkX3/N4AQh4B8AIJC35zw== X-Google-Smtp-Source: ABdhPJySOjoSdSkOddebQ9jRoh2vOew+nxXFmTuaY9O89tkQKiI5UR12RJ1uw7nTR59HoYsuuCJD9Q== X-Received: by 2002:a17:90b:128a:: with SMTP id fw10mr594858pjb.113.1610519216224; Tue, 12 Jan 2021 22:26:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] target/arm: Introduce PREDDESC field definitions Date: Tue, 12 Jan 2021 20:26:47 -1000 Message-Id: <20210113062650.593824-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113062650.593824-1-richard.henderson@linaro.org> References: <20210113062650.593824-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=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" SVE predicate operations cannot use the "usual" simd_desc encoding, because the lengths are not a multiple of 8. But we were abusing the SIMD_* fields to store values anyway. This abuse broke when SIMD_OPRSZ_BITS was modified in e2e7168a214. Introduce a new set of field definitions for exclusive use of predicates, so that it is obvious what kind of predicate we are manipulating. To be used in future patches. Cc: qemu-stable@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/internals.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/arm/internals.h b/target/arm/internals.h index 5460678756..73698587d6 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1312,6 +1312,15 @@ void arm_log_exception(int idx); #define LOG2_TAG_GRANULE 4 #define TAG_GRANULE (1 << LOG2_TAG_GRANULE) =20 +/* + * SVE predicates are 1/8 the size of SVE vectors, and cannot use + * the same simd_desc() encoding due to restrictions on size. + * Use these instead. + */ +FIELD(PREDDESC, OPRSZ, 0, 6) +FIELD(PREDDESC, ESZ, 6, 2) +FIELD(PREDDESC, DATA, 8, 24) + /* * The SVE simd_data field, for memory ops, contains either * rd (5 bits) or a shift count (2 bits). --=20 2.25.1 From nobody Thu Apr 25 20:01:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610519348; cv=none; d=zohomail.com; s=zohoarc; b=b0UmR6Lpjtqji6hnFItmXgDxFBKkmFHzFiklAZVysMTgIny7cYMVkGIqp5lwNZBm+u2QRXjBDU0E554ROanzIbaC1dWlCdkvWv9br3nPz9gppNCRXEpKDZ1+zEs8r7sVvJUBL4jvYjwFE7VpyVklXmN+RNSsvpOqEZOT+SalpqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610519348; 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=Bymuml46Yty0XlvbocAimuoupZdaZklTevSIO7jJc+s=; b=YYYyVzkh4wETaYaFLOpI19sK/fcPj69Kz9Ykr1oKEt0KIXo4ip4PBx0+xL3eD3Fe5iMOOqTtxpEuUgNjltQmYPLYyWNS7GTtNqxkJvDdXBeRL9LxmzCYi+pxA3IivuDUi4M2m2StrqQi3eZa4Y56NfSw34Q1Mn7NvhohGOknJhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610519348170351.38238024336306; Tue, 12 Jan 2021 22:29:08 -0800 (PST) Received: from localhost ([::1]:37324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzZeV-0005mN-4G for importer@patchew.org; Wed, 13 Jan 2021 01:29:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzZcT-0003zW-Kr for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:01 -0500 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:36723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzZcR-0007Fn-ON for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:01 -0500 Received: by mail-pj1-x1034.google.com with SMTP id l23so527265pjg.1 for ; Tue, 12 Jan 2021 22:26:59 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id k25sm1138241pfi.10.2021.01.12.22.26.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 22:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bymuml46Yty0XlvbocAimuoupZdaZklTevSIO7jJc+s=; b=SLvo5rb1waFxld5OxOq7nLR4coQIkwbEOsB7CG7Fchnh319qiSmJbHx9X6MgtCNS2A zKomWxBC6QjE8ytjGeCpJPUXVxrXj05Jllb84wuQdbM+1ELUeoF1/uSnwbtmGtuZRKK9 +MEQtFCGkKaVDKx1YGp5JjmwaUwYPTFB5VFriuhUuHujagT/Ust76mB+ziCq7kWRXbLh 5rtRFDCh2PHKoOc8n/5w/ZK1r78Pz/vXbHUwcQvEfBZei+8oXoPPBenQCaLWzQFTkKLJ SURrICOfrOSruaMQuRwyugYHKMsQaTJfKhb4djXeCjNU7koRE9X16QjWHK7MxmSqz9t2 ljXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bymuml46Yty0XlvbocAimuoupZdaZklTevSIO7jJc+s=; b=FKJgTZ8hBg7JEuTwyXfyeave6yPYBTS51hyxUIJTOrO20t3g6wWZ2faAyItAC+l4ck 3130R8DpQHixhSgB4nbom7lvK5mCX5SLRbTLfuevTf8sW5kM7yJMqrKeMJdMf6B6lCdh 3pviE3uoJCduRClKVKG7epp2X2cEXeOljezziZ/o5MAwr54AIlVwjrDMIX1o6/tsFCQ6 fa3F2Mosm0Bp4LGA8pdoPUWWCJRz/sVt2+R3h4k6S1GNtu07A1Szfu6j9qn/r9nQBrEw T3e0AnhF4SkYfZcmVnfMAUQwRYwkXEG3m8iNxfEiLm0gZEmWTH1mQvXN/07fgueu3Y5i hhJA== X-Gm-Message-State: AOAM5307SSu4DHFlZHzBATu3rYnKdcTx9q8f/XxiDXF9ulnNbPzflu+E uTxyxXxLpD8yHg08CgFMFRGsrtykIFiLQQ== X-Google-Smtp-Source: ABdhPJxI9KXtJOV/Ozelg9E1nhe3CmtOiXU6WGaN1dmmo0Lw/n3+0uVUVqLWYSQ2s45SjSbx2i2qKw== X-Received: by 2002:a17:90a:4dcd:: with SMTP id r13mr652743pjl.74.1610519218183; Tue, 12 Jan 2021 22:26:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] target/arm: Update PFIRST, PNEXT for pred_desc Date: Tue, 12 Jan 2021 20:26:48 -1000 Message-Id: <20210113062650.593824-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113062650.593824-1-richard.henderson@linaro.org> References: <20210113062650.593824-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=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" These two were odd, in that do_pfirst_pnext passed the count of 64-bit words rather than bytes. Change to pass the standard pred_full_reg_size to avoid confusion. Cc: qemu-stable@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/sve_helper.c | 7 ++++--- target/arm/translate-sve.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 5f037c3a8f..ff01851bf2 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -889,8 +889,9 @@ static intptr_t last_active_element(uint64_t *g, intptr= _t words, intptr_t esz) return (intptr_t)-1 << esz; } =20 -uint32_t HELPER(sve_pfirst)(void *vd, void *vg, uint32_t words) +uint32_t HELPER(sve_pfirst)(void *vd, void *vg, uint32_t pred_desc) { + intptr_t words =3D DIV_ROUND_UP(FIELD_EX32(pred_desc, PREDDESC, OPRSZ)= , 8); uint32_t flags =3D PREDTEST_INIT; uint64_t *d =3D vd, *g =3D vg; intptr_t i =3D 0; @@ -914,8 +915,8 @@ uint32_t HELPER(sve_pfirst)(void *vd, void *vg, uint32_= t words) =20 uint32_t HELPER(sve_pnext)(void *vd, void *vg, uint32_t pred_desc) { - intptr_t words =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS); - intptr_t esz =3D extract32(pred_desc, SIMD_DATA_SHIFT, 2); + intptr_t words =3D DIV_ROUND_UP(FIELD_EX32(pred_desc, PREDDESC, OPRSZ)= , 8); + intptr_t esz =3D FIELD_EX32(pred_desc, PREDDESC, ESZ); uint32_t flags =3D PREDTEST_INIT; uint64_t *d =3D vd, *g =3D vg, esz_mask; intptr_t i, next; diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 0c3a6d2121..efcb646f72 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -1494,10 +1494,10 @@ static bool do_pfirst_pnext(DisasContext *s, arg_rr= _esz *a, TCGv_ptr t_pd =3D tcg_temp_new_ptr(); TCGv_ptr t_pg =3D tcg_temp_new_ptr(); TCGv_i32 t; - unsigned desc; + unsigned desc =3D 0; =20 - desc =3D DIV_ROUND_UP(pred_full_reg_size(s), 8); - desc =3D deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz); + desc =3D FIELD_DP32(desc, PREDDESC, OPRSZ, pred_full_reg_size(s)); + desc =3D FIELD_DP32(desc, PREDDESC, ESZ, a->esz); =20 tcg_gen_addi_ptr(t_pd, cpu_env, pred_full_reg_offset(s, a->rd)); tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, a->rn)); --=20 2.25.1 From nobody Thu Apr 25 20:01:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610519517; cv=none; d=zohomail.com; s=zohoarc; b=dML2GQPN+icLGsuUUFs71jld8mQW7K+Gsy3CUbP8bJbf211di1Dw/yjg9Zbdar1fSW/KmnZsW6dtGMpcjkEPNdOXF6TsQoYmWL9yz8mN58HT94BlvkMXHSMsfubSKpWmE1qf4yw+QAByo/WQGzCI91CLWwgC3yUzzaHYBfDEF84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610519517; 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=x4WrRc9ij8plFlXKBhz8CZ+MgZnj8Yfv6pjE6AqRZ6g=; b=mCVPx7AnD/WHm+Odg+3Y47Wme3RywWVl8fr2XVVlXoYMPRMcdlWHj10yIU23jwPqTiKHz7FESKsovnRkm/KzwVoZD6UhgcryHDAviYiiPFgWFqnMgF55zTqbYVKvXp/SVRbFkx05Vty7IlouedzbOQVoA1A3lSCVvkJCe+REPCs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161051951701373.56772478916014; Tue, 12 Jan 2021 22:31:57 -0800 (PST) Received: from localhost ([::1]:43266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzZhD-0008BX-TV for importer@patchew.org; Wed, 13 Jan 2021 01:31:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzZcV-00044R-Cl for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:03 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:36713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzZcT-0007Gc-Nw for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:03 -0500 Received: by mail-pj1-x1029.google.com with SMTP id l23so527301pjg.1 for ; Tue, 12 Jan 2021 22:27:01 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id k25sm1138241pfi.10.2021.01.12.22.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 22:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x4WrRc9ij8plFlXKBhz8CZ+MgZnj8Yfv6pjE6AqRZ6g=; b=nJM4gqhYgtmaC3mmYOj0THdAIZ6sxtk2gDtMpmCvv9saWJ8axHkBLwuy05tR62vK6W 63x+Df30JNOouWr2GWWZ/RdNg4d9NpTeLif/hK/tXXPKnZQLwsQt95JFUzdUtAzsoPpJ J6t8FUKPdxliN1DChKYdt0B8yJLLRgVq3SzKyxBt7J31bc3ELg4XN0ZRtbryiq1xyPSe 0ehhpWHuwRzaHWn/MGMt0VDvYDLMRTdTpfbPQ/xVl6Hce6y/Um7Z1fk+HXFYCkOo4th1 vP+naLf/UFicY5yPbfP8g58GGBS4idSC1bBfweJVBEgqVE1TLF7AQ0hTQh58tRBXfD5A e7eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x4WrRc9ij8plFlXKBhz8CZ+MgZnj8Yfv6pjE6AqRZ6g=; b=R+D/0MF7Ka9Xieh+Rdxv2J1FonDjAW25Qcip2f1W5/n8TKqSjHh5w0D2gbSsMMK1+i TUYKJCgdtPJOC1xqywa8PQanJ4IlKRioXkm+nR4HUWGgxPcH84f/j9QOODBbKsG38ws2 SVhPhmvQEi7jK16Hrb/pgSphTX8iNxk7zc+ihDRrArCs8152+b4mDQGmwvsUSlsHX1Nu MB2zOj/cJWqU7uNK2Z+oR5FtdOp85NINukG2PoDDd749t/vUJC7/a81W6mH9lpcgCeRs PZLQESw5wINmzJeduMu/WhwFDoV/HYVANz+Q1ypacR88TUtOJTolqqeZMx7ASY10EvcY ExAg== X-Gm-Message-State: AOAM533upqpS2D0kuYauqWv0830PNBtE/yMpsqzQPXkCEW0yKALKhwFg p10IAPiY4BiSXkB2k0/EmOXq+FZe0cygPQ== X-Google-Smtp-Source: ABdhPJxy0KsDEXRmX4mT65DbzB0XfknfDLfIsoxd5Rbdv868LMqBAZ8af3Ee8Jvqzoqz6eiLj4RNaQ== X-Received: by 2002:a17:90a:9304:: with SMTP id p4mr620365pjo.220.1610519220050; Tue, 12 Jan 2021 22:27:00 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] target/arm: Update ZIP, UZP, TRN for pred_desc Date: Tue, 12 Jan 2021 20:26:49 -1000 Message-Id: <20210113062650.593824-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113062650.593824-1-richard.henderson@linaro.org> References: <20210113062650.593824-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=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Update all users of do_perm_pred3 for the new predicate descriptor field definitions. Cc: qemu-stable@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/sve_helper.c | 18 +++++++++--------- target/arm/translate-sve.c | 12 ++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index ff01851bf2..7eec4b6b73 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -1868,9 +1868,9 @@ static uint64_t compress_bits(uint64_t x, int n) =20 void HELPER(sve_zip_p)(void *vd, void *vn, void *vm, uint32_t pred_desc) { - intptr_t oprsz =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; - int esz =3D extract32(pred_desc, SIMD_DATA_SHIFT, 2); - intptr_t high =3D extract32(pred_desc, SIMD_DATA_SHIFT + 2, 1); + intptr_t oprsz =3D FIELD_EX32(pred_desc, PREDDESC, OPRSZ); + int esz =3D FIELD_EX32(pred_desc, PREDDESC, ESZ); + intptr_t high =3D FIELD_EX32(pred_desc, PREDDESC, DATA); uint64_t *d =3D vd; intptr_t i; =20 @@ -1929,9 +1929,9 @@ void HELPER(sve_zip_p)(void *vd, void *vn, void *vm, = uint32_t pred_desc) =20 void HELPER(sve_uzp_p)(void *vd, void *vn, void *vm, uint32_t pred_desc) { - intptr_t oprsz =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; - int esz =3D extract32(pred_desc, SIMD_DATA_SHIFT, 2); - int odd =3D extract32(pred_desc, SIMD_DATA_SHIFT + 2, 1) << esz; + intptr_t oprsz =3D FIELD_EX32(pred_desc, PREDDESC, OPRSZ); + int esz =3D FIELD_EX32(pred_desc, PREDDESC, ESZ); + int odd =3D FIELD_EX32(pred_desc, PREDDESC, DATA) << esz; uint64_t *d =3D vd, *n =3D vn, *m =3D vm; uint64_t l, h; intptr_t i; @@ -1986,9 +1986,9 @@ void HELPER(sve_uzp_p)(void *vd, void *vn, void *vm, = uint32_t pred_desc) =20 void HELPER(sve_trn_p)(void *vd, void *vn, void *vm, uint32_t pred_desc) { - intptr_t oprsz =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; - uintptr_t esz =3D extract32(pred_desc, SIMD_DATA_SHIFT, 2); - bool odd =3D extract32(pred_desc, SIMD_DATA_SHIFT + 2, 1); + intptr_t oprsz =3D FIELD_EX32(pred_desc, PREDDESC, OPRSZ); + int esz =3D FIELD_EX32(pred_desc, PREDDESC, ESZ); + int odd =3D FIELD_EX32(pred_desc, PREDDESC, DATA); uint64_t *d =3D vd, *n =3D vn, *m =3D vm; uint64_t mask; int shr, shl; diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index efcb646f72..0baca176a0 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -2110,19 +2110,15 @@ static bool do_perm_pred3(DisasContext *s, arg_rrr_= esz *a, bool high_odd, =20 unsigned vsz =3D pred_full_reg_size(s); =20 - /* Predicate sizes may be smaller and cannot use simd_desc. - We cannot round up, as we do elsewhere, because we need - the exact size for ZIP2 and REV. We retain the style for - the other helpers for consistency. */ TCGv_ptr t_d =3D tcg_temp_new_ptr(); TCGv_ptr t_n =3D tcg_temp_new_ptr(); TCGv_ptr t_m =3D tcg_temp_new_ptr(); TCGv_i32 t_desc; - int desc; + uint32_t desc =3D 0; =20 - desc =3D vsz - 2; - desc =3D deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz); - desc =3D deposit32(desc, SIMD_DATA_SHIFT + 2, 2, high_odd); + desc =3D FIELD_DP32(desc, PREDDESC, OPRSZ, vsz); + desc =3D FIELD_DP32(desc, PREDDESC, ESZ, a->esz); + desc =3D FIELD_DP32(desc, PREDDESC, DATA, high_odd); =20 tcg_gen_addi_ptr(t_d, cpu_env, pred_full_reg_offset(s, a->rd)); tcg_gen_addi_ptr(t_n, cpu_env, pred_full_reg_offset(s, a->rn)); --=20 2.25.1 From nobody Thu Apr 25 20:01:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610519647; cv=none; d=zohomail.com; s=zohoarc; b=NuiS2/AF9nsASMqQkOPzkTNYBIjCq4Vw4lXT/iYDX1Xe7JKy33qOne5qEUEsWcUePBXbSGGmkDUo6GbBmGIBnOTbcTOYDQIoBBC9xYrsv4ZQMBRv3dZgy+hc4YuBzh01wYU7woqFhPKBPrYeVZYscWrKOXIhWsFLxvCj0tlY9No= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610519647; 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=YbAy4KVm8LZdofZcsXyEMftLzbs/6FHl1IDz/kaEGZA=; b=X/Vy9vNZLTLOgd2hHMaU9lto336pN2SzCRvPc+kysX2j8Ujlg7EzFHTs9j6UQNdDZVHOO6J2SHxcMucB565jLBdh3rzOolZsCqEBR105Bit5xH4BKnzlZatDFp6OmoAMTg6ip/RDPm5SoFklsRAktBWTMzVf9oHrUbzz7XiTZgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610519647342255.17050628978257; Tue, 12 Jan 2021 22:34:07 -0800 (PST) Received: from localhost ([::1]:46792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzZjK-0001Hu-5l for importer@patchew.org; Wed, 13 Jan 2021 01:34:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzZcY-0004DS-Ks for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:06 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:33248) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzZcV-0007Ik-KK for qemu-devel@nongnu.org; Wed, 13 Jan 2021 01:27:06 -0500 Received: by mail-pg1-x534.google.com with SMTP id n25so875282pgb.0 for ; Tue, 12 Jan 2021 22:27:03 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id k25sm1138241pfi.10.2021.01.12.22.27.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 22:27:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YbAy4KVm8LZdofZcsXyEMftLzbs/6FHl1IDz/kaEGZA=; b=giEqWeegyT3S3mL7WsKtn/HvThYJUn9jz6oSMART99yy/X+/8XiS47SFV8WBRJVsYc 1Vm4hMLZYqfikoNB3rCtI42MHrA5loVkfhMf7TFRI6GWzqcTfY0/wyAPrgZhpTTm/JLb gRaZGmIIgJhDMSnNAvY8XeLV8DlEisk31m7kQH+94HrfzByzLnrJ/X9UuNhtVryRQCZH J7ToapLEWf1CgCRLaxMaZTPlWacynJvtRHwFnjPOzkpmpK9mxOPhpPpQajE/uU7kBUjg tJknfaUWa9F4FE3TU4CCmzlpy2EnGomR0GLG2D2ZYEex6Z1mVt6JGY/b6XGeXwMQ3orU hLNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YbAy4KVm8LZdofZcsXyEMftLzbs/6FHl1IDz/kaEGZA=; b=MnMF5JPCxEb4y3jo5ctwYlYeWvoTMHyFUAJWUszGFmsRZo+B9M0Tmnt2ucHbN+uuti tzajYmQgarFERosp7GzVgiiDpR2bsABaxwCxetFlD4Uhbbl4UjyslCQ47m1fcYgG56Iy AFax9Da0AmZHUnFwA0THXByL7uuYsyKMSaNwrFvyul/ox6A6UZcRFJbNi++1mFtfjGV7 NqUs8Ys/ct6g1KcmcaRbUl1KMynzPp/tWMiHHF6mb4ueScxmPnSZGRPV/4jHC5azS/al Tn9BPrxm/UgtRMyc/D7HYJb/0/arlnGLJjXN8j2GvdT2pbg2ncxpYdCSG1QNGKgwRcFd +Bmw== X-Gm-Message-State: AOAM533TkjnNz6tlwQBoF0PFqN15IxfTJMcrMkYkZaMxotKpNXDUwkwz jnzxtZL1Gg2hsV/0NPFS2RVWoO/UD6nPqA== X-Google-Smtp-Source: ABdhPJy2pBBdBDSlTCgHd/B7yU/yWlMGb5HTUak/svwLAal8kfBk1Xw13vos9Uh16vlIVMfE5sTQ8Q== X-Received: by 2002:aa7:904b:0:b029:19e:c8a5:5154 with SMTP id n11-20020aa7904b0000b029019ec8a55154mr640584pfo.41.1610519221930; Tue, 12 Jan 2021 22:27:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] target/arm: Update REV, PUNPK for pred_desc Date: Tue, 12 Jan 2021 20:26:50 -1000 Message-Id: <20210113062650.593824-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113062650.593824-1-richard.henderson@linaro.org> References: <20210113062650.593824-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=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Update all users of do_perm_pred2 for the new predicate descriptor field definitions. Cc: qemu-stable@nongnu.org Buglink: https://bugs.launchpad.net/bugs/1908551 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/sve_helper.c | 8 ++++---- target/arm/translate-sve.c | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 7eec4b6b73..844db08bd5 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -2036,8 +2036,8 @@ static uint8_t reverse_bits_8(uint8_t x, int n) =20 void HELPER(sve_rev_p)(void *vd, void *vn, uint32_t pred_desc) { - intptr_t oprsz =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; - int esz =3D extract32(pred_desc, SIMD_DATA_SHIFT, 2); + intptr_t oprsz =3D FIELD_EX32(pred_desc, PREDDESC, OPRSZ); + int esz =3D FIELD_EX32(pred_desc, PREDDESC, ESZ); intptr_t i, oprsz_2 =3D oprsz / 2; =20 if (oprsz <=3D 8) { @@ -2066,8 +2066,8 @@ void HELPER(sve_rev_p)(void *vd, void *vn, uint32_t p= red_desc) =20 void HELPER(sve_punpk_p)(void *vd, void *vn, uint32_t pred_desc) { - intptr_t oprsz =3D extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; - intptr_t high =3D extract32(pred_desc, SIMD_DATA_SHIFT + 2, 1); + intptr_t oprsz =3D FIELD_EX32(pred_desc, PREDDESC, OPRSZ); + intptr_t high =3D FIELD_EX32(pred_desc, PREDDESC, DATA); uint64_t *d =3D vd; intptr_t i; =20 diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 0baca176a0..27402af23c 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -2145,19 +2145,14 @@ static bool do_perm_pred2(DisasContext *s, arg_rr_e= sz *a, bool high_odd, TCGv_ptr t_d =3D tcg_temp_new_ptr(); TCGv_ptr t_n =3D tcg_temp_new_ptr(); TCGv_i32 t_desc; - int desc; + uint32_t desc =3D 0; =20 tcg_gen_addi_ptr(t_d, cpu_env, pred_full_reg_offset(s, a->rd)); tcg_gen_addi_ptr(t_n, cpu_env, pred_full_reg_offset(s, a->rn)); =20 - /* Predicate sizes may be smaller and cannot use simd_desc. - We cannot round up, as we do elsewhere, because we need - the exact size for ZIP2 and REV. We retain the style for - the other helpers for consistency. */ - - desc =3D vsz - 2; - desc =3D deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz); - desc =3D deposit32(desc, SIMD_DATA_SHIFT + 2, 2, high_odd); + desc =3D FIELD_DP32(desc, PREDDESC, OPRSZ, vsz); + desc =3D FIELD_DP32(desc, PREDDESC, ESZ, a->esz); + desc =3D FIELD_DP32(desc, PREDDESC, DATA, high_odd); t_desc =3D tcg_const_i32(desc); =20 fn(t_d, t_n, t_desc); --=20 2.25.1