From patchwork Sat May 4 05:52:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163367 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp254667ill; Fri, 3 May 2019 23:09:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqw6p4On+pYktelOTUHREqcpFfQeGGUwFoRT6vP0iXFWB1gbJv3vTuVqJ3E1YI6cDEEEnB4X X-Received: by 2002:a5d:624f:: with SMTP id m15mr9433818wrv.102.1556950172123; Fri, 03 May 2019 23:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556950172; cv=none; d=google.com; s=arc-20160816; b=N2VuI2njmv1cg5Dhyy8wnO5steA9DEkroRA4IEd842NUcjNDUx7V7EQ1KhpPXIrnDx Yfr+hLkLz1Z3/CWH4vgLa2i95bv7AMg1jAWGlovBz9rp9+oMolV9t0uCy9rQ4kNa9X9s V5l0RIYF2m7wtsuY+NK/3IV+jbYV/FoAuUYV3h7OlY+kEYrhGucnzNS4T5CRmOCxDSCk lFQhGruqg528xP/FxcL10UE0s5TMZvDyV9mf5+UX9eeSzs1/xYEEY2WC6J1HlQxilRI7 j7Wf41+BJtcscM9UhTdbOBtd6B8it3jgvUgQlj69PeML8f1DNDRJTjWXjAU5l3hIx67Q 6m/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=aOq8R9O0JYe2vR4wE14TCH6+yK72ddx4w9niulf5glk=; b=v1MUID0bJq3jTbpd3b4Y5gm8a8TtINlnvwQhP5ba6uTRcxttLhMP6u027zcHh1QjVF XdKm7eEiHwmZNPuLoXoJC2MMV4Cma+Qr/U8Q500564+EfigohN/CFRmevExuf+BJbjll 0VtRynZADgCWkGWKLZMyNSfOUiTTcfbm/P3ccV/iCt4rwuqyvd7S8ufs183PI7GFRZvO 1RDUu7kkep1M1gKtU1XROh8V3ZYVDS9AGSMN/msIM/IMkjS/Szw/3fHbS+/fkVDrfYFr LZ9ANAg+ECqz//IH5oWI/of7qIZGwJMyPSUWCBhm2HKeZqrHOUcO6ehXfMb1FsUGTF3U hNZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nGvOrO9o; 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=fail (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 f3si3059589wrv.209.2019.05.03.23.09.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 03 May 2019 23:09:32 -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=fail header.i=@linaro.org header.s=google header.b=nGvOrO9o; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:51820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMnrW-000496-Tv for patch@linaro.org; Sat, 04 May 2019 02:09:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMnc6-000845-0b for qemu-devel@nongnu.org; Sat, 04 May 2019 01:53:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMnc4-0004Yb-PK for qemu-devel@nongnu.org; Sat, 04 May 2019 01:53:33 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:45099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMnc4-0004XD-JI for qemu-devel@nongnu.org; Sat, 04 May 2019 01:53:32 -0400 Received: by mail-pf1-x42b.google.com with SMTP id e24so3956593pfi.12 for ; Fri, 03 May 2019 22:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aOq8R9O0JYe2vR4wE14TCH6+yK72ddx4w9niulf5glk=; b=nGvOrO9oB3UkPDpmgBzSWrHM+u9KKFatM+TWLiY/+ybybRbKECJ9xSHDqN9Wo1k+HQ qK4I6mVURQ1eorIah3m4YXb6uQcr8PbsivYlPCABpvLeQAIrYAO7kkMQS8B/SNT50LBk MfdVkHXU+/nyuwrXeIpIRb2WdVVZXcQJuBKSRPinRdCOpxR+Pq6ugrryxVKKOToIFJuW b1pGCfeZ4WYVwXT/ecdrSWAkLsP0V9MObNssdN7yPhHdXTT8GALDVf/8VfkhK+Nm5lCU fsuDz2zIM8aixkdk/FmgQB/jA3gFOOeEqRZMpNaNS4rM8Rci9IW2pwZffH5/HUFW3nQy kgcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aOq8R9O0JYe2vR4wE14TCH6+yK72ddx4w9niulf5glk=; b=cPzKTp2R7GOGAiZV/9gRA07pTYqmNZy3OKh4Z8vGcCgAQ66wBeBuxSPSweIJPX4uU8 g6UfyHEVCJykQnIpvRu+iMJxAmVuSOF3usi5WcjTN19UuIIXVLcv+QnnLFg5k95jSeeZ WAJVjat/fYsWgbBDM2M810dJRoT69nUwqWy4fOiXGqKMyEEeC9Aue7KLNknC21wPOJLS u7jtzNpur/kehO8WXl/VYN9CHkISmda8lTT0e+vBRfFXM8ApMm+0Rxa47m30oMcpRaVp 4GOsywren7aqceq+iEKYcQeFvpjJrOtHh8Lubhz9EU9ca3wVATiD5e4xZ8nY+oO9AV+4 H7Ww== X-Gm-Message-State: APjAAAUtKrIP4A9kSXVkjMPaE88MupiMY1aypDV3LUDRkKbEt7DkTrTN dzUrEL9UNb+l+cM4hvw2CRgocj9oaps= X-Received: by 2002:a62:2687:: with SMTP id m129mr17312979pfm.204.1556949211292; Fri, 03 May 2019 22:53:31 -0700 (PDT) Received: from localhost.localdomain (97-113-189-189.tukw.qwest.net. [97.113.189.189]) by smtp.gmail.com with ESMTPSA id 15sm6680423pfo.117.2019.05.03.22.53.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 May 2019 22:53:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 3 May 2019 22:52:53 -0700 Message-Id: <20190504055300.18426-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190504055300.18426-1-richard.henderson@linaro.org> References: <20190504055300.18426-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42b Subject: [Qemu-devel] [PATCH v3 24/31] target/arm: Use tcg_gen_abs_i64 and tcg_gen_gvec_abs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/helper.h | 2 -- target/arm/neon_helper.c | 5 ----- target/arm/translate-a64.c | 41 +++++--------------------------------- target/arm/translate.c | 11 +++------- 4 files changed, 8 insertions(+), 51 deletions(-) -- 2.17.1 diff --git a/target/arm/helper.h b/target/arm/helper.h index 50cb036378..132aa1682e 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -352,8 +352,6 @@ DEF_HELPER_2(neon_ceq_u8, i32, i32, i32) DEF_HELPER_2(neon_ceq_u16, i32, i32, i32) DEF_HELPER_2(neon_ceq_u32, i32, i32, i32) -DEF_HELPER_1(neon_abs_s8, i32, i32) -DEF_HELPER_1(neon_abs_s16, i32, i32) DEF_HELPER_1(neon_clz_u8, i32, i32) DEF_HELPER_1(neon_clz_u16, i32, i32) DEF_HELPER_1(neon_cls_s8, i32, i32) diff --git a/target/arm/neon_helper.c b/target/arm/neon_helper.c index ed1c6fc41c..4259056723 100644 --- a/target/arm/neon_helper.c +++ b/target/arm/neon_helper.c @@ -1228,11 +1228,6 @@ NEON_VOP(ceq_u16, neon_u16, 2) NEON_VOP(ceq_u32, neon_u32, 1) #undef NEON_FN -#define NEON_FN(dest, src, dummy) dest = (src < 0) ? -src : src -NEON_VOP1(abs_s8, neon_s8, 4) -NEON_VOP1(abs_s16, neon_s16, 2) -#undef NEON_FN - /* Count Leading Sign/Zero Bits. */ static inline int do_clz8(uint8_t x) { diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 9dcc5ff3a3..b7c5a928b4 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -9468,11 +9468,7 @@ static void handle_2misc_64(DisasContext *s, int opcode, bool u, if (u) { tcg_gen_neg_i64(tcg_rd, tcg_rn); } else { - TCGv_i64 tcg_zero = tcg_const_i64(0); - tcg_gen_neg_i64(tcg_rd, tcg_rn); - tcg_gen_movcond_i64(TCG_COND_GT, tcg_rd, tcg_rn, tcg_zero, - tcg_rn, tcg_rd); - tcg_temp_free_i64(tcg_zero); + tcg_gen_abs_i64(tcg_rd, tcg_rn); } break; case 0x2f: /* FABS */ @@ -12366,11 +12362,12 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) } break; case 0xb: - if (u) { /* NEG */ + if (u) { /* ABS, NEG */ gen_gvec_fn2(s, is_q, rd, rn, tcg_gen_gvec_neg, size); - return; + } else { + gen_gvec_fn2(s, is_q, rd, rn, tcg_gen_gvec_abs, size); } - break; + return; } if (size == 3) { @@ -12438,17 +12435,6 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) gen_helper_neon_qabs_s32(tcg_res, cpu_env, tcg_op); } break; - case 0xb: /* ABS, NEG */ - if (u) { - tcg_gen_neg_i32(tcg_res, tcg_op); - } else { - TCGv_i32 tcg_zero = tcg_const_i32(0); - tcg_gen_neg_i32(tcg_res, tcg_op); - tcg_gen_movcond_i32(TCG_COND_GT, tcg_res, tcg_op, - tcg_zero, tcg_op, tcg_res); - tcg_temp_free_i32(tcg_zero); - } - break; case 0x2f: /* FABS */ gen_helper_vfp_abss(tcg_res, tcg_op); break; @@ -12561,23 +12547,6 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) tcg_temp_free_i32(tcg_zero); break; } - case 0xb: /* ABS, NEG */ - if (u) { - TCGv_i32 tcg_zero = tcg_const_i32(0); - if (size) { - gen_helper_neon_sub_u16(tcg_res, tcg_zero, tcg_op); - } else { - gen_helper_neon_sub_u8(tcg_res, tcg_zero, tcg_op); - } - tcg_temp_free_i32(tcg_zero); - } else { - if (size) { - gen_helper_neon_abs_s16(tcg_res, tcg_op); - } else { - gen_helper_neon_abs_s8(tcg_res, tcg_op); - } - } - break; case 0x4: /* CLS, CLZ */ if (u) { if (size == 0) { diff --git a/target/arm/translate.c b/target/arm/translate.c index b25781554f..dd053c80d6 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8120,6 +8120,9 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) case NEON_2RM_VNEG: tcg_gen_gvec_neg(size, rd_ofs, rm_ofs, vec_size, vec_size); break; + case NEON_2RM_VABS: + tcg_gen_gvec_abs(size, rd_ofs, rm_ofs, vec_size, vec_size); + break; default: elementwise: @@ -8225,14 +8228,6 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) } tcg_temp_free_i32(tmp2); break; - case NEON_2RM_VABS: - switch(size) { - case 0: gen_helper_neon_abs_s8(tmp, tmp); break; - case 1: gen_helper_neon_abs_s16(tmp, tmp); break; - case 2: tcg_gen_abs_i32(tmp, tmp); break; - default: abort(); - } - break; case NEON_2RM_VCGT0_F: { TCGv_ptr fpstatus = get_fpstatus_ptr(1);