From patchwork Tue Jul 3 15:17:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140976 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1295257ljj; Tue, 3 Jul 2018 08:21:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdp5q6Zq0xSM839m/GS9iCb0P5SRuQehdVK6qyWO2SiZ4GwinyRIkKj8/TFyBBVNFnYe1PA X-Received: by 2002:ac8:1acd:: with SMTP id h13-v6mr27370818qtk.206.1530631313449; Tue, 03 Jul 2018 08:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530631313; cv=none; d=google.com; s=arc-20160816; b=puNJpxXZEo5JvdAaSRNzGhgJqURBEWeQtozQ1wfbOR9GnoJsIWO3YFerwqHBetWsph Y5TUmgoCwtYW1o00jY1iEVmhkTm5qR2ySREBE3HfolirH2TdZL5jlVYTkBiYmO3PQ1wf o8r0PqnCToQgdeLWhnwsRLLErwvpbS/R7xy1i4MYXvRuFxGimEfCpE4/7wikXbqZOVKv I9uUnLTRdUvvFFyddd97abANWyj+vTUUALVJqjMtSKsT9/yWDttMSOVGlvF2inlAF4tK /gSTD/APrZEwLklt7TO7Pgt0S9RwGZJDwzobI+7VG5dEpkujY9fbxRDoHDnSg+Fq0NxQ azcQ== 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=m+eauDzkbLO8Pb2FKzAIybKR1kdYA2iqGOrOBkGxKK4=; b=QFz5KkgJPbAG1D7WR5IyOhmtFjjlTrQDFc4eXR2I9999cZ+yP3lYFcFKXLYn6hqN6P adu4r44N8lGVRsb1di7lzHLhPGUV0fogj1wvf9zggfVgMvIAQcJ32gSZ05hF0rVlzVXa xFATnwp5PL1KY55yDc6QRj2DUOXhhNUBLfmkZSnedWvBaz4r0X0FKcKuruO0Pz/yCNRL fTHAcPdBzGi6e9iGB7Ctcz6SZDy04lg/XrPF/g8e9P9qYXFP/sQZmNgMHCGBJhcCmNSM kqlIOpEghoAfeRE316S+TIkLRV0cXRHED7hKjgsF/7so2Wwn2GN20/KtVKA17QS+ig91 f6Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B5rGs70S; 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 r81-v6si1329602qka.26.2018.07.03.08.21.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 08:21:53 -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=B5rGs70S; 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]:41054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faN7o-0008R0-LY for patch@linaro.org; Tue, 03 Jul 2018 11:21:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faN3t-0006Oa-4W for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:17:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faN3r-0000SC-0K for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:17:49 -0400 Received: from mail-pf0-x22e.google.com ([2607:f8b0:400e:c00::22e]:41189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faN3q-0000Rm-GO for qemu-devel@nongnu.org; Tue, 03 Jul 2018 11:17:46 -0400 Received: by mail-pf0-x22e.google.com with SMTP id a11-v6so1172551pff.8 for ; Tue, 03 Jul 2018 08:17:46 -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=m+eauDzkbLO8Pb2FKzAIybKR1kdYA2iqGOrOBkGxKK4=; b=B5rGs70Sk7Gw9OC8cwZcVZGU1+fQm3F69JhCioDp3eMVSRwasiEttbr7ggGWKar81+ RQ3gJxGIvsEeV0mNv52FdKwHNUfc77dNSNOoWqE3mbvdJdiI7cypue/0uOaF8xuCatNq HtKCAdK/UWEHFYLx0LCR7k6AG463UGeRb2+wM= 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=m+eauDzkbLO8Pb2FKzAIybKR1kdYA2iqGOrOBkGxKK4=; b=lQj/EP0tG2pu1CBUapdGxxk5Ad2YSHipdK9yROrgOn7YT+KQNoRq8j6Ir+rTz6oFxa oH+ptjISSi31UsdlWUEa1lxHjp0O+DZTxk9FWSSl5InXnaP3yUhwxuO8OV9neufR/XBx Pxd2GE3VaVQTjWPHvvlNXOm3+GSyS2Co7xRNs67bhSGzJ1jGqW/Iw6eNAZHiW72IEq5n Zsz0WHiaDRT/7xTVFhSw9Zo/K7VNTatGg3ZOQQxZDDZP33n/cRVF8Wr15HRy13xK64XP L1oyY7/fAOdmHNydWIPIJueK9Ygn+CXtcIFvSmMoD77j47O6tipbh8etwF7DFVwk9Ypw jMzQ== X-Gm-Message-State: APt69E3IeURpPNrMBwpGl7TfmTDLfTPT5Ca7aRHZJ5zLYjDx7zP/WjCe SJkOEMDai/kQuN4WZCE4bw3q4e0Xttw= X-Received: by 2002:a63:161a:: with SMTP id w26-v6mr5252151pgl.257.1530631065339; Tue, 03 Jul 2018 08:17:45 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id s185-v6sm4834201pfb.116.2018.07.03.08.17.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 08:17:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2018 08:17:32 -0700 Message-Id: <20180703151732.29843-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703151732.29843-1-richard.henderson@linaro.org> References: <20180703151732.29843-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::22e Subject: [Qemu-devel] [PATCH 7/7] target/ppc: Use non-arithmetic conversions for fp load/store 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: programmingkidx@gmail.com, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Memory operations have no side effects on fp state. The use of a "real" conversions between float64 and float32 would raise exceptions for SNaN and out-of-range inputs. Signed-off-by: Richard Henderson --- target/ppc/helper.h | 4 +- target/ppc/fpu_helper.c | 63 ++++++++++++++++++++++++------ target/ppc/translate/fp-impl.inc.c | 26 +++++------- 3 files changed, 62 insertions(+), 31 deletions(-) -- 2.17.1 diff --git a/target/ppc/helper.h b/target/ppc/helper.h index cc3d031407..33e6e1df60 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -61,8 +61,8 @@ DEF_HELPER_2(compute_fprf_float64, void, env, i64) DEF_HELPER_3(store_fpscr, void, env, i64, i32) DEF_HELPER_2(fpscr_clrbit, void, env, i32) DEF_HELPER_2(fpscr_setbit, void, env, i32) -DEF_HELPER_2(float64_to_float32, i32, env, i64) -DEF_HELPER_2(float32_to_float64, i64, env, i32) +DEF_HELPER_FLAGS_1(todouble, TCG_CALL_NO_RWG_SE, i64, i32) +DEF_HELPER_FLAGS_1(tosingle, TCG_CALL_NO_RWG_SE, i32, i64) DEF_HELPER_4(fcmpo, void, env, i64, i64, i32) DEF_HELPER_4(fcmpu, void, env, i64, i64, i32) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 1e195487d3..d4e9e3bccb 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -47,24 +47,61 @@ static inline bool fp_exceptions_enabled(CPUPPCState *env) /*****************************************************************************/ /* Floating point operations helpers */ -uint64_t helper_float32_to_float64(CPUPPCState *env, uint32_t arg) -{ - CPU_FloatU f; - CPU_DoubleU d; - f.l = arg; - d.d = float32_to_float64(f.f, &env->fp_status); - return d.ll; +/* + * This is the non-arithmatic conversion that happens e.g. on loads. + * In the Power ISA pseudocode, this is called DOUBLE. + */ +uint64_t helper_todouble(uint32_t arg) +{ + uint32_t abs_arg = arg & 0x7fffffff; + uint64_t ret; + + if (likely(abs_arg >= 0x00800000)) { + /* Normalized operand, or Inf, or NaN. */ + ret = (uint64_t)extract32(arg, 30, 2) << 62; + ret |= ((extract32(arg, 30, 1) ^ 1) * (uint64_t)7) << 59; + ret |= (uint64_t)extract32(arg, 0, 29) << 29; + } else { + /* Zero or Denormalized operand. */ + ret = (uint64_t)extract32(arg, 31, 1) << 63; + if (unlikely(abs_arg != 0)) { + /* Denormalized operand. */ + int shift = clz32(abs_arg) - 9; + int exp = -126 - shift + 1023; + ret |= (uint64_t)exp << 52; + ret |= abs_arg << (shift + 29); + } + } + return ret; } -uint32_t helper_float64_to_float32(CPUPPCState *env, uint64_t arg) +/* + * This is the non-arithmatic conversion that happens e.g. on stores. + * In the Power ISA pseudocode, this is called SINGLE. + */ +uint32_t helper_tosingle(uint64_t arg) { - CPU_FloatU f; - CPU_DoubleU d; + int exp = extract64(arg, 52, 11); + uint32_t ret; - d.ll = arg; - f.f = float64_to_float32(d.d, &env->fp_status); - return f.l; + if (likely(exp > 896)) { + /* No denormalization required (includes Inf, NaN). */ + ret = extract64(arg, 62, 2) << 30; + ret |= extract64(arg, 29, 29); + } else { + /* Zero or Denormal result. If the exponent is in bounds for + * a single-precision denormal result, extract the proper bits. + * If the input is not zero, and the exponent is out of bounds, + * then the result is undefined; this underflows to zero. + */ + ret = extract64(arg, 63, 1) << 63; + if (unlikely(exp >= 874)) { + /* Denormal result. */ + ret |= ((1ULL << 52) | extract64(arg, 0, 52)) >> (896 + 30 - exp); + } + } + return ret; } static inline int ppc_float32_get_unbiased_exp(float32 f) diff --git a/target/ppc/translate/fp-impl.inc.c b/target/ppc/translate/fp-impl.inc.c index 2fbd4d4f38..a6f522b85c 100644 --- a/target/ppc/translate/fp-impl.inc.c +++ b/target/ppc/translate/fp-impl.inc.c @@ -660,15 +660,12 @@ GEN_LDUF(name, ldop, op | 0x21, type); \ GEN_LDUXF(name, ldop, op | 0x01, type); \ GEN_LDXF(name, ldop, 0x17, op | 0x00, type) -static inline void gen_qemu_ld32fs(DisasContext *ctx, TCGv_i64 arg1, TCGv arg2) +static void gen_qemu_ld32fs(DisasContext *ctx, TCGv_i64 dest, TCGv addr) { - TCGv t0 = tcg_temp_new(); - TCGv_i32 t1 = tcg_temp_new_i32(); - gen_qemu_ld32u(ctx, t0, arg2); - tcg_gen_trunc_tl_i32(t1, t0); - tcg_temp_free(t0); - gen_helper_float32_to_float64(arg1, cpu_env, t1); - tcg_temp_free_i32(t1); + TCGv_i32 tmp = tcg_temp_new_i32(); + tcg_gen_qemu_ld_i32(tmp, addr, ctx->mem_idx, DEF_MEMOP(MO_UL)); + gen_helper_todouble(dest, tmp); + tcg_temp_free_i32(tmp); } /* lfd lfdu lfdux lfdx */ @@ -836,15 +833,12 @@ GEN_STUF(name, stop, op | 0x21, type); \ GEN_STUXF(name, stop, op | 0x01, type); \ GEN_STXF(name, stop, 0x17, op | 0x00, type) -static inline void gen_qemu_st32fs(DisasContext *ctx, TCGv_i64 arg1, TCGv arg2) +static void gen_qemu_st32fs(DisasContext *ctx, TCGv_i64 src, TCGv addr) { - TCGv_i32 t0 = tcg_temp_new_i32(); - TCGv t1 = tcg_temp_new(); - gen_helper_float64_to_float32(t0, cpu_env, arg1); - tcg_gen_extu_i32_tl(t1, t0); - tcg_temp_free_i32(t0); - gen_qemu_st32(ctx, t1, arg2); - tcg_temp_free(t1); + TCGv_i32 tmp = tcg_temp_new_i32(); + gen_helper_tosingle(tmp, src); + tcg_gen_qemu_st_i32(tmp, addr, ctx->mem_idx, DEF_MEMOP(MO_UL)); + tcg_temp_free_i32(tmp); } /* stfd stfdu stfdux stfdx */