From patchwork Fri May 24 23:21:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 798745 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a47:0:b0:354:fb4b:99cd with SMTP id t7csp943583wrw; Fri, 24 May 2024 16:29:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9t8RWx0DVp50d9doXizHcx5ZMRN+DDot3ihs1aNZWo9gaK2xZhswBeS3P9myxTvUpy95cZc6BFzjSUT+shIU7 X-Google-Smtp-Source: AGHT+IFe6Y0JWE0zM/eLTYuJOJIs+NCJCKlCLwrupQTfZB5vag8X+QrZm4aCbznH2CI9+YdDIeKO X-Received: by 2002:a25:107:0:b0:de6:107b:6557 with SMTP id 3f1490d57ef6-df77218a0d0mr3783739276.27.1716593383126; Fri, 24 May 2024 16:29:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716593383; cv=none; d=google.com; s=arc-20160816; b=sMWhMC0ybi6K1bB40aaxtMkZlW0HfSRGltiNtW8w5z+19a7sVHRYOR3W4g23n4QamK IuDmy0spxMwnqWD3RoLaH8luWoPWVp76ih5KhHfbrobTVDrJhKPYKSrUsUdZwNj9dIEl 7fT5y/1YXRZjn/NRb2MUyS4z+tO1cwiVQ+3Uu5WKZkad1XHaauaI8XnDWXErTE46gngl Ihh2aHV1UrwxRALG0vltxim/AOreNWXmKVTa5JaSAoKWKI6Q4MdoX9DRfQHT6W/0jW1N ppqUedejVnh0eA6IO0VmIIzUTUGieTXkskB1s2XCmocsEZiRpDLRwJiRB+FqbuQB5Nqu 5Kfw== 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:cc:to :from:dkim-signature; bh=VvCIuypfJNI340RGyci/PzKT1veZ7P8AmkoVbzz/TlM=; fh=9Ev+QBUhk6P6vR3LT1wYeDLexozsz44nqjfoyPajZCc=; b=lIDwojHbzqHmdnzhtIenGqXdreUj4Ik3aJMEhZrPNI8NIYVXu2MEReTh4Gdpt3tbtf 1azT4TH+ma+6SJo696Spcg6xN0145spuKFMQaYWeMTDslDWwb5TBpvf/9gqHeU3szura JR8ZwSSx+OUWIkQLPXzNxyH8yCUsTpS/kaArSNNX4FsLKyBxASZWDfMrQDBG9Xuew3n6 KHmcMqtSqV/CKOYI/CbMe1g09pxQp+gzZ5qoZmdvMoSsYACWG5i0avPStD3IrasbiCaV afAZqPq6XgM/WQJ9+bciqqMc9WYF9U1X5vHJKXVQfWhsWcT0U5o8NFkUBU7PufnOswIn piww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TlrMB86f; 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 6a1803df08f44-6ac070f0f0fsi28970576d6.300.2024.05.24.16.29.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 May 2024 16:29:43 -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=TlrMB86f; 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 1sAeIW-0000Ze-5I; Fri, 24 May 2024 19:26:04 -0400 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 1sAeHt-0007Oe-VP for qemu-devel@nongnu.org; Fri, 24 May 2024 19:25:28 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sAeHf-0006sf-69 for qemu-devel@nongnu.org; Fri, 24 May 2024 19:25:23 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6f4f2b1c997so3796536b3a.0 for ; Fri, 24 May 2024 16:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716593107; x=1717197907; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VvCIuypfJNI340RGyci/PzKT1veZ7P8AmkoVbzz/TlM=; b=TlrMB86fFTZwZc24CYD5pKUwB+ergOLERy+eVTC+elIo3EUr+5Y3943it2UP2VuLqU pAEfVe2zLHHW0BJOzd2YOuXvto9yMs7biv3qgvgSkV05vN/ZkAmvVUqP2vUrsci9b4vU T8xSpbxi5Uxs0YsJ/SWf5dV0sGdlxr8LvHPbyXqoZr11rTmmcldgC0FtDIcTt1pSpLWd SIy1+y1MBphvzjdCGoo5qHz8dM/QSLDfy827RcNmxh0H3CY5WcQIKHIBwboJ28MUeDUu x4JLulCqO/T4cVUKnCpWzdnvT+bFVn2JZJhyAbW+uVsfyTg8iBWDjS8zmGFAP/VyIWQN Q4QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716593107; x=1717197907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VvCIuypfJNI340RGyci/PzKT1veZ7P8AmkoVbzz/TlM=; b=EZdAQOwG7nmYqSZmCgqQHnrDM4wTaDVmNiSwfQGC4DN/4doVoZQmrsPhYf8/S/co14 1oJFbStBn5TtD1EteMYU9QeF2aZVrxRDeCp28wdLk5NY3lxuuDe9y9OhPgJkPmH75Jv1 RB88tMMaoHZ3zYatiH4zDxKsLvQjECtY2OQYxrXhvLfzJusspLwb6Ou+xlyMp4MXunbO qDOp/NXQNldU/gOVZ1U+PYCA41AyX4VkbrmsMREwqLJVc+igoHhlQi/z7Yg0YeB5JUdw CtTtBuny3KDrBMoIYnjIRox4Hl6frVFz+sNiO/DkJhhAi5cQBoNldD+j3/ekBxfHtDn0 m2DA== X-Gm-Message-State: AOJu0YykW/Spf6qVt5PFXSxhbzsQcF3Sr1S5LcQYArcYNb2EH+BBuMrl mebZIo+popOm+uAYgSsY4psxfyVsZa6XBotsP4Pj+7NjwMJPQHqgYPAhao7ctJ0ERkq3Ft4ILIk t X-Received: by 2002:a05:6a21:1f24:b0:1b0:25b6:a749 with SMTP id adf61e73a8af0-1b212e1711cmr4099335637.48.1716593107213; Fri, 24 May 2024 16:25:07 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fbf2cfd1sm1591695b3a.3.2024.05.24.16.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 16:25:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 50/67] target/arm: Convert ADD, SUB (vector) to decodetree Date: Fri, 24 May 2024 16:21:04 -0700 Message-Id: <20240524232121.284515-51-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524232121.284515-1-richard.henderson@linaro.org> References: <20240524232121.284515-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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=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 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/tcg/a64.decode | 6 ++++++ target/arm/tcg/translate-a64.c | 34 +++++++++++----------------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 96ce35ad40..44383b4fc7 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -765,6 +765,9 @@ UQSHL_s 0111 1110 ..1 ..... 01001 1 ..... ..... @rrr_e SQRSHL_s 0101 1110 ..1 ..... 01011 1 ..... ..... @rrr_e UQRSHL_s 0111 1110 ..1 ..... 01011 1 ..... ..... @rrr_e +ADD_s 0101 1110 111 ..... 10000 1 ..... ..... @rrr_d +SUB_s 0111 1110 111 ..... 10000 1 ..... ..... @rrr_d + ### Advanced SIMD scalar pairwise FADDP_s 0101 1110 0011 0000 1101 10 ..... ..... @rr_h @@ -895,6 +898,9 @@ UQSHL_v 0.10 1110 ..1 ..... 01001 1 ..... ..... @qrrr_e SQRSHL_v 0.00 1110 ..1 ..... 01011 1 ..... ..... @qrrr_e UQRSHL_v 0.10 1110 ..1 ..... 01011 1 ..... ..... @qrrr_e +ADD_v 0.00 1110 ..1 ..... 10000 1 ..... ..... @qrrr_e +SUB_v 0.10 1110 ..1 ..... 10000 1 ..... ..... @qrrr_e + ### Advanced SIMD scalar x indexed element FMUL_si 0101 1111 00 .. .... 1001 . 0 ..... ..... @rrx_h diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index b76682cabf..77a64923e7 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -5118,6 +5118,8 @@ TRANS(SSHL_s, do_int3_scalar_d, a, gen_sshl_i64) TRANS(USHL_s, do_int3_scalar_d, a, gen_ushl_i64) TRANS(SRSHL_s, do_int3_scalar_d, a, gen_helper_neon_rshl_s64) TRANS(URSHL_s, do_int3_scalar_d, a, gen_helper_neon_rshl_u64) +TRANS(ADD_s, do_int3_scalar_d, a, tcg_gen_add_i64) +TRANS(SUB_s, do_int3_scalar_d, a, tcg_gen_sub_i64) typedef struct ENVScalar2 { NeonGenTwoOpEnvFn *gen_bhs[3]; @@ -5432,6 +5434,8 @@ TRANS(UQSHL_v, do_gvec_fn3, a, gen_neon_uqshl) TRANS(SQRSHL_v, do_gvec_fn3, a, gen_neon_sqrshl) TRANS(UQRSHL_v, do_gvec_fn3, a, gen_neon_uqrshl) +TRANS(ADD_v, do_gvec_fn3, a, tcg_gen_gvec_add) +TRANS(SUB_v, do_gvec_fn3, a, tcg_gen_gvec_sub) /* * Advanced SIMD scalar/vector x indexed element @@ -9444,13 +9448,6 @@ static void handle_3same_64(DisasContext *s, int opcode, bool u, } gen_cmtst_i64(tcg_rd, tcg_rn, tcg_rm); break; - case 0x10: /* ADD, SUB */ - if (u) { - tcg_gen_sub_i64(tcg_rd, tcg_rn, tcg_rm); - } else { - tcg_gen_add_i64(tcg_rd, tcg_rn, tcg_rm); - } - break; default: case 0x1: /* SQADD / UQADD */ case 0x5: /* SQSUB / UQSUB */ @@ -9458,6 +9455,7 @@ static void handle_3same_64(DisasContext *s, int opcode, bool u, case 0x9: /* SQSHL, UQSHL */ case 0xa: /* SRSHL, URSHL */ case 0xb: /* SQRSHL, UQRSHL */ + case 0x10: /* ADD, SUB */ g_assert_not_reached(); } } @@ -9482,7 +9480,6 @@ static void disas_simd_scalar_three_reg_same(DisasContext *s, uint32_t insn) case 0x6: /* CMGT, CMHI */ case 0x7: /* CMGE, CMHS */ case 0x11: /* CMTST, CMEQ */ - case 0x10: /* ADD, SUB (vector) */ if (size != 3) { unallocated_encoding(s); return; @@ -9501,6 +9498,7 @@ static void disas_simd_scalar_three_reg_same(DisasContext *s, uint32_t insn) case 0x9: /* SQSHL, UQSHL */ case 0xa: /* SRSHL, URSHL */ case 0xb: /* SQRSHL, UQRSHL */ + case 0x10: /* ADD, SUB (vector) */ unallocated_encoding(s); return; } @@ -10958,6 +10956,11 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) case 0x01: /* SQADD, UQADD */ case 0x05: /* SQSUB, UQSUB */ + case 0x08: /* SSHL, USHL */ + case 0x09: /* SQSHL, UQSHL */ + case 0x0a: /* SRSHL, URSHL */ + case 0x0b: /* SQRSHL, UQRSHL */ + case 0x10: /* ADD, SUB */ unallocated_encoding(s); return; } @@ -10995,13 +10998,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) gen_gvec_fn3(s, is_q, rd, rn, rm, gen_gvec_saba, size); } return; - case 0x10: /* ADD, SUB */ - if (u) { - gen_gvec_fn3(s, is_q, rd, rn, rm, tcg_gen_gvec_sub, size); - } else { - gen_gvec_fn3(s, is_q, rd, rn, rm, tcg_gen_gvec_add, size); - } - return; case 0x13: /* MUL, PMUL */ if (!u) { /* MUL */ gen_gvec_fn3(s, is_q, rd, rn, rm, tcg_gen_gvec_mul, size); @@ -11044,14 +11040,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) vec_full_reg_offset(s, rm), is_q ? 16 : 8, vec_full_reg_size(s)); return; - - case 0x01: /* SQADD, UQADD */ - case 0x05: /* SQSUB, UQSUB */ - case 0x08: /* SSHL, USHL */ - case 0x09: /* SQSHL, UQSHL */ - case 0x0a: /* SRSHL, URSHL */ - case 0x0b: /* SQRSHL, UQRSHL */ - g_assert_not_reached(); } if (size == 3) {