From patchwork Mon Aug 17 08:49:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 1345932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=hZNDah7C; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BVSgh2LPRz9sTX for ; Mon, 17 Aug 2020 19:00:46 +1000 (AEST) Received: from localhost ([::1]:58028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7b0V-0008Pz-Ds for incoming@patchwork.ozlabs.org; Mon, 17 Aug 2020 05:00:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7ar0-000763-Pv for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:50:54 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:51394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7aqz-0004xN-0b for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:50:54 -0400 Received: by mail-pj1-x102f.google.com with SMTP id c6so7488226pje.1 for ; Mon, 17 Aug 2020 01:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VLZnBxT2g7CE2cLsr6cNBvAHsI2zUW95KdIURRcdPFY=; b=hZNDah7CL4BBQkRs2ZpNa/zPpfHx4EDyJpZD7LPU5OkLcQZO2m1Oyfr/4OwTI6mOoe DWO0MKrNC/m+7j9ejGbVhparuVt8TlAp4HCFCX8kw1ceQ8gIfZ5YJCJdpbneEluzokzG NqSzPhuVw4ylg9ZW3poPgFpxmwM2eIgKu/GntUwZS0IGABP0BxTygEQo51XOa1apPNzH FBLpE4s35E1EROyfBv5C1G5a7u/46s/K9E7N+SdsncqJwl1bBAiuGaW7aE9YXzSwBj4W wnYPRFSm2wA7imTJn76Vtu8yCJeQeHIJSa6V0JRDJMjmUT9DHyxNf8Ae0ZzCcCR5WkGd YtEA== 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=VLZnBxT2g7CE2cLsr6cNBvAHsI2zUW95KdIURRcdPFY=; b=cWeddNJ/FbdSGg0UvCjMM6HKOFtmgVTXQzEA9d9/sXQRf/jEL09uMWE5c4PLPOJxZd rJ7bNgbovfauB0wX3l5X/Fb/GdeGilurrHcAC/hM7xnoKHfSvyuzwO0YGNMv3RjEXP0X QxCTmJpS785eGlJ1rl1CAjWo/974YKMsKudoxopiS2w+IxTMlqujuAVveS4BZfNMhYeJ 6qZjvqzSqltag5bq/LQOaFiKSDg07Uo/z02EX45IfhG3c1jDaX4OFCZ+EEqwhy1yW8Ap nilR6sVvulOVCtLqwJ+LfrmIbfUu7/Z9nihPCZ/F54gtqe+0RsMLysYJD8lP7Zt3yuyi PUAA== X-Gm-Message-State: AOAM532DaqDvHxg50olqhNfsxCoY5Nu6tEXkr4QW2QfGBS9ahFoju5VT p1ElF4oe2uUW7RZ7BIWDOPfRV7umVf+8Pw== X-Google-Smtp-Source: ABdhPJz+JBIM7kggLQw1akhycrTjN0Lv8233Q1iNNYj8w+ExcIC1W0Q0AbA+WnmyzL7ZwQ8OBs0G+A== X-Received: by 2002:a17:90a:aa8e:: with SMTP id l14mr12580035pjq.67.1597654251455; Mon, 17 Aug 2020 01:50:51 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id d9sm16478588pgv.45.2020.08.17.01.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:50:51 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v4 16/70] target/riscv: rvv:1.0: add translation-time nan-box helper function Date: Mon, 17 Aug 2020 16:49:01 +0800 Message-Id: <20200817084955.28793-17-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817084955.28793-1-frank.chang@sifive.com> References: <20200817084955.28793-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=frank.chang@sifive.com; helo=mail-pj1-x102f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Chang , Alistair Francis , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Frank Chang * Add fp16 nan-box check generator function, if a 16-bit input is not properly nanboxed, then the input is replaced with the default qnan. * Add do_nanbox() helper function to utilize gen_check_nanbox_X() to generate the NaN-boxed floating-point values based on SEW setting. * Apply nanbox helper in opfvf_trans Signed-off-by: Frank Chang Reviewed-by: Richard Henderson --- target/riscv/insn_trans/trans_rvv.inc.c | 35 ++++++++++++++++++++++++- target/riscv/translate.c | 10 +++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/target/riscv/insn_trans/trans_rvv.inc.c b/target/riscv/insn_trans/trans_rvv.inc.c index daaa47ac9c3..4b8ae5470c3 100644 --- a/target/riscv/insn_trans/trans_rvv.inc.c +++ b/target/riscv/insn_trans/trans_rvv.inc.c @@ -2076,6 +2076,33 @@ GEN_OPIVI_NARROW_TRANS(vnclip_vi, IMM_ZX, vnclip_vx) /* *** Vector Float Point Arithmetic Instructions */ + +/* + * As RVF-only cpus always have values NaN-boxed to 64-bits, + * RVF and RVD can be treated equally. + * We don't have to deal with the cases of: SEW > FLEN. + * + * If SEW < FLEN, check whether input fp register is a valid + * NaN-boxed value, in which case the least-significant SEW bits + * of the f regsiter are used, else the canonical NaN value is used. + */ +static void do_nanbox(DisasContext *s, TCGv_i64 out, TCGv_i64 in) +{ + switch (s->sew) { + case 1: + gen_check_nanbox_h(out, in); + break; + case 2: + gen_check_nanbox_s(out, in); + break; + case 3: + tcg_gen_mov_i64(out, in); + break; + default: + g_assert_not_reached(); + } +} + /* Vector Single-Width Floating-Point Add/Subtract Instructions */ /* @@ -2128,6 +2155,7 @@ static bool opfvf_trans(uint32_t vd, uint32_t rs1, uint32_t vs2, { TCGv_ptr dest, src2, mask; TCGv_i32 desc; + TCGv_i64 t1; TCGLabel *over = gen_new_label(); tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_vl, 0, over); @@ -2141,12 +2169,17 @@ static bool opfvf_trans(uint32_t vd, uint32_t rs1, uint32_t vs2, tcg_gen_addi_ptr(src2, cpu_env, vreg_ofs(s, vs2)); tcg_gen_addi_ptr(mask, cpu_env, vreg_ofs(s, 0)); - fn(dest, mask, cpu_fpr[rs1], src2, cpu_env, desc); + /* NaN-box f[rs1] */ + t1 = tcg_temp_new_i64(); + do_nanbox(s, t1, cpu_fpr[rs1]); + + fn(dest, mask, t1, src2, cpu_env, desc); tcg_temp_free_ptr(dest); tcg_temp_free_ptr(mask); tcg_temp_free_ptr(src2); tcg_temp_free_i32(desc); + tcg_temp_free_i64(t1); mark_vs_dirty(s); gen_set_label(over); return true; diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 10ef55bbeb7..0b3f5f1b4ba 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -121,6 +121,16 @@ static void gen_nanbox_s(TCGv_i64 out, TCGv_i64 in) * * Here, the result is always nan-boxed, even the canonical nan. */ +static void gen_check_nanbox_h(TCGv_i64 out, TCGv_i64 in) +{ + TCGv_i64 t_max = tcg_const_i64(0xffffffffffff0000ull); + TCGv_i64 t_nan = tcg_const_i64(0xffffffffffff7e00ull); + + tcg_gen_movcond_i64(TCG_COND_GEU, out, in, t_max, in, t_nan); + tcg_temp_free_i64(t_max); + tcg_temp_free_i64(t_nan); +} + static void gen_check_nanbox_s(TCGv_i64 out, TCGv_i64 in) { TCGv_i64 t_max = tcg_const_i64(0xffffffff00000000ull);