From patchwork Mon May 30 16:06:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 577273 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp435413mag; Mon, 30 May 2022 10:28:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxuL2bpucKbl2cpms71PqfVI01J8wQHkYR6xOZx0Ag5HN1BFszs1twgz0/2jNHo+6IdByWr X-Received: by 2002:a05:6214:5013:b0:464:5348:2ef3 with SMTP id jo19-20020a056214501300b0046453482ef3mr3936143qvb.69.1653931701056; Mon, 30 May 2022 10:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653931701; cv=none; d=google.com; s=arc-20160816; b=Rgkd0gcwR8T5oRnZ1JZerJnjstM2NW8e1KsMipthcGV26KbyHyP3aSrHCC7g2Jd5T4 KE3Tk/N1hqVgq7iDRZBg6lbhL9RtduZuqkCqDK8qxVdVfhcvU8m1YT1Mw2kp1jcvx936 xD8ngAXmQ3YzDsroiUEu399cmQ1CzAfruqKl0yy1aiF2qcjHYvg93xakGM05uV8pYEK1 JCVG9FKTJTy+IUijxmyf9gbwlJ8Rgto+qZk4Ke8/R0hgxAbbOWBuXRiBNie+705fjRhf cd0qwzgO6feXfHHqBigav3TTW1Wy0QnYCbucB3ndKEdw+RDWVb2clMIgvTbF7E2FufXJ o+Fw== 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=ebGGe9LyDpXcGYT3qpOhGNDX6ZvB/bb1IoWjtN9lGi4=; b=GIkZK2qHMPWX38aeClnnhfIraUpKxe3tFQG/sckLKZ/6YWFWCnBtRsXSkFYAFEKZRk ubhl7lhCfrdz+BDc2ZN+Zhv9pPIkWR1MqNtdH4V77CZfGXAVKXoEPETN8AEVNH1+vBmi +X5pF4Ce7jivnzwebg1lvDk+FXJ7xgU24/nncTq5Ts8RUMmL5nmxe5cGjdzfbCbUdk8y NSgosmSIfixVspXWs+UJUQXI1XFwjevYgtkzeKOd8TpyB/lLaPdiLyfeIhFfxvnrziBr H9nKLYCQ6cR2Gg51Jlqhm3iUEhX0++YgE0lwwlrJ5CPYtp0j8FhY9liLzV6/R+YbNUjq xMCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XHWnKUuY; 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 b1-20020a05620a0f8100b0069fc9d0a280si6339211qkn.566.2022.05.30.10.28.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 10:28:21 -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=XHWnKUuY; 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]:54376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvjBk-0004WN-Kg for patch@linaro.org; Mon, 30 May 2022 13:28:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhwb-00044d-VA for qemu-devel@nongnu.org; Mon, 30 May 2022 12:08:38 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:41903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhwQ-0007GW-Hj for qemu-devel@nongnu.org; Mon, 30 May 2022 12:08:37 -0400 Received: by mail-wm1-x333.google.com with SMTP id p5-20020a1c2905000000b003970dd5404dso6724791wmp.0 for ; Mon, 30 May 2022 09:08:25 -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=ebGGe9LyDpXcGYT3qpOhGNDX6ZvB/bb1IoWjtN9lGi4=; b=XHWnKUuYk48kGNFSo0pQOXtsVY2Agf+Cv7umCKAWmlUapXprWQ3lWJpN3BlzYMDPmy FFtG5/NO22AT0GXyczaUaKhmgkQPqHVfLKCwRyekjvOfJX0FDzqz31yXdSL0bzG8ghC1 0I3pGcqFX+Hk/vRI/b+Js+vECvZlDwA85PzVXOMoxTpoZw66SXAEOq2VvxF6vXTrm8x6 /3fVNfoZNahmppw9B6Zs+gfB0Y+8HFTZstL4tS2y+19o/npyhAWS1/9zVMhaOEMIcWc3 c15zT3ly0I8ihMj6tgPbVTPMB0gJZ6R7slE8+KhML3u7dy9S9c3Gl2frJRK0veoCZ+qb DfxA== 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=ebGGe9LyDpXcGYT3qpOhGNDX6ZvB/bb1IoWjtN9lGi4=; b=gMH7bqW1gpLmVU67ThZiIKWvUYLsDw57fg6gT4GZh1tti39De5XDfTamtlHw4u62rE /Vmwk33v9s7+AWP/9sPNiIrKAQsf6uavqI/8y4acRz96yNry1tjsjjx5Nyw5PXZGG5oD fJ/Qlw48FxI3tyXyiYYQ/z8xrExqRR02XehqfpnbpLaXkI7fk37fVMENzcZwZq/hFFaE tv5qaXU0GwusYxKlnTs6kSpDbHbEE2hxiw14EHe3+ed1IvTawN+j+zPAu98TmFtqRD7u biDyJIEhnghrFX1f7XGjt91JV873NcMKAergJJHmGwPSAApDBr+xYsSX0DIpakLMnG+8 SvRA== X-Gm-Message-State: AOAM5309DF04o/tjItuSMjgLRGKQf8CLjdBNMlLopa6MVrJ5WHBGDKoj gSLB045sMMvcEQbJvGcTXRheKoVz2gfVEA== X-Received: by 2002:a05:600c:3d10:b0:397:835e:bf64 with SMTP id bh16-20020a05600c3d1000b00397835ebf64mr18211323wmb.167.1653926904833; Mon, 30 May 2022 09:08:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bi12-20020a05600c3d8c00b003974b95d897sm10232152wmb.37.2022.05.30.09.08.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:08:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 081/117] target/arm: Use TRANS_FEAT for FMMLA Date: Mon, 30 May 2022 17:06:32 +0100 Message-Id: <20220530160708.726466-82-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220530160708.726466-1-peter.maydell@linaro.org> References: <20220530160708.726466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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, 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 Being able to specify the feature predicate in TRANS_FEAT makes it easier to split trans_FMMLA by element size, which also happens to simplify the decode. Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-79-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/sve.decode | 7 +++---- target/arm/translate-sve.c | 27 ++++----------------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 7e79198f5ba..a54feb2f61d 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -1598,10 +1598,9 @@ SQRDCMLAH_zzzz 01000100 esz:2 0 rm:5 0011 rot:2 rn:5 rd:5 ra=%reg_movprfx USDOT_zzzz 01000100 .. 0 ..... 011 110 ..... ..... @rda_rn_rm ### SVE2 floating point matrix multiply accumulate -{ - BFMMLA 01100100 01 1 ..... 111 001 ..... ..... @rda_rn_rm_e0 - FMMLA 01100100 .. 1 ..... 111 001 ..... ..... @rda_rn_rm -} +BFMMLA 01100100 01 1 ..... 111 001 ..... ..... @rda_rn_rm_e0 +FMMLA_s 01100100 10 1 ..... 111 001 ..... ..... @rda_rn_rm_e0 +FMMLA_d 01100100 11 1 ..... 111 001 ..... ..... @rda_rn_rm_e0 ### SVE2 Memory Gather Load Group diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index a799ce3110a..364e419f3eb 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -7318,29 +7318,10 @@ DO_SVE2_ZPZZ_FP(FMINP, fminp) * SVE Integer Multiply-Add (unpredicated) */ -static bool trans_FMMLA(DisasContext *s, arg_rrrr_esz *a) -{ - gen_helper_gvec_4_ptr *fn; - - switch (a->esz) { - case MO_32: - if (!dc_isar_feature(aa64_sve_f32mm, s)) { - return false; - } - fn = gen_helper_fmmla_s; - break; - case MO_64: - if (!dc_isar_feature(aa64_sve_f64mm, s)) { - return false; - } - fn = gen_helper_fmmla_d; - break; - default: - return false; - } - - return gen_gvec_fpst_zzzz(s, fn, a->rd, a->rn, a->rm, a->ra, 0, FPST_FPCR); -} +TRANS_FEAT(FMMLA_s, aa64_sve_f32mm, gen_gvec_fpst_zzzz, gen_helper_fmmla_s, + a->rd, a->rn, a->rm, a->ra, 0, FPST_FPCR) +TRANS_FEAT(FMMLA_d, aa64_sve_f64mm, gen_gvec_fpst_zzzz, gen_helper_fmmla_d, + a->rd, a->rn, a->rm, a->ra, 0, FPST_FPCR) static gen_helper_gvec_4 * const sqdmlal_zzzw_fns[] = { NULL, gen_helper_sve2_sqdmlal_zzzw_h,