From patchwork Sat Feb 17 18:23:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 128718 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1842930ljc; Sat, 17 Feb 2018 11:07:09 -0800 (PST) X-Google-Smtp-Source: AH8x225IrCuHE7GSnq9nGi7cZnN6rVrYpy2hcM0tcQ0ao27CAowAlJcNT6MxEnfWG2ftrmnr5qvl X-Received: by 10.37.187.145 with SMTP id y17mr7327469ybg.64.1518894429757; Sat, 17 Feb 2018 11:07:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518894429; cv=none; d=google.com; s=arc-20160816; b=sn65iPOXSQ3/humiawsMO5ak/S66ktdTPMEzT8lQfW2LfyasA1JEN28l8aO14bMmCY XyKQZz9u1qDMnNvGv2Iwfh7En8w6tmnEdGtkTzVldHjjIzXPajWN/8frGQK+pRN00GjU 8mHmH8SNI3o2bzHuNK/mZqtv62gnDDwmSDDfSeSpBkrdxI4MXTCzIik4M0VWf5k9jD9E QtnauDmdbbtEzJyqOf6IgZONc6v+OhnZymVH684ohWbBIP9/3qX1z21ow/bQk0FMbheC Me+2hpWrAAuV8YeHdQ9qE7tzbpAx9aDU7oE3Cma/I95orlzKnFuMiWBxoEjl+aIre4Pe zMgw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=y77VXTcItoEr50fnaXeizXOxi+B96vWDrfG5IAacJoI=; b=hh2ZPcAIqcHNZsv8zxi/GPSqAyjvopwjN+uwJ3xjMv8MmWkSvk6Ij16qbQY0i1tL2g /jcQL5BmSu5pJvEdSztg67DVCN0pleMt82N2Gvutt2UPpEoh27nAGhW7q5vaKB9iIKCj o/1TH9EeZPB692bOplN7QtiBMtFTFqWxr6L/vK5J6r2ZF/6o9ipTRas8NhYSgMDUZtWF ESjXPxLtUUHen/ILZKIuKp7H6/DKjbaDmj2GwK8zwMoVMv94l+8CnsDFW6Wb8abqpjI9 PTYvEgheQnoDCVLW7sKfVGy1BANqfyIFoSvEoTQrdRmlpn0IEBE6ff+VIK+FR44Bwb/9 lxRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NVHBDsMh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n9si3497414ybj.692.2018.02.17.11.07.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 17 Feb 2018 11:07:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NVHBDsMh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:48424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en7pF-0002PE-1a for patch@linaro.org; Sat, 17 Feb 2018 14:07:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en7AU-0001n8-Rq for qemu-devel@nongnu.org; Sat, 17 Feb 2018 13:25:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1en7AT-0002Ej-Ii for qemu-devel@nongnu.org; Sat, 17 Feb 2018 13:25:02 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:47055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1en7AT-0002Dx-Ba for qemu-devel@nongnu.org; Sat, 17 Feb 2018 13:25:01 -0500 Received: by mail-pf0-x243.google.com with SMTP id z24so588312pfh.13 for ; Sat, 17 Feb 2018 10:25:01 -0800 (PST) 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; bh=y77VXTcItoEr50fnaXeizXOxi+B96vWDrfG5IAacJoI=; b=NVHBDsMh2kDQxF8XKMUixrckyYlojinVvRxKUWy2ZfWF0NWAUfhJKJKb21uAmDV7RT hapg0Zi4HQNmksI4aLR2Jg+HX9mHVpaiYA1ep3eKgka6G9t+g5oKHclqDgFcH2FfvEHG SjBeBQPyOPqiukgRY8rwREmjZgLUYq1AdCBg8= 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; bh=y77VXTcItoEr50fnaXeizXOxi+B96vWDrfG5IAacJoI=; b=hHgpDNwwtVQ9H4caaNNQX2oGhVlx5M3N1dew48wbsf3ruGToLL47n7nEJ7HTCAFxs0 C5hEumSw3oic63YHJwqTyVkRal1vRICwFS6L75SFenVOXH+vTCseBffdmFiXugpZ+Xhh HLJsLR2C6eXjcECx5/O87W0x2/E3gW20xNYmM4YghOxT7hxilhbiXarlOncpljU5qDGx fztKbYZgi33md5OBGzmAvR4jJGPXxAUg6WDG5rYWZtfivQq1ZVmnuAMJ66FWj6/D2X4Y bIKc+WPtBqCqC9HjjcfcI4dT9GsjEDWbA8fqWEisGa5uaB405aQZJTL3IRnDMNIKlTpI 6KlA== X-Gm-Message-State: APf1xPDGzLB9FIOu79XxVbo2uZqZ8GVwIydhbRDEk4eoZU4iIFyVjY1w AsB+Bk5b1NhlwM0O+BqRYLCefG5nn8c= X-Received: by 10.101.100.208 with SMTP id t16mr7928770pgv.398.1518891899959; Sat, 17 Feb 2018 10:24:59 -0800 (PST) Received: from cloudburst.twiddle.net ([50.0.192.64]) by smtp.gmail.com with ESMTPSA id h15sm13466712pfi.56.2018.02.17.10.24.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Feb 2018 10:24:59 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 17 Feb 2018 10:23:15 -0800 Message-Id: <20180217182323.25885-60-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180217182323.25885-1-richard.henderson@linaro.org> References: <20180217182323.25885-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v2 59/67] target/arm: Implement SVE Floating Point Multiply Indexed Group 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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/helper.h | 14 ++++++++++ target/arm/translate-sve.c | 44 +++++++++++++++++++++++++++++++ target/arm/vec_helper.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ target/arm/sve.decode | 19 ++++++++++++++ 4 files changed, 141 insertions(+) -- 2.14.3 Reviewed-by: Peter Maydell diff --git a/target/arm/helper.h b/target/arm/helper.h index f3ce58e276..a8d824b085 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -584,6 +584,20 @@ DEF_HELPER_FLAGS_5(gvec_ftsmul_s, TCG_CALL_NO_RWG, DEF_HELPER_FLAGS_5(gvec_ftsmul_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fmul_idx_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fmul_idx_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_5(gvec_fmul_idx_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, i32) + +DEF_HELPER_FLAGS_6(gvec_fmla_idx_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_6(gvec_fmla_idx_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_6(gvec_fmla_idx_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) + #ifdef TARGET_AARCH64 #include "helper-a64.h" #include "helper-sve.h" diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 6ce1b01b9a..cf2a4d3284 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3136,6 +3136,50 @@ DO_ZZI(UMIN, umin) #undef DO_ZZI +/* + *** SVE Floating Point Multiply-Add Indexed Group + */ + +static void trans_FMLA_zzxz(DisasContext *s, arg_FMLA_zzxz *a, uint32_t insn) +{ + static gen_helper_gvec_4_ptr * const fns[3] = { + gen_helper_gvec_fmla_idx_h, + gen_helper_gvec_fmla_idx_s, + gen_helper_gvec_fmla_idx_d, + }; + unsigned vsz = vec_full_reg_size(s); + TCGv_ptr status = get_fpstatus_ptr(a->esz == MO_16); + + tcg_gen_gvec_4_ptr(vec_full_reg_offset(s, a->rd), + vec_full_reg_offset(s, a->rn), + vec_full_reg_offset(s, a->rm), + vec_full_reg_offset(s, a->ra), + status, vsz, vsz, a->index * 2 + a->sub, + fns[a->esz - 1]); + tcg_temp_free_ptr(status); +} + +/* + *** SVE Floating Point Multiply Indexed Group + */ + +static void trans_FMUL_zzx(DisasContext *s, arg_FMUL_zzx *a, uint32_t insn) +{ + static gen_helper_gvec_3_ptr * const fns[3] = { + gen_helper_gvec_fmul_idx_h, + gen_helper_gvec_fmul_idx_s, + gen_helper_gvec_fmul_idx_d, + }; + unsigned vsz = vec_full_reg_size(s); + TCGv_ptr status = get_fpstatus_ptr(a->esz == MO_16); + + tcg_gen_gvec_3_ptr(vec_full_reg_offset(s, a->rd), + vec_full_reg_offset(s, a->rn), + vec_full_reg_offset(s, a->rm), + status, vsz, vsz, a->index, fns[a->esz - 1]); + tcg_temp_free_ptr(status); +} + /* *** SVE Floating Point Accumulating Reduction Group */ diff --git a/target/arm/vec_helper.c b/target/arm/vec_helper.c index ad5c29cdd5..e711a3217d 100644 --- a/target/arm/vec_helper.c +++ b/target/arm/vec_helper.c @@ -24,6 +24,22 @@ #include "fpu/softfloat.h" +/* Note that vector data is stored in host-endian 64-bit chunks, + so addressing units smaller than that needs a host-endian fixup. */ +#ifdef HOST_WORDS_BIGENDIAN +#define H1(x) ((x) ^ 7) +#define H1_2(x) ((x) ^ 6) +#define H1_4(x) ((x) ^ 4) +#define H2(x) ((x) ^ 3) +#define H4(x) ((x) ^ 1) +#else +#define H1(x) (x) +#define H1_2(x) (x) +#define H1_4(x) (x) +#define H2(x) (x) +#define H4(x) (x) +#endif + /* Floating-point trigonometric starting value. * See the ARM ARM pseudocode function FPTrigSMul. */ @@ -92,3 +108,51 @@ DO_3OP(gvec_rsqrts_d, helper_rsqrtsf_f64, float64) #endif #undef DO_3OP + +/* For the indexed ops, SVE applies the index per 128-bit vector segment. + * For AdvSIMD, there is of course only one such vector segment. + */ + +#define DO_MUL_IDX(NAME, TYPE, H) \ +void HELPER(NAME)(void *vd, void *vn, void *vm, void *stat, uint32_t desc) \ +{ \ + intptr_t i, j, oprsz = simd_oprsz(desc), segment = 16 / sizeof(TYPE); \ + intptr_t idx = simd_data(desc); \ + TYPE *d = vd, *n = vn, *m = vm; \ + for (i = 0; i < oprsz / sizeof(TYPE); i += segment) { \ + TYPE mm = m[H(i + idx)]; \ + for (j = 0; j < segment; j++) { \ + d[i + j] = TYPE##_mul(n[i + j], mm, stat); \ + } \ + } \ +} + +DO_MUL_IDX(gvec_fmul_idx_h, float16, H2) +DO_MUL_IDX(gvec_fmul_idx_s, float32, H4) +DO_MUL_IDX(gvec_fmul_idx_d, float64, ) + +#undef DO_MUL_IDX + +#define DO_FMLA_IDX(NAME, TYPE, H) \ +void HELPER(NAME)(void *vd, void *vn, void *vm, void *va, \ + void *stat, uint32_t desc) \ +{ \ + intptr_t i, j, oprsz = simd_oprsz(desc), segment = 16 / sizeof(TYPE); \ + TYPE op1_neg = extract32(desc, SIMD_DATA_SHIFT, 1); \ + intptr_t idx = desc >> (SIMD_DATA_SHIFT + 1); \ + TYPE *d = vd, *n = vn, *m = vm, *a = va; \ + op1_neg <<= (8 * sizeof(TYPE) - 1); \ + for (i = 0; i < oprsz / sizeof(TYPE); i += segment) { \ + TYPE mm = m[H(i + idx)]; \ + for (j = 0; j < segment; j++) { \ + d[i + j] = TYPE##_muladd(n[i + j] ^ op1_neg, \ + mm, a[i + j], 0, stat); \ + } \ + } \ +} + +DO_FMLA_IDX(gvec_fmla_idx_h, float16, H2) +DO_FMLA_IDX(gvec_fmla_idx_s, float32, H4) +DO_FMLA_IDX(gvec_fmla_idx_d, float64, ) + +#undef DO_FMLA_IDX diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 258d14b729..d16e733aa3 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -30,6 +30,7 @@ %preg4_5 5:4 %size_23 23:2 %dtype_23_13 23:2 13:2 +%index3_22_19 22:1 19:2 # A combination of tsz:imm3 -- extract esize. %tszimm_esz 22:2 5:5 !function=tszimm_esz @@ -720,6 +721,24 @@ UMIN_zzi 00100101 .. 101 011 110 ........ ..... @rdn_i8u # SVE integer multiply immediate (unpredicated) MUL_zzi 00100101 .. 110 000 110 ........ ..... @rdn_i8s +### SVE FP Multiply-Add Indexed Group + +# SVE floating-point multiply-add (indexed) +FMLA_zzxz 01100100 0.1 .. rm:3 00000 sub:1 rn:5 rd:5 \ + ra=%reg_movprfx index=%index3_22_19 esz=1 +FMLA_zzxz 01100100 101 index:2 rm:3 00000 sub:1 rn:5 rd:5 \ + ra=%reg_movprfx esz=2 +FMLA_zzxz 01100100 111 index:1 rm:4 00000 sub:1 rn:5 rd:5 \ + ra=%reg_movprfx esz=3 + +### SVE FP Multiply Indexed Group + +# SVE floating-point multiply (indexed) +FMUL_zzx 01100100 0.1 .. rm:3 001000 rn:5 rd:5 \ + index=%index3_22_19 esz=1 +FMUL_zzx 01100100 101 index:2 rm:3 001000 rn:5 rd:5 esz=2 +FMUL_zzx 01100100 111 index:1 rm:4 001000 rn:5 rd:5 esz=3 + ### SVE FP Accumulating Reduction Group # SVE floating-point serial reduction (predicated)