From patchwork Thu Jun 9 09:05:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580249 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp606279max; Thu, 9 Jun 2022 02:36:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZBAfpE+8S3quSauRT/CIx0ckTF3hBWh2wC7oqlerR9Q2bTk5HtkQOdrQ0llJXExhkTPna X-Received: by 2002:a05:6214:4101:b0:441:47e5:c718 with SMTP id kc1-20020a056214410100b0044147e5c718mr28897359qvb.12.1654767410253; Thu, 09 Jun 2022 02:36:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654767410; cv=none; d=google.com; s=arc-20160816; b=xmxGHyn8E0bwfMgca2PNH/rYfCpN6vFmfU3ASxeysv7efDLD4OLGkiDRwiSt8JU/E8 k6DKBbfNT6PB1nhGE9coOnXs4GHk+haeZbE/ZrHktG3yB3RWhD80ZjyQxaVUP+FjJPj7 PFvEG1Xvet7/djxfCwRlol5aSTKlDIkIDIAd1fwGBZ+fNUN2OcNWeAWCmcWEPYAwigE6 qDDPtXtcQikCjcfjI8F4XaLGWwdtTbhkrYrVsfKpx/m2VDu90evhZao14ZxwQ8u6z+AL DTR6rNjXnSJzrVkRq0EKRzEyy08wuKkU8iXFauAW8LA9VtsFeCXb7Iq+OWQ5yIxsXwVi Baag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=EuesFPP2ejmD1fMqQKFfEmxikNEPVrFLtiBcjEpaFDk=; b=CoZlprVlKchkcxR6axi4bcg6TJk9xWBck1OFlDwqaVM6X8gVpMrC/nS09d5jNXAjrg 47Kj8G6f9vO8Cusz+BvNUtsOiNPke+W2dPBbVXbBdZBP72tYSMwHgCObuuUx4xHoWVjC wsy45U0582Xa6PgVvLzxQxBOiF+1m9UdOlyC9jpamYn9PPsRep4yv15/F3Tbk3hDYA25 8v5KGIdMvoBw6VJsmL7h0VXr33zjTmvvmQoZnHtSwHPGVBiaxPKVDiFFfOm68Sc1Wlcc jI5vkeQ/X7avgx/ICZXPkEaPw3IStmu1Pfr916bh0Ykx35M6ZDToiyN5LhVHWtX940Ux 3Bbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eMZ6cqXE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i12-20020a05620a248c00b006a73211beabsi340682qkn.262.2022.06.09.02.36.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jun 2022 02:36:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eMZ6cqXE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzEav-0003tW-OG for patch@linaro.org; Thu, 09 Jun 2022 05:36:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE7S-0001ZL-7c for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:22 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzE7Q-0005wl-AN for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:21 -0400 Received: by mail-wr1-x436.google.com with SMTP id k16so31477811wrg.7 for ; Thu, 09 Jun 2022 02:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EuesFPP2ejmD1fMqQKFfEmxikNEPVrFLtiBcjEpaFDk=; b=eMZ6cqXEA7rm1G6az+CJ/89YVforU6AL/xrTqOn7qWmJwniNPn+CQlofDzxNN2gipE AG5aFAwfIqcriNAg+rQc9Ms/vDGMcLiSj5h4wqmenczjxf7MDRBrFmmX6CeO9qXRdddJ okDY+Mn+cNLS6wjXhgz7yZsOHoOvllT7Eb2MOeXHrCP6JIPLkaKgOnQoVFsAjt0HGzo/ zaeTJgtF5XfjUXRzTcm1V4pAV+RiHXVd6QEvjlGEBL02zBmQnk5wJJouZf4+CPpNfni0 Po+tOu/MKA14C/zcl0rJAEXvIuip4uyEWykSrE06CQCeiaKJg6Ma2dlV2FAuJIfegcL4 fusw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EuesFPP2ejmD1fMqQKFfEmxikNEPVrFLtiBcjEpaFDk=; b=Vn0TD4K6+Y8Obbvt7p1p6p0XMHmbZGubdHvzhFnTTEJBXrzGTvIoBVEFHcZAUOWp0V 96ZdlKSpW7MHWr4Pojj/5bJRwso6pZaZug/vANME8qYSfZ31xnOKiJL0aYnS683IcNDx ASZvVhs1/i6P4zVLhOHrs5pouGEp+A9VReAxztNVHtPTn439DjtccoSaCNfVsRjwVwR1 DBrSICvHW7YbYGHu0Ah8hwHIgb07NO5LNXn51iGHliMPVbSeKkEXBfDvSpx+IEolTl02 V+fWsc3r0lUSIkUDIt8GLTiy5X1meRWEP8YivNPbwFxwnGLozclb3waUP2NOueXJo7Ch WiBA== X-Gm-Message-State: AOAM530ruAZXMbj/VO5pnnOa0mH6u/C3DUsYY3ywViDkYjSA/4tPUC34 YHH6Pq4nQCyiwEJlnLl7+bseoBoVUdTiaw== X-Received: by 2002:a05:6000:1547:b0:218:568a:bd2e with SMTP id 7-20020a056000154700b00218568abd2emr10444077wry.716.1654765579600; Thu, 09 Jun 2022 02:06:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002183cf9cd69sm11349796wrr.15.2022.06.09.02.06.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:06:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 36/55] target/arm: Rename TBFLAG_A64 ZCR_LEN to VL Date: Thu, 9 Jun 2022 10:05:18 +0100 Message-Id: <20220609090537.1971756-37-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609090537.1971756-1-peter.maydell@linaro.org> References: <20220609090537.1971756-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson With SME, the vector length does not only come from ZCR_ELx. Comment that this is either NVL or SVL, like the pseudocode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220607203306.657998-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 3 ++- target/arm/translate-a64.h | 2 +- target/arm/translate.h | 2 +- target/arm/helper.c | 2 +- target/arm/translate-a64.c | 2 +- target/arm/translate-sve.c | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 0ee1705a4fa..e791ffdd6b6 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3241,7 +3241,8 @@ FIELD(TBFLAG_M32, MVE_NO_PRED, 5, 1) /* Not cached. */ */ FIELD(TBFLAG_A64, TBII, 0, 2) FIELD(TBFLAG_A64, SVEEXC_EL, 2, 2) -FIELD(TBFLAG_A64, ZCR_LEN, 4, 4) +/* The current vector length, either NVL or SVL. */ +FIELD(TBFLAG_A64, VL, 4, 4) FIELD(TBFLAG_A64, PAUTH_ACTIVE, 8, 1) FIELD(TBFLAG_A64, BT, 9, 1) FIELD(TBFLAG_A64, BTYPE, 10, 2) /* Not cached. */ diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h index f2e8ee0ee1f..dbc917ee65b 100644 --- a/target/arm/translate-a64.h +++ b/target/arm/translate-a64.h @@ -104,7 +104,7 @@ static inline TCGv_ptr vec_full_reg_ptr(DisasContext *s, int regno) /* Return the byte size of the "whole" vector register, VL / 8. */ static inline int vec_full_reg_size(DisasContext *s) { - return s->sve_len; + return s->vl; } bool disas_sve(DisasContext *, uint32_t); diff --git a/target/arm/translate.h b/target/arm/translate.h index 9f0bb270c5b..f473a21ed48 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -42,7 +42,7 @@ typedef struct DisasContext { bool ns; /* Use non-secure CPREG bank on access */ int fp_excp_el; /* FP exception EL or 0 if enabled */ int sve_excp_el; /* SVE exception EL or 0 if enabled */ - int sve_len; /* SVE vector length in bytes */ + int vl; /* current vector length in bytes */ /* Flag indicating that exceptions from secure mode are routed to EL3. */ bool secure_routed_to_el3; bool vfp_enabled; /* FP enabled via FPSCR.EN */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 37cf9fa6aba..c228deca755 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11181,7 +11181,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, zcr_len = sve_zcr_len_for_el(env, el); } DP_TBFLAG_A64(flags, SVEEXC_EL, sve_el); - DP_TBFLAG_A64(flags, ZCR_LEN, zcr_len); + DP_TBFLAG_A64(flags, VL, zcr_len); } sctlr = regime_sctlr(env, stage1); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 935e1929bb9..d438fb89e73 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14608,7 +14608,7 @@ static void aarch64_tr_init_disas_context(DisasContextBase *dcbase, dc->align_mem = EX_TBFLAG_ANY(tb_flags, ALIGN_MEM); dc->pstate_il = EX_TBFLAG_ANY(tb_flags, PSTATE__IL); dc->sve_excp_el = EX_TBFLAG_A64(tb_flags, SVEEXC_EL); - dc->sve_len = (EX_TBFLAG_A64(tb_flags, ZCR_LEN) + 1) * 16; + dc->vl = (EX_TBFLAG_A64(tb_flags, VL) + 1) * 16; dc->pauth_active = EX_TBFLAG_A64(tb_flags, PAUTH_ACTIVE); dc->bt = EX_TBFLAG_A64(tb_flags, BT); dc->btype = EX_TBFLAG_A64(tb_flags, BTYPE); diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 836511d7191..67761bf2cc5 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -111,7 +111,7 @@ static inline int pred_full_reg_offset(DisasContext *s, int regno) /* Return the byte size of the whole predicate register, VL / 64. */ static inline int pred_full_reg_size(DisasContext *s) { - return s->sve_len >> 3; + return s->vl >> 3; } /* Round up the size of a register to a size allowed by