From patchwork Mon May 30 16: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: 577198 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:330b:0:0:0:0 with SMTP id f11csp384464mag; Mon, 30 May 2022 09:21:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiRMWUZDW8MZ2ayyuRAzHmqX3cerozdr1ojdnvk700zcOWBI2KgFqI+XSgir/U2QdVFIS/ X-Received: by 2002:a05:622a:103:b0:2fc:606a:ed33 with SMTP id u3-20020a05622a010300b002fc606aed33mr17900455qtw.179.1653927699810; Mon, 30 May 2022 09:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653927699; cv=none; d=google.com; s=arc-20160816; b=KlAFID2y4TNlm7Onf3XldamkV1fRzY6zPhuEKO+69pL4oqPivW4AvPeHIvqtDXW8+9 7u9pHv9pSL4MuinjStadI+Sut6wRCz4KcN+0y9a+0OOAPGv5dIkEUwtTZBLnJe5Ah6TP ZA2tkhxUeS2lQLwSlAmkHCRKHFcBl3VeQ1YeJEpbf72UtJ0lbJ3zqTkKw2p2HYobCio4 Ey8UChg9GGp76na7r8IoxOz/t4ywR71e/3DV3gQ84WciSFtvIGfY7oo2gSrajH7sgCVx /ZAmJbcwMfwCWS0i12U1057KoZz+NKpOMZ2nKjuGFnOpByMcaJ4cKhz2UVqBjIDKvixF BevQ== 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=sOUheYAQJ8+bQRv31tELNanExF9i4j1PcXkMCL/gELU=; b=f4GYehTcmofUnv6mIoDYFl14FKz4eF6tAQ5gVJKH3EX8ZipuHGA7u1GyJX15IErm34 S84mCglYqbwhrH/hBLhje/SFG14sLRx6F7u7RjLbcCp1C0K5I8vjgBZBanAd/bozTlPH 48kqgIjC4vClE0+ldZ0kyPukifS6o5ElBUhj741wgSJmVK5jeT1BuVsdPymehFf+Dkxk rp2cUtDoPZjprJhn2Fdlj1C4L3BKCUwhKQQw3PXWmmOvjKE/+Q8YVaFWlbZwwi/x89KM 5pjcF5OgQWbT2vQxsVC6GQlXR/zxB2eL0UnIv2Bir0PuwDfMUpFupc+5Aw2YCHb2PKER Xocw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e9jFaVAb; 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 q4-20020ad45744000000b004645bfe13e4si326576qvx.52.2022.05.30.09.21.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 May 2022 09:21:39 -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=e9jFaVAb; 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]:33434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvi9D-0000se-DF for patch@linaro.org; Mon, 30 May 2022 12:21:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvhvN-0002f5-N6 for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:21 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvhvK-0007Aa-HK for qemu-devel@nongnu.org; Mon, 30 May 2022 12:07:21 -0400 Received: by mail-wr1-x430.google.com with SMTP id p10so15256837wrg.12 for ; Mon, 30 May 2022 09:07:16 -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=sOUheYAQJ8+bQRv31tELNanExF9i4j1PcXkMCL/gELU=; b=e9jFaVAb3fctOemzcYoM/kUeH8iqJuzeeHwyAxYgx5lvSfrZl1N9L/dOu9i3SBGPWA Qe2yOi/gXgXns0bC6iR6DZ8X9egS+yD/ZrNo2CFxhZw125xeEf+D4ZXHmBfWZT7igC+6 k/Od9gm35SsMnXvOhre8IulxDQT26Ocm8cNbS41sIzaSawjNGCuk7kLv211CfF/migva jwpvQhDuV+JDkjrcVK+hs8Q1jp9u4T0dhcqN0DPC0I29nP8cOQ8r2Zej/kooDF1inxDo NGNPdo43u5O3stu8JMKA8Ohgvc2qqp5/KjyGaJYgioGLVYUmA3ud4d3m87CJ00vEeoDM O5Rw== 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=sOUheYAQJ8+bQRv31tELNanExF9i4j1PcXkMCL/gELU=; b=eSCMnMJB7dbzoZOzqqliBhlJiQigu82k0OELIziALI4CwbDlvm2AqMmA8TrIezZ+mE 9vftxcOVRnA7p/D8hoUf3przEyPSJhbBAsMzLfFt6BJNW/ScgZSb7npGZpaAmdm2Fuif XMXc22D4bzHBIOOUJ5oCqdKVpmhlLjGQzOQ/HmyTDpgog3mGSaLZuFF8n1SP9weL5rmv 0NBhPJC9MdqGgNXeC1uDtcGIzk5AyYjEdSkQGYQBaBW2gIo4uE04v17+2COkFmfBkARs JiXlKDGWRgBzCQ1AqNULumsJRG2Ejx/NhwqbiTM8TdTeDxzIYzUB7XjsQc80x4TfNnLc MUtw== X-Gm-Message-State: AOAM532wXFN3aHZ03j35DRsQWq/vqceabm9UBPMfZwmX7miXnobbs0ro 3PK1vuU1TJAn4CBDJQSxEU6UX+F0V3hL8g== X-Received: by 2002:a5d:64ab:0:b0:20f:ef37:a9d1 with SMTP id m11-20020a5d64ab000000b0020fef37a9d1mr26043381wrp.197.1653926835775; Mon, 30 May 2022 09:07:15 -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.07.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 09:07:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 007/117] target/arm: Move null function and sve check into gen_gvec_ool_zzz Date: Mon, 30 May 2022 17:05:18 +0100 Message-Id: <20220530160708.726466-8-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::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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 Signed-off-by: Richard Henderson Message-id: 20220527181907.189259-5-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-sve.c | 74 ++++++++++++-------------------------- 1 file changed, 23 insertions(+), 51 deletions(-) diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index f7e7a569b7a..fd1d749c0ea 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -153,14 +153,20 @@ static bool gen_gvec_ool_zz(DisasContext *s, gen_helper_gvec_2 *fn, } /* Invoke an out-of-line helper on 3 Zregs. */ -static void gen_gvec_ool_zzz(DisasContext *s, gen_helper_gvec_3 *fn, +static bool gen_gvec_ool_zzz(DisasContext *s, gen_helper_gvec_3 *fn, int rd, int rn, int rm, int data) { - unsigned vsz = vec_full_reg_size(s); - tcg_gen_gvec_3_ool(vec_full_reg_offset(s, rd), - vec_full_reg_offset(s, rn), - vec_full_reg_offset(s, rm), - vsz, vsz, data, fn); + if (fn == NULL) { + return false; + } + if (sve_access_check(s)) { + unsigned vsz = vec_full_reg_size(s); + tcg_gen_gvec_3_ool(vec_full_reg_offset(s, rd), + vec_full_reg_offset(s, rn), + vec_full_reg_offset(s, rm), + vsz, vsz, data, fn); + } + return true; } /* Invoke an out-of-line helper on 4 Zregs. */ @@ -1173,13 +1179,7 @@ static bool trans_LSL_zzi(DisasContext *s, arg_rri_esz *a) static bool do_zzw_ool(DisasContext *s, arg_rrr_esz *a, gen_helper_gvec_3 *fn) { - if (fn == NULL) { - return false; - } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); } #define DO_ZZW(NAME, name) \ @@ -1345,10 +1345,7 @@ static bool trans_RDVL(DisasContext *s, arg_RDVL *a) static bool do_adr(DisasContext *s, arg_rrri *a, gen_helper_gvec_3 *fn) { - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, a->imm); - } - return true; + return gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, a->imm); } static bool trans_ADR_p32(DisasContext *s, arg_rrri *a) @@ -1390,13 +1387,7 @@ static bool trans_FTSSEL(DisasContext *s, arg_rrr_esz *a) gen_helper_sve_ftssel_s, gen_helper_sve_ftssel_d, }; - if (a->esz == 0) { - return false; - } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); } /* @@ -2426,11 +2417,7 @@ static bool trans_TBL(DisasContext *s, arg_rrr_esz *a) gen_helper_sve_tbl_b, gen_helper_sve_tbl_h, gen_helper_sve_tbl_s, gen_helper_sve_tbl_d }; - - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); } static bool trans_TBL_sve2(DisasContext *s, arg_rrr_esz *a) @@ -2460,10 +2447,7 @@ static bool trans_TBX(DisasContext *s, arg_rrr_esz *a) if (!dc_isar_feature(aa64_sve2, s)) { return false; } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fns[a->esz], a->rd, a->rn, a->rm, 0); } static bool trans_UNPK(DisasContext *s, arg_UNPK *a) @@ -2618,10 +2602,7 @@ static bool do_zip(DisasContext *s, arg_rrr_esz *a, bool high) static bool do_zzz_data_ool(DisasContext *s, arg_rrr_esz *a, int data, gen_helper_gvec_3 *fn) { - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, data); - } - return true; + return gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, data); } static bool trans_ZIP1_z(DisasContext *s, arg_rrr_esz *a) @@ -6693,13 +6674,10 @@ static bool trans_MUL_zzz(DisasContext *s, arg_rrr_esz *a) static bool do_sve2_zzz_ool(DisasContext *s, arg_rrr_esz *a, gen_helper_gvec_3 *fn) { - if (fn == NULL || !dc_isar_feature(aa64_sve2, s)) { + if (!dc_isar_feature(aa64_sve2, s)) { return false; } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); } static bool trans_SMULH_zzz(DisasContext *s, arg_rrr_esz *a) @@ -8377,11 +8355,8 @@ static bool do_aese(DisasContext *s, arg_rrr_esz *a, bool decrypt) if (!dc_isar_feature(aa64_sve2_aes, s)) { return false; } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, gen_helper_crypto_aese, - a->rd, a->rn, a->rm, decrypt); - } - return true; + return gen_gvec_ool_zzz(s, gen_helper_crypto_aese, + a->rd, a->rn, a->rm, decrypt); } static bool trans_AESE(DisasContext *s, arg_rrr_esz *a) @@ -8399,10 +8374,7 @@ static bool do_sm4(DisasContext *s, arg_rrr_esz *a, gen_helper_gvec_3 *fn) if (!dc_isar_feature(aa64_sve2_sm4, s)) { return false; } - if (sve_access_check(s)) { - gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); - } - return true; + return gen_gvec_ool_zzz(s, fn, a->rd, a->rn, a->rm, 0); } static bool trans_SM4E(DisasContext *s, arg_rrr_esz *a)