From patchwork Thu May 2 16:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 794116 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp353505wrr; Thu, 2 May 2024 09:56:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzo58I3nNhK9nyFKuKF3E9B+VVF8isr2tE5dCS6xdCcL9ljwwFLHij/4mVSn4LmR8C7TRChsZWEimKIivJgLZ7 X-Google-Smtp-Source: AGHT+IFVqGzxu5ioPFVDBD5Tb1iRYlV+AfXBC0QX2PUV07EC1BNe9NvqHsJYf60OPVAcY2WXzfAY X-Received: by 2002:ac8:5f48:0:b0:439:d0ed:39e4 with SMTP id y8-20020ac85f48000000b00439d0ed39e4mr123528qta.4.1714668980728; Thu, 02 May 2024 09:56:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714668980; cv=none; d=google.com; s=arc-20160816; b=QD03Zpo9ByfvyMmviDh0/WpYoO1vg08k51TQk+et28bcYHg7RVTt3jloorR3twFJFH uhah9BOScYMG6r4VEvi2AA2RVvyXuOxIkpDYSAcnL3dtpoeb/tc+0goGTB8HtArNonLo 0mitafHbM6ml4gIyb6hNQRM8nwRzFudHSUWz1ceTNRxNSDuoZmbAvXnLVXHFkkg5sMmU Ro2UV8sBATCr1gZqppe0WapZAiqm9U8Sv/Qck6gjEL2AU+nzc2Bl7+8wSdw3dFsm3HUF GsUuNnAZGEekvBfMJqNpPtZueeE9sqloJAa/DdZBZ1FBnTMV0u+aNO9D0p+uJq8M44w4 eHQw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/SGeZv/4hYREHrq3/2i2w291gTT4MaAZ/Mhj+P3eA68=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=hTac1VglJMAl0B9b97kuznb29lDnuPDg/Xq3gTXna+LY3ndtUs3wafxIXrCOh6XZhw dj92sQ6+qppyNh/geQlo8+C69I0Z2RERVt1YK/NkGTvjv+ki5IiMZfgu9gKZ3TysWhJB 4Qd8ELvdavyRAFtSt443OeQmlpgIzyM+ikux/x4TyiNmYAGG8Tz09UTvK/ELWSBQalfW omiS/FSPysnbwFdUR4OBtQqWk+9TERq9UCVT9z/UtRgLVf1alQCxzpww5gX4KHMEh/Gz aaqgkI4rCg33NF2tuddyRabUWZfxtZVwUrflaJ9+aby8bZ44dyXnvLpjUHRvoEz6tcIq Vj5Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g6UbyFPX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hc8-20020a05622a2a0800b0043af8d3965csi1236557qtb.779.2024.05.02.09.56.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2024 09:56:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g6UbyFPX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2Ziv-0001No-19; Thu, 02 May 2024 12:55:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2Zid-0000ws-RM for qemu-devel@nongnu.org; Thu, 02 May 2024 12:55:43 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2Zib-0005wV-O9 for qemu-devel@nongnu.org; Thu, 02 May 2024 12:55:39 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6ee13f19e7eso7521374b3a.1 for ; Thu, 02 May 2024 09:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714668936; x=1715273736; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/SGeZv/4hYREHrq3/2i2w291gTT4MaAZ/Mhj+P3eA68=; b=g6UbyFPX9QAkgvfquYp7rJutN74RjLnOVpZoz1Ssw/4X9AFbp57Crz4y8E/z7jaKaz WG5GXtOnFldbAH0zf0dr21W9Ac26oa5wOEesIR9moQ76uZGyvQZoD19Ny9eSL9pdEIUy q7p18AQAZRzpCMoNsuvEwlB/e6VNjQPe/v09GWILIVJ2rimp7f1deACm8oPLrX42Be6Z TXTRAqbcbcHsQKWMJjoXdG17hBDJH8+oqaMlB4FvqflYFOD6t79TIiKLQKo3iPi0AjOQ W/W6qUIc9aI7t1KIEDQQhTl6BAsZku2VShuKE3elNJQGfnER/X4+VNE3Hg9WPH41b2l0 z0Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714668936; x=1715273736; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/SGeZv/4hYREHrq3/2i2w291gTT4MaAZ/Mhj+P3eA68=; b=IIdm+w4XV10H4R/+UR6Jvj5w1X+T7TdXDS11x0JS2miDTLWJj2bV2iQomaEABEIetW 1+/v6R8W2+xgmIVNsxEF6sZhNlsWfNpSIdInLplbf1Dcgrp8hwS+mFnYcHQ7gDO16Iw3 nuCuUuU9Dur7RGmE5OuTHmibZUfEiW2wLOGjbBFcw1Qep6Oi949hQ879zLlPZN+NSyD7 Nu2yivfDH2ZXKbC0o45di6i6Z+m0fP9IokbrHYc/vgom/vwXivYhYukkFNta6S/w/6sL gwmr6/WoXATeg5xJaJjQ3nXA0JNmP7O9ebFo3679qJMH9nprj4z7fX6dyrX+C0zuX5FX GEmw== X-Gm-Message-State: AOJu0Yw564DE9JxsGQpEgWahtxrNtCdpBM8I8oz09eQNIWclAom9WqJZ 2gY3/8BdevI6ZJfspO7f1ePytQj4xae1zH4Ks4u6tiPMdkSRW3Bm1nvGoSeIpX1JdX4XefkVe4m G X-Received: by 2002:a05:6a00:1904:b0:6ed:d5f5:869 with SMTP id y4-20020a056a00190400b006edd5f50869mr153919pfi.3.1714668935866; Thu, 02 May 2024 09:55:35 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id j13-20020aa783cd000000b006eb058b2703sm1464598pfn.187.2024.05.02.09.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 09:55:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 7/7] target/sparc: Split out do_ms16b Date: Thu, 2 May 2024 09:55:28 -0700 Message-Id: <20240502165528.244004-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240502165528.244004-1-richard.henderson@linaro.org> References: <20240502165528.244004-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org The unit operation for fmul8x16 and friends is described in the manual as "MS16b". Split that out for clarity. Improve rounding with an unconditional addition of 0.5 as a fixed-point integer. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/sparc/vis_helper.c | 78 ++++++++++++--------------------------- 1 file changed, 24 insertions(+), 54 deletions(-) diff --git a/target/sparc/vis_helper.c b/target/sparc/vis_helper.c index 14c665cad6..e15c6bb34e 100644 --- a/target/sparc/vis_helper.c +++ b/target/sparc/vis_helper.c @@ -44,6 +44,7 @@ target_ulong helper_array8(target_ulong pixel_addr, target_ulong cubesize) #if HOST_BIG_ENDIAN #define VIS_B64(n) b[7 - (n)] +#define VIS_SB64(n) sb[7 - (n)] #define VIS_W64(n) w[3 - (n)] #define VIS_SW64(n) sw[3 - (n)] #define VIS_L64(n) l[1 - (n)] @@ -51,6 +52,7 @@ target_ulong helper_array8(target_ulong pixel_addr, target_ulong cubesize) #define VIS_W32(n) w[1 - (n)] #else #define VIS_B64(n) b[n] +#define VIS_SB64(n) sb[n] #define VIS_W64(n) w[n] #define VIS_SW64(n) sw[n] #define VIS_L64(n) l[n] @@ -60,6 +62,7 @@ target_ulong helper_array8(target_ulong pixel_addr, target_ulong cubesize) typedef union { uint8_t b[8]; + int8_t sb[8]; uint16_t w[4]; int16_t sw[4]; uint32_t l[2]; @@ -95,27 +98,23 @@ uint64_t helper_fpmerge(uint32_t src1, uint32_t src2) return d.ll; } +static inline int do_ms16b(int x, int y) +{ + return ((x * y) + 0x80) >> 8; +} + uint64_t helper_fmul8x16(uint32_t src1, uint64_t src2) { VIS64 d; VIS32 s; - uint32_t tmp; s.l = src1; d.ll = src2; -#define PMUL(r) \ - tmp = (int32_t)d.VIS_SW64(r) * (int32_t)s.VIS_B32(r); \ - if ((tmp & 0xff) > 0x7f) { \ - tmp += 0x100; \ - } \ - d.VIS_W64(r) = tmp >> 8; - - PMUL(0); - PMUL(1); - PMUL(2); - PMUL(3); -#undef PMUL + d.VIS_W64(0) = do_ms16b(s.VIS_B32(0), d.VIS_SW64(0)); + d.VIS_W64(1) = do_ms16b(s.VIS_B32(1), d.VIS_SW64(1)); + d.VIS_W64(2) = do_ms16b(s.VIS_B32(2), d.VIS_SW64(2)); + d.VIS_W64(3) = do_ms16b(s.VIS_B32(3), d.VIS_SW64(3)); return d.ll; } @@ -124,25 +123,14 @@ uint64_t helper_fmul8x16a(uint32_t src1, int32_t src2) { VIS32 s; VIS64 d; - uint32_t tmp; s.l = src1; d.ll = 0; -#define PMUL(r) \ - do { \ - tmp = src2 * (int32_t)s.VIS_B32(r); \ - if ((tmp & 0xff) > 0x7f) { \ - tmp += 0x100; \ - } \ - d.VIS_W64(r) = tmp >> 8; \ - } while (0) - - PMUL(0); - PMUL(1); - PMUL(2); - PMUL(3); -#undef PMUL + d.VIS_W64(0) = do_ms16b(s.VIS_B32(0), src2); + d.VIS_W64(1) = do_ms16b(s.VIS_B32(1), src2); + d.VIS_W64(2) = do_ms16b(s.VIS_B32(2), src2); + d.VIS_W64(3) = do_ms16b(s.VIS_B32(3), src2); return d.ll; } @@ -150,23 +138,14 @@ uint64_t helper_fmul8x16a(uint32_t src1, int32_t src2) uint64_t helper_fmul8sux16(uint64_t src1, uint64_t src2) { VIS64 s, d; - uint32_t tmp; s.ll = src1; d.ll = src2; -#define PMUL(r) \ - tmp = (int32_t)d.VIS_SW64(r) * ((int32_t)s.VIS_SW64(r) >> 8); \ - if ((tmp & 0xff) > 0x7f) { \ - tmp += 0x100; \ - } \ - d.VIS_W64(r) = tmp >> 8; - - PMUL(0); - PMUL(1); - PMUL(2); - PMUL(3); -#undef PMUL + d.VIS_W64(0) = do_ms16b(s.VIS_SB64(1), d.VIS_SW64(0)); + d.VIS_W64(1) = do_ms16b(s.VIS_SB64(3), d.VIS_SW64(1)); + d.VIS_W64(2) = do_ms16b(s.VIS_SB64(5), d.VIS_SW64(2)); + d.VIS_W64(3) = do_ms16b(s.VIS_SB64(7), d.VIS_SW64(3)); return d.ll; } @@ -174,23 +153,14 @@ uint64_t helper_fmul8sux16(uint64_t src1, uint64_t src2) uint64_t helper_fmul8ulx16(uint64_t src1, uint64_t src2) { VIS64 s, d; - uint32_t tmp; s.ll = src1; d.ll = src2; -#define PMUL(r) \ - tmp = (int32_t)d.VIS_SW64(r) * ((uint32_t)s.VIS_B64(r * 2)); \ - if ((tmp & 0xff) > 0x7f) { \ - tmp += 0x100; \ - } \ - d.VIS_W64(r) = tmp >> 8; - - PMUL(0); - PMUL(1); - PMUL(2); - PMUL(3); -#undef PMUL + d.VIS_W64(0) = do_ms16b(s.VIS_B64(0), d.VIS_SW64(0)); + d.VIS_W64(1) = do_ms16b(s.VIS_B64(2), d.VIS_SW64(1)); + d.VIS_W64(2) = do_ms16b(s.VIS_B64(4), d.VIS_SW64(2)); + d.VIS_W64(3) = do_ms16b(s.VIS_B64(6), d.VIS_SW64(3)); return d.ll; }