From patchwork Thu Mar 1 11:23:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 130152 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2684080edc; Thu, 1 Mar 2018 03:36:10 -0800 (PST) X-Google-Smtp-Source: AG47ELteudzLvImaqFlfcxvylmu28jfEryWSGUVbmoG8YvcCRhTk3gVBuzrqpIvCJYL/AMEJOP7R X-Received: by 2002:a25:aca6:: with SMTP id x38-v6mr766588ybi.475.1519904170530; Thu, 01 Mar 2018 03:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519904170; cv=none; d=google.com; s=arc-20160816; b=nR94V6639imLOBq1Cy1CMW31/8sdfYzKYM2aA+VtOVY7Sdbc58WUUWFj1PsW7JZDKs m8WDYUpUEfUAcDcqt8+XzJObpgNYZQA30rm9mmXJ5fpJ0MJ7FfKJL5FYVYv/FJwirP9L p+ofPUG8DzLlku8ePkCntFfJ8XP93QHiW3pWmFmLvTfBmybUx4Ksdahj6V7ex0Ycv2px J4h92T9PJPdtQoof86OICBUea+DikEyMRW4NfBgXaJaQSRUTKRUD96h2DVCqDfqQsMji 6hVfm2UBuCwci2sHPYSidvjHx6W6+G3tWskXWJFrDT4LSlpQZrCL+zp3AJeOEwdk2MPw kiFg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=HF35EPi0afWblUcCDaRCoJui5CfxSrH3PwoJ1Oh7p7o=; b=wdrmO4Mx3Nw+q99AUOclQlWvCaJmUmsyw7Em98J5DZOQOappzAZI0mKlL6dxMkLcI2 ca/yWbtq8/8rkMICM7izEcHLm+S4IWtpo1D03Wone0bzPkclWkOesLJAfjTOUCLmClGW VVuxSZjIPqlDqQibFW93AZfXeDWWATx6Hm2B6/w5G9hrmKy2YexeYfc0421zzz9xefZY dDcdb2RtNzrZlPowFyTnmgfFDWvD4jNzT6+YJnoFwH4Uh3LHn8seA/I5/RwzLXRzq/5O TJZbUz1e+AiJe5YJReLYKPMGcDCB0JkLAZLq0KMHrhYptHqUzjOuxi2tG/rxIJ6dZ3pi P7NQ== ARC-Authentication-Results: i=1; mx.google.com; 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 190-v6si616583ybt.354.2018.03.01.03.36.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Mar 2018 03:36:10 -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; 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]:55773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erMVN-0005ha-UA for patch@linaro.org; Thu, 01 Mar 2018 06:36:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erMJw-0003kG-5r for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erMJv-00088H-4P for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:20 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erMJu-00082m-Rc for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:19 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1erMJt-0000c8-Uh for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:24:17 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 11:23:40 +0000 Message-Id: <20180301112403.12487-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180301112403.12487-1-peter.maydell@linaro.org> References: <20180301112403.12487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 19/42] arm/translate-a64: add FP16 FMULA/X/S to simd_three_reg_same_fp16 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-id: 20180227143852.11175-12-alex.bennee@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper-a64.h | 2 ++ target/arm/helper-a64.c | 24 ++++++++++++++++++++++++ target/arm/translate-a64.c | 15 +++++++++++++++ 3 files changed, 41 insertions(+) -- 2.16.2 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 1cf40bda5e..9c1a95594c 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -61,3 +61,5 @@ DEF_HELPER_3(advsimd_cge_f16, i32, f16, f16, ptr) DEF_HELPER_3(advsimd_cgt_f16, i32, f16, f16, ptr) DEF_HELPER_3(advsimd_acge_f16, i32, f16, f16, ptr) DEF_HELPER_3(advsimd_acgt_f16, i32, f16, f16, ptr) +DEF_HELPER_3(advsimd_mulxh, f16, f16, f16, ptr) +DEF_HELPER_4(advsimd_muladdh, f16, f16, f16, f16, ptr) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index d0b284fec4..1ef13abd76 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -595,6 +595,30 @@ ADVSIMD_HALFOP(max) ADVSIMD_HALFOP(minnum) ADVSIMD_HALFOP(maxnum) +/* Data processing - scalar floating-point and advanced SIMD */ +float16 HELPER(advsimd_mulxh)(float16 a, float16 b, void *fpstp) +{ + float_status *fpst = fpstp; + + a = float16_squash_input_denormal(a, fpst); + b = float16_squash_input_denormal(b, fpst); + + if ((float16_is_zero(a) && float16_is_infinity(b)) || + (float16_is_infinity(a) && float16_is_zero(b))) { + /* 2.0 with the sign bit set to sign(A) XOR sign(B) */ + return make_float16((1U << 14) | + ((float16_val(a) ^ float16_val(b)) & (1U << 15))); + } + return float16_mul(a, b, fpst); +} + +/* fused multiply-accumulate */ +float16 HELPER(advsimd_muladdh)(float16 a, float16 b, float16 c, void *fpstp) +{ + float_status *fpst = fpstp; + return float16_muladd(a, b, c, 0, fpst); +} + /* * Floating point comparisons produce an integer result. Softfloat * routines return float_relation types which we convert to the 0/-1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index fb74dc1c45..0e2d298687 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -10286,9 +10286,17 @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn) case 0x0: /* FMAXNM */ gen_helper_advsimd_maxnumh(tcg_res, tcg_op1, tcg_op2, fpst); break; + case 0x1: /* FMLA */ + read_vec_element_i32(s, tcg_res, rd, pass, MO_16); + gen_helper_advsimd_muladdh(tcg_res, tcg_op1, tcg_op2, tcg_res, + fpst); + break; case 0x2: /* FADD */ gen_helper_advsimd_addh(tcg_res, tcg_op1, tcg_op2, fpst); break; + case 0x3: /* FMULX */ + gen_helper_advsimd_mulxh(tcg_res, tcg_op1, tcg_op2, fpst); + break; case 0x4: /* FCMEQ */ gen_helper_advsimd_ceq_f16(tcg_res, tcg_op1, tcg_op2, fpst); break; @@ -10298,6 +10306,13 @@ static void disas_simd_three_reg_same_fp16(DisasContext *s, uint32_t insn) case 0x8: /* FMINNM */ gen_helper_advsimd_minnumh(tcg_res, tcg_op1, tcg_op2, fpst); break; + case 0x9: /* FMLS */ + /* As usual for ARM, separate negation for fused multiply-add */ + tcg_gen_xori_i32(tcg_op1, tcg_op1, 0x8000); + read_vec_element_i32(s, tcg_res, rd, pass, MO_16); + gen_helper_advsimd_muladdh(tcg_res, tcg_op1, tcg_op2, tcg_res, + fpst); + break; case 0xa: /* FSUB */ gen_helper_advsimd_subh(tcg_res, tcg_op1, tcg_op2, fpst); break;