From patchwork Thu Jun 21 01:53:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 139432 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1488584lji; Wed, 20 Jun 2018 19:23:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL+6U+LbjppYN6TX4I6BS7Lqce4yBhfUwYte2EmegOnFi0mbxQCB28T2BFG0eYOLQMqSMfQ X-Received: by 2002:ac8:2836:: with SMTP id 51-v6mr21703832qtq.131.1529547783437; Wed, 20 Jun 2018 19:23:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529547783; cv=none; d=google.com; s=arc-20160816; b=tiTv/kewS692mXKIWPdnXpVh0ffK9iexeZZI2IAebPT49NZ3Y7CjYMTXy3W+788rzg sZpZ4TEvfhlLpil/s8yXHiz0Ne5LU8AbFHjRUBxKGZBZa5JRgTwu/RrD960e33UZn3e8 R9pNHWvFsQu9vAZapV/X2QabCYV6UOufByarAKx+P2Je9yeG0x9Na+Z2d4x5NE9Q80X1 CDeyUpYbekai3z8uaDKSNt33cMtbZZKo9DlT9X8ezwdYgZ18pTCQKZk1L/pKahC3NOTk CWwmk9YUc7jYwSIBnOH3Oho4q5Jmyn03QAjBTvwZ71Kexi9Ft2WtKIaaTI/cEvyADP6A aPQg== 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=li9h4tydA6NYZ7tm8NAvM0RkuO1DvOT8U6gU0EDKrec=; b=v1mcEGmWZX2lrH0+xAcdMy0lHRJUEDhikSJilpta7YTLCNMasUJ6Ri71VLrcO5QNpI 6BfnlKC5XryXjnRBS2+TS+30lAJgCyVipjG/fzkXko585hFzK6hnE6/G5Ne7I4ekK6fw wZueXs3lf0gbhPT34RUoDpGazFtoLSXqWVYC+wR9TguK6V+2Pg4Pl0zlirIuuoGKoCZi HhxELHYspXUX0EcltdddUASxR4M7RAzhj3uQWrtacUiJSaBjC8GzEpdo1OlwjXXuu2Et lwoGj/mM3AoSANnasiVuQVrCXrEkNsoBKd24MKetvIR/FjTOkQwz7ORXZRHlFEZlte5I seFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IaRvnxPH; 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 s22-v6si3811522qts.215.2018.06.20.19.23.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Jun 2018 19:23:03 -0700 (PDT) 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=IaRvnxPH; 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]:52634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVpFW-0002Ah-V7 for patch@linaro.org; Wed, 20 Jun 2018 22:23:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVooQ-0004rB-8L for qemu-devel@nongnu.org; Wed, 20 Jun 2018 21:55:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVooO-0003Sc-H6 for qemu-devel@nongnu.org; Wed, 20 Jun 2018 21:55:02 -0400 Received: from mail-pl0-x235.google.com ([2607:f8b0:400e:c01::235]:43907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVooO-0003Rs-7u for qemu-devel@nongnu.org; Wed, 20 Jun 2018 21:55:00 -0400 Received: by mail-pl0-x235.google.com with SMTP id c41-v6so746764plj.10 for ; Wed, 20 Jun 2018 18:55:00 -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; bh=li9h4tydA6NYZ7tm8NAvM0RkuO1DvOT8U6gU0EDKrec=; b=IaRvnxPHffmQGsxyZo10mwgRGxXD2Jcri9Crz7ytPRU/yckYyxv7X/Na3029U8H4at dBnb8v8SHwsw1UyX5iyNkONbyYbr1xqIWKEG1BTMpGF0fy77OSFeTHQ4Gd8b568EiJ8g TBzhlhOS9cRrBd9C2WsM/G454UsJYsFrntSok= 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=li9h4tydA6NYZ7tm8NAvM0RkuO1DvOT8U6gU0EDKrec=; b=DjtZdkzKUJL4+L9AlJzcns5NK7Lq0HbtKpnGJVvrclXmYLnSxvySM3pk4XKLTneDyH +neIHvye2t7AVk97z7RY/zBMMVwr0EXHMrKnIJrojxvEw5QzsHO5Mc4frRNG7gq+dnkc shMW2F8eY7dHjwChgHLr6VZclEjfNXlHxT7IGJokEyJbbPZsanmvUCnQ8oYoCXZDidEH x/7ZwfreiwsbvRnb/I0QJYRR4b23cDH2A+bz1G37WZmgsHxKJU7+f2o8xc0H3oJTwHuJ kJeA4OpA31fxlEHlOY68gjMXLcADvVkEgd1uWOaa5+zCbeGmvqDavJwyD0CdacqJYXhT ecSw== X-Gm-Message-State: APt69E3h5HECrMOjBi44rJs6TBE2oKuA9ZAkQbq0M386aJhfYVQZmOVb U+zOM7QztCYvl6tbyAzEY/sTK+S3Qxo= X-Received: by 2002:a17:902:b18b:: with SMTP id s11-v6mr26452889plr.190.1529546098935; Wed, 20 Jun 2018 18:54:58 -0700 (PDT) Received: from cloudburst.twiddle.net (mta-98-147-121-51.hawaii.rr.com. [98.147.121.51]) by smtp.gmail.com with ESMTPSA id a27-v6sm6187946pfc.18.2018.06.20.18.54.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 18:54:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 20 Jun 2018 15:53:52 -1000 Message-Id: <20180621015359.12018-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621015359.12018-1-richard.henderson@linaro.org> References: <20180621015359.12018-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:c01::235 Subject: [Qemu-devel] [PATCH v5 28/35] target/arm: Implement SVE floating-point complex add 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/helper-sve.h | 7 +++ target/arm/sve_helper.c | 100 +++++++++++++++++++++++++++++++++++++ target/arm/translate-sve.c | 24 +++++++++ target/arm/sve.decode | 4 ++ 4 files changed, 135 insertions(+) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/arm/helper-sve.h b/target/arm/helper-sve.h index 891346a5ac..0bd9fe2f28 100644 --- a/target/arm/helper-sve.h +++ b/target/arm/helper-sve.h @@ -1092,6 +1092,13 @@ DEF_HELPER_FLAGS_6(sve_facgt_s, TCG_CALL_NO_RWG, DEF_HELPER_FLAGS_6(sve_facgt_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_6(sve_fcadd_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_6(sve_fcadd_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_6(sve_fcadd_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, ptr, i32) + DEF_HELPER_FLAGS_3(sve_fmla_zpzzz_h, TCG_CALL_NO_RWG, void, env, ptr, i32) DEF_HELPER_FLAGS_3(sve_fmla_zpzzz_s, TCG_CALL_NO_RWG, void, env, ptr, i32) DEF_HELPER_FLAGS_3(sve_fmla_zpzzz_d, TCG_CALL_NO_RWG, void, env, ptr, i32) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 5309cf0866..ee7fc23bb9 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -3629,6 +3629,106 @@ void HELPER(sve_ftmad_d)(void *vd, void *vn, void *vm, void *vs, uint32_t desc) } } +/* + * FP Complex Add + */ + +void HELPER(sve_fcadd_h)(void *vd, void *vn, void *vm, void *vg, + void *vs, uint32_t desc) +{ + intptr_t j, i = simd_oprsz(desc); + uint64_t *g = vg; + float16 neg_imag = float16_set_sign(0, simd_data(desc)); + float16 neg_real = float16_chs(neg_imag); + + do { + uint64_t pg = g[(i - 1) >> 6]; + do { + float16 e0, e1, e2, e3; + + /* I holds the real index; J holds the imag index. */ + j = i - sizeof(float16); + i -= 2 * sizeof(float16); + + e0 = *(float16 *)(vn + H1_2(i)); + e1 = *(float16 *)(vm + H1_2(j)) ^ neg_real; + e2 = *(float16 *)(vn + H1_2(j)); + e3 = *(float16 *)(vm + H1_2(i)) ^ neg_imag; + + if (likely((pg >> (i & 63)) & 1)) { + *(float16 *)(vd + H1_2(i)) = float16_add(e0, e1, vs); + } + if (likely((pg >> (j & 63)) & 1)) { + *(float16 *)(vd + H1_2(j)) = float16_add(e2, e3, vs); + } + } while (i & 63); + } while (i != 0); +} + +void HELPER(sve_fcadd_s)(void *vd, void *vn, void *vm, void *vg, + void *vs, uint32_t desc) +{ + intptr_t j, i = simd_oprsz(desc); + uint64_t *g = vg; + float32 neg_imag = float32_set_sign(0, simd_data(desc)); + float32 neg_real = float32_chs(neg_imag); + + do { + uint64_t pg = g[(i - 1) >> 6]; + do { + float32 e0, e1, e2, e3; + + /* I holds the real index; J holds the imag index. */ + j = i - sizeof(float32); + i -= 2 * sizeof(float32); + + e0 = *(float32 *)(vn + H1_2(i)); + e1 = *(float32 *)(vm + H1_2(j)) ^ neg_real; + e2 = *(float32 *)(vn + H1_2(j)); + e3 = *(float32 *)(vm + H1_2(i)) ^ neg_imag; + + if (likely((pg >> (i & 63)) & 1)) { + *(float32 *)(vd + H1_2(i)) = float32_add(e0, e1, vs); + } + if (likely((pg >> (j & 63)) & 1)) { + *(float32 *)(vd + H1_2(j)) = float32_add(e2, e3, vs); + } + } while (i & 63); + } while (i != 0); +} + +void HELPER(sve_fcadd_d)(void *vd, void *vn, void *vm, void *vg, + void *vs, uint32_t desc) +{ + intptr_t j, i = simd_oprsz(desc); + uint64_t *g = vg; + float64 neg_imag = float64_set_sign(0, simd_data(desc)); + float64 neg_real = float64_chs(neg_imag); + + do { + uint64_t pg = g[(i - 1) >> 6]; + do { + float64 e0, e1, e2, e3; + + /* I holds the real index; J holds the imag index. */ + j = i - sizeof(float64); + i -= 2 * sizeof(float64); + + e0 = *(float64 *)(vn + H1_2(i)); + e1 = *(float64 *)(vm + H1_2(j)) ^ neg_real; + e2 = *(float64 *)(vn + H1_2(j)); + e3 = *(float64 *)(vm + H1_2(i)) ^ neg_imag; + + if (likely((pg >> (i & 63)) & 1)) { + *(float64 *)(vd + H1_2(i)) = float64_add(e0, e1, vs); + } + if (likely((pg >> (j & 63)) & 1)) { + *(float64 *)(vd + H1_2(j)) = float64_add(e2, e3, vs); + } + } while (i & 63); + } while (i != 0); +} + /* * Load contiguous data, protected by a governing predicate. */ diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 067c219b54..7a39be9bdd 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3895,6 +3895,30 @@ DO_FPCMP(FACGT, facgt) #undef DO_FPCMP +static bool trans_FCADD(DisasContext *s, arg_FCADD *a, uint32_t insn) +{ + static gen_helper_gvec_4_ptr * const fns[3] = { + gen_helper_sve_fcadd_h, + gen_helper_sve_fcadd_s, + gen_helper_sve_fcadd_d + }; + + if (a->esz == 0) { + return false; + } + if (sve_access_check(s)) { + 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), + pred_full_reg_offset(s, a->pg), + status, vsz, vsz, a->rot, fns[a->esz - 1]); + tcg_temp_free_ptr(status); + } + return true; +} + typedef void gen_helper_sve_fmla(TCGv_env, TCGv_ptr, TCGv_i32); static bool do_fmla(DisasContext *s, arg_rprrr_esz *a, gen_helper_sve_fmla *fn) diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 85f2b39776..7b5ada1311 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -721,6 +721,10 @@ UMIN_zzi 00100101 .. 101 011 110 ........ ..... @rdn_i8u # SVE integer multiply immediate (unpredicated) MUL_zzi 00100101 .. 110 000 110 ........ ..... @rdn_i8s +# SVE floating-point complex add (predicated) +FCADD 01100100 esz:2 00000 rot:1 100 pg:3 rm:5 rd:5 \ + rn=%reg_movprfx + ### SVE FP Multiply-Add Indexed Group # SVE floating-point multiply-add (indexed)