From patchwork Tue May 28 20:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 799514 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp421756wrz; Tue, 28 May 2024 13:33:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW82dlnLycLbohRF67dEEbaSV2Zn2pYB5uL+f28CnSCC1qxfLivDLuop0lFHDAwLzMrTW1ZgU8NT0VBnDD5z/W/ X-Google-Smtp-Source: AGHT+IFUMQIUDSztyfzRGiX/6/nO3x/0IaQZpY+50d5DuYGM4bNs2NiQUdxcS2ypoaP//MCw+N4Q X-Received: by 2002:a05:6808:178c:b0:3d1:d3c7:f632 with SMTP id 5614622812f47-3d1d3c7f726mr1518554b6e.14.1716928399182; Tue, 28 May 2024 13:33:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716928399; cv=none; d=google.com; s=arc-20160816; b=EHkvXoU6DBIG3hQ1MboOv1aHmn2Yjr7VbErB3d/gaFMn2wEwT6gCWIIEU7xMhKikOh YWWLib9QFqm5nA61VaFPPnIxHr5NVorsi9EpbYcStUg8DKBkFEMfPOXX5JWe0pr3JThb x+EhLZQUqZlWwzgLQEubz/FGVYw3VgGnJwXRWAPh0mQubWDbxf1rxlhK4PMtJjgsbcjv aR+ZYbszDI1SSbHgt8JkScHqFtnZZgEkeBGM2HBEXBAitkipZU/vcYOGx2D9gdODGB2D UfdVsqrZss3bp3DIJtr624el//xbThc5wuFdKv069yLk38sEqxrm+FTYULOUfIX1u+RY h9VQ== 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=NibFA7n7W/M6AFV8uODK24RMa/TkfDTmU51BffIjIkc=; fh=ZhBia3nL9o1nuf7SbgdYn/0pDmAeja6gisyWXi2cqYE=; b=rYMyW0beQIwGmpoMI4Db8kYaFCK3MeafzeN9XQL44Qm0OKvpLx06TndS+FOed3rXX2 RmEtu23fIvmCiUSM2kMBRfs0+vf3IYCTO1sNNvTwnr5WKQFWC2FBIyOBQY/cBmdClkL3 lFKwTIa9O4tT0foig7Wpmb7vUTCDKj6hehAl+6Q/353Y/dmHsH8J2fn+/6/jYNBBWC19 +yzGFR898wWBqOtbVhwS/mVjEmQhrQViRIVtrkz/SfL2N+K9WwrMd/QaCR8D0FajM60S gAIYWvHCZ0Z6dLgGQRo4S2kGpVMzEv+UVL47tKRipt5bxM3D/b65/FsBkOPISIwEkdHG v9Ow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vWMEg9bo; 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 d75a77b69052e-43fdf77bb63si7667431cf.82.2024.05.28.13.33.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 13:33:19 -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=vWMEg9bo; 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 1sC3TZ-0002zA-Vs; Tue, 28 May 2024 16:31:18 -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 1sC3TR-0002qx-3c for qemu-devel@nongnu.org; Tue, 28 May 2024 16:31:09 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sC3TF-0003bH-FD for qemu-devel@nongnu.org; Tue, 28 May 2024 16:31:08 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-6819d785528so944075a12.3 for ; Tue, 28 May 2024 13:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716928255; x=1717533055; 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=NibFA7n7W/M6AFV8uODK24RMa/TkfDTmU51BffIjIkc=; b=vWMEg9boY3UB4ePhGJjYcCLV8nS9CHLIqX9rALFHVvHQmAMtlDF3TWB9aDeqG3OnPX 9kF9chENUxpI8ttp2uVaYxhjQoau35oko5gaLSJlcN8DIhIHbIbsAjhcXV/lazIG0LCk powHaMyfmXhyHY+1H5HhPBIdrk3R9KyiKjX8c2LDlXMSo5a8mK05GjTiBHMGnpckdbAH M2DbUnsuLpGzkom2pQbyhq1LJWW1/hopBTT71CcV90sOSyD4EafExbnIBXGP7KUzxgzl tRwZBiD+z6sgQwypShFRDjqVocJxj6pXBC8q4HeHCpTc0JliaxlQZgZNRGouzhq70i+D lokQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716928255; x=1717533055; 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=NibFA7n7W/M6AFV8uODK24RMa/TkfDTmU51BffIjIkc=; b=tiJL3Z6unU4EEzEN5dowMpNVUwIhOHfYW+FLXd/WmOVtQEbjIAB0bbc8Af9g1iOHAa LN9zmQl+XK6tFQK6EgvYl5omkp2kGQfP68Hgx0kSzTAxl3xvE59aNRFS2TeEOWTKNGqp wE7p/fnpFIXEF6tUWwVKIzHR6qPlxwoyNMiTbkFz3rrO+0g6iEkRnb0BZCxtpXeMThWd 5uAwkw4Esy+69HjhxPp8ADICVA/XBL6YQGxCWiCriR1wJ1u5CtsaahFiQF7oxjBC8QXU +z7eprA3U/7BW2OmaYaLljQjdq2wDCfOjxB+NSaksdgft0FFjf1Zxxyx70IT5mJ7HydY kfpg== X-Gm-Message-State: AOJu0YyLy8yW0y29CxMbpf5TrRiCzlpGR6sXBJX9jrS9oxaYeM53JbXO gZuSO+qGRkInyZmIO4g+p4ww6GPJnpozDEZbjY2U4bJLjRiGd6FrZfI3AEZdmH08U6FT0U/4ugD 3 X-Received: by 2002:a05:6a20:748b:b0:1a9:6c18:7e96 with SMTP id adf61e73a8af0-1b212d0a7c9mr14761459637.19.1716928255440; Tue, 28 May 2024 13:30:55 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fbd3dbe9sm7042036b3a.10.2024.05.28.13.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 May 2024 13:30:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PATCH v3 11/33] target/arm: Convert SRSHL, URSHL to decodetree Date: Tue, 28 May 2024 13:30:22 -0700 Message-Id: <20240528203044.612851-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240528203044.612851-1-richard.henderson@linaro.org> References: <20240528203044.612851-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.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 Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/tcg/a64.decode | 4 ++++ target/arm/tcg/translate-a64.c | 22 +++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index ea897d6732..9e02776036 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -758,6 +758,8 @@ USQADD_s 0111 1110 ..1 00000 00111 0 ..... ..... @r2r_e SSHL_s 0101 1110 111 ..... 01000 1 ..... ..... @rrr_d USHL_s 0111 1110 111 ..... 01000 1 ..... ..... @rrr_d +SRSHL_s 0101 1110 111 ..... 01010 1 ..... ..... @rrr_d +URSHL_s 0111 1110 111 ..... 01010 1 ..... ..... @rrr_d ### Advanced SIMD scalar pairwise @@ -882,6 +884,8 @@ USQADD_v 0.10 1110 ..1 00000 00111 0 ..... ..... @qr2r_e SSHL_v 0.00 1110 ..1 ..... 01000 1 ..... ..... @qrrr_e USHL_v 0.10 1110 ..1 ..... 01000 1 ..... ..... @qrrr_e +SRSHL_v 0.00 1110 ..1 ..... 01010 1 ..... ..... @qrrr_e +URSHL_v 0.10 1110 ..1 ..... 01010 1 ..... ..... @qrrr_e ### Advanced SIMD scalar x indexed element diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 7e981f8d01..c751da78ef 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -5116,6 +5116,8 @@ static bool do_int3_scalar_d(DisasContext *s, arg_rrr_e *a, 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) static bool do_fp3_vector(DisasContext *s, arg_qrrr_e *a, gen_helper_gvec_3_ptr * const fns[3]) @@ -5364,6 +5366,8 @@ TRANS(USQADD_v, do_gvec_fn3, a, gen_gvec_usqadd_qc) TRANS(SSHL_v, do_gvec_fn3, a, gen_gvec_sshl) TRANS(USHL_v, do_gvec_fn3, a, gen_gvec_ushl) +TRANS(SRSHL_v, do_gvec_fn3, a, gen_gvec_srshl) +TRANS(URSHL_v, do_gvec_fn3, a, gen_gvec_urshl) /* @@ -9384,13 +9388,6 @@ static void handle_3same_64(DisasContext *s, int opcode, bool u, gen_helper_neon_qshl_s64(tcg_rd, tcg_env, tcg_rn, tcg_rm); } break; - case 0xa: /* SRSHL, URSHL */ - if (u) { - gen_helper_neon_rshl_u64(tcg_rd, tcg_rn, tcg_rm); - } else { - gen_helper_neon_rshl_s64(tcg_rd, tcg_rn, tcg_rm); - } - break; case 0xb: /* SQRSHL, UQRSHL */ if (u) { gen_helper_neon_qrshl_u64(tcg_rd, tcg_env, tcg_rn, tcg_rm); @@ -9409,6 +9406,7 @@ static void handle_3same_64(DisasContext *s, int opcode, bool u, case 0x1: /* SQADD / UQADD */ case 0x5: /* SQSUB / UQSUB */ case 0x8: /* SSHL, USHL */ + case 0xa: /* SRSHL, URSHL */ g_assert_not_reached(); } } @@ -9433,7 +9431,6 @@ static void disas_simd_scalar_three_reg_same(DisasContext *s, uint32_t insn) case 0x9: /* SQSHL, UQSHL */ case 0xb: /* SQRSHL, UQRSHL */ break; - case 0xa: /* SRSHL, URSHL */ case 0x6: /* CMGT, CMHI */ case 0x7: /* CMGE, CMHS */ case 0x11: /* CMTST, CMEQ */ @@ -9453,6 +9450,7 @@ static void disas_simd_scalar_three_reg_same(DisasContext *s, uint32_t insn) case 0x1: /* SQADD, UQADD */ case 0x5: /* SQSUB, UQSUB */ case 0x8: /* SSHL, USHL */ + case 0xa: /* SRSHL, URSHL */ unallocated_encoding(s); return; } @@ -10929,6 +10927,7 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) case 0x01: /* SQADD, UQADD */ case 0x05: /* SQSUB, UQSUB */ case 0x08: /* SSHL, USHL */ + case 0x0a: /* SRSHL, URSHL */ unallocated_encoding(s); return; } @@ -10938,13 +10937,6 @@ static void disas_simd_3same_int(DisasContext *s, uint32_t insn) } switch (opcode) { - case 0x0a: /* SRSHL, URSHL */ - if (u) { - gen_gvec_fn3(s, is_q, rd, rn, rm, gen_gvec_urshl, size); - } else { - gen_gvec_fn3(s, is_q, rd, rn, rm, gen_gvec_srshl, size); - } - return; case 0x0c: /* SMAX, UMAX */ if (u) { gen_gvec_fn3(s, is_q, rd, rn, rm, tcg_gen_gvec_umax, size);