From patchwork Thu Sep 19 13:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 829604 Delivered-To: patch@linaro.org Received: by 2002:adf:ebcc:0:b0:367:895a:4699 with SMTP id v12csp316714wrn; Thu, 19 Sep 2024 06:12:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6Ca8GFy9aTxoVm+gvykgZl+Kl5qE0GhTn7K2TEmky89TmYLkceSii6rklpoZWWL2oM4h6Dg==@linaro.org X-Google-Smtp-Source: AGHT+IGQ5ORaKzcn1Vkzqy3eYoNB2+bLG8qGbp2osg6lqK7MtKXwF226aJXNv6vXLcuanKNNAq+e X-Received: by 2002:a05:6359:59f:b0:1bc:43d8:59b7 with SMTP id e5c5f4694b2df-1bc43d85aebmr466132555d.11.1726751576759; Thu, 19 Sep 2024 06:12:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726751576; cv=none; d=google.com; s=arc-20240605; b=inlH02Xqv7kbmrkzxsR5fs51ZeTTvee0PytX97MPe9LvQB0bx0H3GL0v15DsfMcY4F dT06PwTFDBO9f/DLRaIIBlMDe92+fDqdzilaBBGbmXtNa03/KOuDrZ9H4RXKGQpp8ygq wa2Y9B9LM/iLOy13KG5+b/HMW7c63jfqhWjsSbD0gCgDzxo0LLih1Y016worMuWqKqj2 akzkDUhijhOisKj0g/mVs8yBw+roxy5N/9JosrHjJAckPlrGF5UuRzJdgc/yrxRX1ulg VWBRRdxbL5PmjS4OsHasLx9bhTmM6FRtGcGdM4L4YTmLQ1UWpwRciWrXlSYDf0LxIXn3 wpug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=e9gN9iym25WjHBVpIhI+njO5zeAi0FqzRkFImgHvlIA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=LScvFV1tXuBSks9eYr9RaerrPEByAIihDWsi5cFDDLaDK7217f/hPqROn21O7ANiTD 7dYKrmV5g/yl6zoLo84BCcW8irlWhAH4bIKPKVDGmrOlfYFNigVKclGlry5M50hMmmiJ L/tdvwUm5ZiWc4qE6wW7hV5aPLSjpkCI+mp+MCqwvNitm+rukt0/E/o5B3tXSzOpK+S8 cMnukhWaLfCrhZ81ZBoLzNIGlbKnbRwQbqw46Nvj/gpcCZTQLmFAwMJKp0Y3m2NTrhqn RONlSkstS9q5nKGJIq65VkAtarQjl99hGMqTbuQT1kVlHjOgSmiO1E325VeHxEiEfgtK kyyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jmrhVHg/"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-5035b929d54si2287756e0c.21.2024.09.19.06.12.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Sep 2024 06:12:56 -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="jmrhVHg/"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srGwP-0004sT-1f; Thu, 19 Sep 2024 09:11:26 -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 1srGwG-0004U9-A9 for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:11:16 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1srGwD-00010J-Df for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:11:16 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-42cb8dac900so7632105e9.3 for ; Thu, 19 Sep 2024 06:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726751471; x=1727356271; 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=e9gN9iym25WjHBVpIhI+njO5zeAi0FqzRkFImgHvlIA=; b=jmrhVHg/CZ3oxdMARuvCzo+iYjesUMglAEZFhXbvfQFMFAXRBc9Wiq4KVZNYPxf29O 99h3I0PSh8XoEVvnoa0VPnllgpW/wM1z8GHQBTHpmxfxRhlIHrsc6EYgCxQjh+FllOsp vfSGXEwW9UbO7t2WuQaJaFxmBuWELog7s2HMYAVkjesx4kS7EvrF1tl5joic1DF1Hzat mNKWcNhFuxM4axvm/jWzHkLn0F/QnH49bxjvQiGxD8E99NpKRuMRWZ93mvMpH5WuAX0z KvQPTpw4D+J9JVfDuSY7p+gmChceLgvTGtaHtHc/VIz+0FlHUzz9R/b0Mw6ZL7KhhlR1 4F1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726751471; x=1727356271; 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=e9gN9iym25WjHBVpIhI+njO5zeAi0FqzRkFImgHvlIA=; b=cOUV1H9nbYzu/2vZTnb06MsNUTlXjr/49QHozSDfopFJNlKky0OopT07dz9Q2HEdPt xAU2lRHb/9+0Vv5y2FzoL/qEhmEP9W/kgaB1lmpOfERoalKissKGvJrFJkNWyyxEeAh6 FW/Fh5khDU5Xxv32z7jP0uDxawjGPsNr/u93wlDf/oCC7hh/1WX0C86Yy+d5Tv+xQsDr fFhsslPY+D2AU1aEpYcbER3+vGNOXcZ46eTKE2CN4Pv66sfa8P5z4OXe3f8IdpCR6BhV gW9NtFOJpkGCZFts1hgC7mR721EDMNLFXh856H1tvh/tt+XOykwJWveWcxx0pysm5y24 j5uA== X-Gm-Message-State: AOJu0YzjL1x8P2kOqf6trlElTUUwZRm++sKWG+JzaXWw3FBdOfiPL4ew v7F6ms9laCsK0yRFLgaM8WSTLDNW51YEgqEhpbH7ZfQ8s4xI3UkOuEo5s93Ez8R4I7kz4UcQaLc g X-Received: by 2002:a7b:c453:0:b0:42c:de34:34be with SMTP id 5b1f17b1804b1-42cde3436e0mr208139425e9.3.1726751471340; Thu, 19 Sep 2024 06:11:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e754091d3sm21667845e9.10.2024.09.19.06.11.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 06:11:10 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/38] target/arm: Convert EXT to decodetree Date: Thu, 19 Sep 2024 14:10:34 +0100 Message-Id: <20240919131106.3362543-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240919131106.3362543-1-peter.maydell@linaro.org> References: <20240919131106.3362543-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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 From: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20240912024114.1097832-7-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/a64.decode | 5 ++ target/arm/tcg/translate-a64.c | 121 +++++++++++++-------------------- 2 files changed, 53 insertions(+), 73 deletions(-) diff --git a/target/arm/tcg/a64.decode b/target/arm/tcg/a64.decode index 62df4c4ceb4..f72f95865fb 100644 --- a/target/arm/tcg/a64.decode +++ b/target/arm/tcg/a64.decode @@ -1136,3 +1136,8 @@ FMADD 0001 1111 .. 0 ..... 0 ..... ..... ..... @rrrr_hsd FMSUB 0001 1111 .. 0 ..... 1 ..... ..... ..... @rrrr_hsd FNMADD 0001 1111 .. 1 ..... 0 ..... ..... ..... @rrrr_hsd FNMSUB 0001 1111 .. 1 ..... 1 ..... ..... ..... @rrrr_hsd + +# Advanced SIMD Extract + +EXT_d 0010 1110 00 0 rm:5 00 imm:3 0 rn:5 rd:5 +EXT_q 0110 1110 00 0 rm:5 0 imm:4 0 rn:5 rd:5 diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 1a0b2bb33b6..48188d41165 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -6582,6 +6582,54 @@ static bool trans_FCSEL(DisasContext *s, arg_FCSEL *a) return true; } +/* + * Advanced SIMD Extract + */ + +static bool trans_EXT_d(DisasContext *s, arg_EXT_d *a) +{ + if (fp_access_check(s)) { + TCGv_i64 lo = read_fp_dreg(s, a->rn); + if (a->imm != 0) { + TCGv_i64 hi = read_fp_dreg(s, a->rm); + tcg_gen_extract2_i64(lo, lo, hi, a->imm * 8); + } + write_fp_dreg(s, a->rd, lo); + } + return true; +} + +static bool trans_EXT_q(DisasContext *s, arg_EXT_q *a) +{ + TCGv_i64 lo, hi; + int pos = (a->imm & 7) * 8; + int elt = a->imm >> 3; + + if (!fp_access_check(s)) { + return true; + } + + lo = tcg_temp_new_i64(); + hi = tcg_temp_new_i64(); + + read_vec_element(s, lo, a->rn, elt, MO_64); + elt++; + read_vec_element(s, hi, elt & 2 ? a->rm : a->rn, elt & 1, MO_64); + elt++; + + if (pos != 0) { + TCGv_i64 hh = tcg_temp_new_i64(); + tcg_gen_extract2_i64(lo, lo, hi, pos); + read_vec_element(s, hh, a->rm, elt & 1, MO_64); + tcg_gen_extract2_i64(hi, hi, hh, pos); + } + + write_vec_element(s, lo, a->rd, 0, MO_64); + write_vec_element(s, hi, a->rd, 1, MO_64); + clear_vec_high(s, true, a->rd); + return true; +} + /* * Floating-point data-processing (3 source) */ @@ -8890,78 +8938,6 @@ static void disas_data_proc_fp(DisasContext *s, uint32_t insn) } } -/* EXT - * 31 30 29 24 23 22 21 20 16 15 14 11 10 9 5 4 0 - * +---+---+-------------+-----+---+------+---+------+---+------+------+ - * | 0 | Q | 1 0 1 1 1 0 | op2 | 0 | Rm | 0 | imm4 | 0 | Rn | Rd | - * +---+---+-------------+-----+---+------+---+------+---+------+------+ - */ -static void disas_simd_ext(DisasContext *s, uint32_t insn) -{ - int is_q = extract32(insn, 30, 1); - int op2 = extract32(insn, 22, 2); - int imm4 = extract32(insn, 11, 4); - int rm = extract32(insn, 16, 5); - int rn = extract32(insn, 5, 5); - int rd = extract32(insn, 0, 5); - int pos = imm4 << 3; - TCGv_i64 tcg_resl, tcg_resh; - - if (op2 != 0 || (!is_q && extract32(imm4, 3, 1))) { - unallocated_encoding(s); - return; - } - - if (!fp_access_check(s)) { - return; - } - - tcg_resh = tcg_temp_new_i64(); - tcg_resl = tcg_temp_new_i64(); - - /* Vd gets bits starting at pos bits into Vm:Vn. This is - * either extracting 128 bits from a 128:128 concatenation, or - * extracting 64 bits from a 64:64 concatenation. - */ - if (!is_q) { - read_vec_element(s, tcg_resl, rn, 0, MO_64); - if (pos != 0) { - read_vec_element(s, tcg_resh, rm, 0, MO_64); - tcg_gen_extract2_i64(tcg_resl, tcg_resl, tcg_resh, pos); - } - } else { - TCGv_i64 tcg_hh; - typedef struct { - int reg; - int elt; - } EltPosns; - EltPosns eltposns[] = { {rn, 0}, {rn, 1}, {rm, 0}, {rm, 1} }; - EltPosns *elt = eltposns; - - if (pos >= 64) { - elt++; - pos -= 64; - } - - read_vec_element(s, tcg_resl, elt->reg, elt->elt, MO_64); - elt++; - read_vec_element(s, tcg_resh, elt->reg, elt->elt, MO_64); - elt++; - if (pos != 0) { - tcg_gen_extract2_i64(tcg_resl, tcg_resl, tcg_resh, pos); - tcg_hh = tcg_temp_new_i64(); - read_vec_element(s, tcg_hh, elt->reg, elt->elt, MO_64); - tcg_gen_extract2_i64(tcg_resh, tcg_resh, tcg_hh, pos); - } - } - - write_vec_element(s, tcg_resl, rd, 0, MO_64); - if (is_q) { - write_vec_element(s, tcg_resh, rd, 1, MO_64); - } - clear_vec_high(s, is_q, rd); -} - /* TBL/TBX * 31 30 29 24 23 22 21 20 16 15 14 13 12 11 10 9 5 4 0 * +---+---+-------------+-----+---+------+---+-----+----+-----+------+------+ @@ -11860,7 +11836,6 @@ static const AArch64DecodeTable data_proc_simd[] = { { 0x0f000400, 0x9f800400, disas_simd_shift_imm }, { 0x0e000000, 0xbf208c00, disas_simd_tb }, { 0x0e000800, 0xbf208c00, disas_simd_zip_trn }, - { 0x2e000000, 0xbf208400, disas_simd_ext }, { 0x5e200800, 0xdf3e0c00, disas_simd_scalar_two_reg_misc }, { 0x5f000400, 0xdf800400, disas_simd_scalar_shift_imm }, { 0x0e780800, 0x8f7e0c00, disas_simd_two_reg_misc_fp16 },