From patchwork Thu Feb 15 17:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 772916 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp953492wre; Thu, 15 Feb 2024 09:37:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWeMYhzoUZWyfaBgSWU+2tPtEoLGeUQe79RoA9j5HiDwnQjOjsf6RZmM28zURCGBaDvKqKNeOiN6+HmN6lYja7X X-Google-Smtp-Source: AGHT+IFFJ4hBYfWm0yWb6zhpvlT9MP8/y0rV7Qwg6QWa10zTwx9QZ8djvmbP38v+d57IqvzOMPj9 X-Received: by 2002:a05:6214:d04:b0:68c:88fd:d3f2 with SMTP id 4-20020a0562140d0400b0068c88fdd3f2mr2712412qvh.50.1708018641993; Thu, 15 Feb 2024 09:37:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708018641; cv=none; d=google.com; s=arc-20160816; b=r0fUQp/i0k6oXJAujhKpungsMMzdf4jcCmkmNeHFLZk8lDzbmX7JnpHYzekj+uUrUj ABMdrCxFockZlUxUu5cnC8ufAWNMuhjMqXSZiiSyBBzs0QMk4nfUmMq6iyha1oaYQOI7 XuXAOUxlI6sLVFJoDADC3i8LCYekBlRinmACwZX5NtbM+OjaGH224iB3nhoKNor6pvYz lnKy/tMYZ+KRMhFVSOUZV+U2Um8eCFf6NA40UF5G/VdwV0LYmBO3dJyAnpKX8FkdglqH B3zlPV13lgUztmqsVzczChU6RRiCPFQWuiUtbkY7yJbv1dgwpWAEHTmR0wUejBjgyhrs u5Yw== 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=TassmDQS2xUU17ReJTizyCAFvJvV6adrKf1jGt4S91Q=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ggK4IP9hymy1+ICAI68zwBuaCW82YCTLafKMYqqLUAYIyTIuN2igOqavMN+fE4f+UO LkRgsC35VTzHK42T3KbIvDK5xchLXraeCWnK0fuaWi3B/P5rC2yDqWwYjeK/qGrNDfTM WNtgDQ88SApdK+Joki4Fk1DFX9UaxX1Mb/KnYMUGpg+T6G4dWi+A7SQUpKCv5wiJXaAr egIpCA7YPw1K9XriSfzrDcWYIN6+N6eABXKxpUzxqEmhnbX4tGe5RSazePdo2LeUoYzt w/yiuK+0tvBZQyh3tGlE16dXXH1dB1egPzcz+pEpECGbNlDI9eZGxOjlSH7oKQBBRM+v G+0g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aP1bQvU7; 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 f3-20020a056214076300b0068ce43ee177si1938853qvz.258.2024.02.15.09.37.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 09:37:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aP1bQvU7; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raffF-0001ur-Ue; Thu, 15 Feb 2024 12:36:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rafeE-0007vA-9L for qemu-devel@nongnu.org; Thu, 15 Feb 2024 12:35:46 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rafeB-0003ug-QE for qemu-devel@nongnu.org; Thu, 15 Feb 2024 12:35:45 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33aeb088324so614875f8f.2 for ; Thu, 15 Feb 2024 09:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708018542; x=1708623342; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TassmDQS2xUU17ReJTizyCAFvJvV6adrKf1jGt4S91Q=; b=aP1bQvU76DgjpXkuwASmRMv9AmvgmcFi5jV5g9wj8G09ZtoMZG8zYTgbR9M4zzNjuR KsgnjkE+/YJ4uZMLxJkgg6bErgZrGy0rPBvxDm4nzYGsFfuY3DM6gcdtWOvO9/7kBtOi pDcEjSkVLiawz7cTzxnYrhNio6ezNMWT9RvB7ruaBl+D9RThzRwq/NiI6MkVhQbWOi49 9oOOnCUCk5BVc2Nq3YrqR8WAnIa8WSOaHm7rUbpDeadAfIBZBi3DJOpGNn4jqr6byHDb QND2fN/Rg1zrbieu4Dg5kWq7qC0yk4Rj88eZcZ9lxcZUSSb1fpeWt4CgJgILVHFCGwex yI7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708018542; x=1708623342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TassmDQS2xUU17ReJTizyCAFvJvV6adrKf1jGt4S91Q=; b=VHVNYK9tUYCsl3E71ZRt/lE65nisO+rGWG2MI/SK1fjtKgX2zqslVOpdDd7H7f1n7t nLE8V2L4b2qzL0uX2phs6aKEQt0U81Bk90xk82EMRESD3B8lM8tRYifoU+ZieOC7lb6Y 4ipPWYD9xisxwSFWVm7FxwGUqlrK2vZBWWZTFnwxqfKXTQ53/oD23LUsKR2ke0rYVK5X 2xHWpyO3rhNnveptILe4SxiVT8ZDOFuc+xo4jXrVId+r2orKZ+lEjBphITSDeX9NIn33 rwV2fuNayNw052CA2OVcn6sAXugKWCkNMzzaxfv1PuLVX7H0ofh8x5uj//0zc8n29UAX Axwg== X-Gm-Message-State: AOJu0YxK/8OZ9HuscH8OLVJAqqS5MuXPadiM7dAu5k9Y3L9vVX20iBtJ tpmlmwT1JVcbKd+9zHXetFVr/izWpS1t6X+btJbkcEeXkZpDMXd8lWfvCMtJ29E/CA5AnsVIImb 6 X-Received: by 2002:adf:fd43:0:b0:33c:efad:c6a2 with SMTP id h3-20020adffd43000000b0033cefadc6a2mr1870678wrs.61.1708018542363; Thu, 15 Feb 2024 09:35:42 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id q16-20020adfea10000000b0033cfa00e497sm2384129wrm.64.2024.02.15.09.35.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 09:35:42 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/35] target/arm: Handle mte in do_ldrq, do_ldro Date: Thu, 15 Feb 2024 17:35:09 +0000 Message-Id: <20240215173538.2430599-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240215173538.2430599-1-peter.maydell@linaro.org> References: <20240215173538.2430599-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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-bounces+patch=linaro.org@nongnu.org From: Richard Henderson These functions "use the standard load helpers", but fail to clean_data_tbi or populate mtedesc. Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Tested-by: Gustavo Romero Message-id: 20240207025210.8837-6-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/translate-sve.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 508f7b6bbdc..ada05aa5302 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -4861,8 +4861,13 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) unsigned vsz = vec_full_reg_size(s); TCGv_ptr t_pg; int poff; + uint32_t desc; /* Load the first quadword using the normal predicated load helpers. */ + if (!s->mte_active[0]) { + addr = clean_data_tbi(s, addr); + } + poff = pred_full_reg_offset(s, pg); if (vsz > 16) { /* @@ -4886,7 +4891,8 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) gen_helper_gvec_mem *fn = ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][0]; - fn(tcg_env, t_pg, addr, tcg_constant_i32(simd_desc(16, 16, zt))); + desc = make_svemte_desc(s, 16, 1, dtype_msz(dtype), false, zt); + fn(tcg_env, t_pg, addr, tcg_constant_i32(desc)); /* Replicate that first quadword. */ if (vsz > 16) { @@ -4929,6 +4935,7 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) unsigned vsz_r32; TCGv_ptr t_pg; int poff, doff; + uint32_t desc; if (vsz < 32) { /* @@ -4941,6 +4948,9 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) } /* Load the first octaword using the normal predicated load helpers. */ + if (!s->mte_active[0]) { + addr = clean_data_tbi(s, addr); + } poff = pred_full_reg_offset(s, pg); if (vsz > 32) { @@ -4965,7 +4975,8 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype) gen_helper_gvec_mem *fn = ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][0]; - fn(tcg_env, t_pg, addr, tcg_constant_i32(simd_desc(32, 32, zt))); + desc = make_svemte_desc(s, 32, 1, dtype_msz(dtype), false, zt); + fn(tcg_env, t_pg, addr, tcg_constant_i32(desc)); /* * Replicate that first octaword.