From patchwork Sat Apr 18 16:19:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 185558 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp1902322ilf; Sat, 18 Apr 2020 09:22:11 -0700 (PDT) X-Google-Smtp-Source: APiQypK5HaBoYKBDIi3IqybNpQT8BftebFeIqawD4A2cEUVPXgYP2UG0Z5v5cGoOR6oh2uzUbn3l X-Received: by 2002:a37:881:: with SMTP id 123mr8616583qki.185.1587226931087; Sat, 18 Apr 2020 09:22:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587226931; cv=none; d=google.com; s=arc-20160816; b=K9tJ17/7H3oYJwZCu382MeblEmHcc3BgEp4M7s61oFtpgopnA3bWnWyj/fG6WyPoI7 +PIF9xD7+XfnTBDDYZtwn+zJZ1HQ9Hkx2yyp95x3yguxPBU6PeFvU0VuMYIUHq3wFF+n pqWI1LNaq7Pu8izqY0YAiBKM7kg0ezfj++3aACZNJGgxP8vJqeWmgxGknT2Sr6lzNZ0/ Y9NTWzIBIATlePHJQHzQNu/Vrh8NQn3P2qcRORtPvBhTJtU8BRMFXny6syxgMR3NOHcZ 2KG98JaPlB8p3W/9vx3ACbvyiy86PzsVHvL/htszDSRX4Zw2JQAVrSonsw1emYNHBSQb 4jeA== 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:to:from :dkim-signature; bh=jnoGz1Jnxdfh+y+NorE/kRAs3qyr4Q4Rbpyv23cxSxY=; b=gUfWd+UWhDtFtgeiX4t+nJ9essN/PtzGjB9C+GWCmO3poSdrOkbW6+XALf5Q67mby0 s3PSleFQoxv3xB1logjHCno/G/QVHpH68hF/HTkdwGFL9MtivR4qJQ+/MN8ZxWQDEyAQ 0SA1KjtW+LBl5viQM5/DGBNGddz/OnHvoFPZvvu/NDFRpjSy+G2RIXqOspjZAXlSJwL9 x8xI/f++l5ap9BE+mTskOlcxgWXqVYNxKK/Le4netwsDyxT5v9bpd57MOGATx9q6IdwE x57ybX8GRgLZHwEBncfURORL21vrJT+AgGuVISzxtRS1sJ7ihxoy9W5TMNLSW+e+eILj bcDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WXSbWM+k; 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 x10si14820985qts.9.2020.04.18.09.22.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 18 Apr 2020 09:22:11 -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=WXSbWM+k; 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]:59622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPqEM-0007rW-HM for patch@linaro.org; Sat, 18 Apr 2020 12:22:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPqBi-00048S-8z for qemu-devel@nongnu.org; Sat, 18 Apr 2020 12:19:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPqBg-00050q-SZ for qemu-devel@nongnu.org; Sat, 18 Apr 2020 12:19:26 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:33859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPqBg-0004yy-Mg for qemu-devel@nongnu.org; Sat, 18 Apr 2020 12:19:24 -0400 Received: by mail-pf1-x444.google.com with SMTP id d1so2704261pfh.1 for ; Sat, 18 Apr 2020 09:19:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jnoGz1Jnxdfh+y+NorE/kRAs3qyr4Q4Rbpyv23cxSxY=; b=WXSbWM+kCCFQSkXgZ8HzhR59qFBZ2mFxmuuW97ha4MYxtkTO2FT61LqbKedi0vyJpe uP3MDJEoBZMQuepLtap6GyAATbcKO5bquR7Pv0tEomjfOiAafa80ESckpAcIeSvpBj11 m+KwxvmWC8HUpD6nitY6q346nzh3JmekU2BaZzKGaKGz1nKunwmJM75n/uiqV9PQGGVO afwdUfxc3ZtKmBzdkIPpeVnQiVZWk8TU/TcHibEi2FhkHTSs7Yl/1IO2U4q0jN27lOQR CvofDOi6eU9p+4NOwS5FIiZxUECEwuryfPzlvWquqbhZROlBkLyge4qhRFvLI5G9E3op BO3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jnoGz1Jnxdfh+y+NorE/kRAs3qyr4Q4Rbpyv23cxSxY=; b=njQgn7A5sCSd3EekJNQoaQH7FSFjYRKEdWexxWc4Qcyuz+CLTGXYfoex4u3RHV7Jrz f0aG6CMF9LriLBe6PFOnQolr9ZFfxEA8SWZQ/f0NaiLDtPvJjV3O4qy8jX51W4ZTHTsq TyGjP7MfPy4k0cSjTX9LMDoisebXMZbBl1oL1dIZ0Nm4sSFlxRkeoSAXz9OL8/V7ifjr urnkfosoGdIfP3Jby6Sad7VKljnHUXMQhB1WkaccHgQgtYPFHpNuCUDT+tBjpH1UdE33 C3pDszO8zVKmIOdH4V6TlvpMP0BZS+ITjBoIFizpjuzsscAU9xWAUZhaQXC+I2Grrgey m2OQ== X-Gm-Message-State: AGi0PuYCi7KqKcZFOCc0+SbVrDZOlbCNhSfzk9oC15gJ7fbPuuLP8rKP CUxK8POkZhqx5ICpDtKS6hoiKb8M+ZQ= X-Received: by 2002:aa7:9f03:: with SMTP id g3mr9174714pfr.287.1587226763198; Sat, 18 Apr 2020 09:19:23 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id i187sm22398382pfc.112.2020.04.18.09.19.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 09:19:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 05/16] tcg: Use tcg_constant_{i32, vec} with tcg vec expanders Date: Sat, 18 Apr 2020 09:19:03 -0700 Message-Id: <20200418161914.4387-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418161914.4387-1-richard.henderson@linaro.org> References: <20200418161914.4387-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/tcg-op-vec.c | 63 ++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 29 deletions(-) -- 2.20.1 diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c index f3927089a7..655b3ae32d 100644 --- a/tcg/tcg-op-vec.c +++ b/tcg/tcg-op-vec.c @@ -233,25 +233,17 @@ void tcg_gen_mov_vec(TCGv_vec r, TCGv_vec a) } } -#define MO_REG (TCG_TARGET_REG_BITS == 64 ? MO_64 : MO_32) - -static void do_dupi_vec(TCGv_vec r, unsigned vece, TCGArg a) -{ - TCGTemp *rt = tcgv_vec_temp(r); - vec_gen_2(INDEX_op_dupi_vec, rt->base_type, vece, temp_arg(rt), a); -} - TCGv_vec tcg_const_zeros_vec(TCGType type) { TCGv_vec ret = tcg_temp_new_vec(type); - do_dupi_vec(ret, MO_REG, 0); + tcg_gen_mov_vec(ret, tcg_constant_vec(type, MO_8, 0)); return ret; } TCGv_vec tcg_const_ones_vec(TCGType type) { TCGv_vec ret = tcg_temp_new_vec(type); - do_dupi_vec(ret, MO_REG, -1); + tcg_gen_mov_vec(ret, tcg_constant_vec(type, MO_8, -1)); return ret; } @@ -267,37 +259,50 @@ TCGv_vec tcg_const_ones_vec_matching(TCGv_vec m) return tcg_const_ones_vec(t->base_type); } -void tcg_gen_dup64i_vec(TCGv_vec r, uint64_t a) +void tcg_gen_dupi_vec(unsigned vece, TCGv_vec dest, uint64_t val) { - if (TCG_TARGET_REG_BITS == 32 && a == deposit64(a, 32, 32, a)) { - do_dupi_vec(r, MO_32, a); - } else if (TCG_TARGET_REG_BITS == 64 || a == (uint64_t)(int32_t)a) { - do_dupi_vec(r, MO_64, a); - } else { - TCGv_i64 c = tcg_const_i64(a); - tcg_gen_dup_i64_vec(MO_64, r, c); - tcg_temp_free_i64(c); + TCGType type = tcgv_vec_temp(dest)->base_type; + + /* + * For MO_64 constants that can't be represented in tcg_target_long, + * we must use INDEX_op_dup2_vec. + */ + if (TCG_TARGET_REG_BITS == 32) { + val = dup_const(vece, val); + if (val != deposit64(val, 32, 32, val) && + val != (uint64_t)(int32_t)val) { + uint32_t vl = extract64(val, 0, 32); + uint32_t vh = extract64(val, 32, 32); + TCGArg al = tcgv_i32_arg(tcg_constant_i32(vl)); + TCGArg ah = tcgv_i32_arg(tcg_constant_i32(vh)); + TCGArg di = tcgv_vec_arg(dest); + + vec_gen_3(INDEX_op_dup2_vec, type, MO_64, di, al, ah); + return; + } } + + tcg_gen_mov_vec(dest, tcg_constant_vec(type, vece, val)); } -void tcg_gen_dup32i_vec(TCGv_vec r, uint32_t a) +void tcg_gen_dup64i_vec(TCGv_vec dest, uint64_t val) { - do_dupi_vec(r, MO_REG, dup_const(MO_32, a)); + tcg_gen_dupi_vec(MO_64, dest, val); } -void tcg_gen_dup16i_vec(TCGv_vec r, uint32_t a) +void tcg_gen_dup32i_vec(TCGv_vec dest, uint32_t val) { - do_dupi_vec(r, MO_REG, dup_const(MO_16, a)); + tcg_gen_dupi_vec(MO_32, dest, val); } -void tcg_gen_dup8i_vec(TCGv_vec r, uint32_t a) +void tcg_gen_dup16i_vec(TCGv_vec dest, uint32_t val) { - do_dupi_vec(r, MO_REG, dup_const(MO_8, a)); + tcg_gen_dupi_vec(MO_16, dest, val); } -void tcg_gen_dupi_vec(unsigned vece, TCGv_vec r, uint64_t a) +void tcg_gen_dup8i_vec(TCGv_vec dest, uint32_t val) { - do_dupi_vec(r, MO_REG, dup_const(vece, a)); + tcg_gen_dupi_vec(MO_8, dest, val); } void tcg_gen_dup_i64_vec(unsigned vece, TCGv_vec r, TCGv_i64 a) @@ -502,8 +507,8 @@ void tcg_gen_abs_vec(unsigned vece, TCGv_vec r, TCGv_vec a) if (tcg_can_emit_vec_op(INDEX_op_sari_vec, type, vece) > 0) { tcg_gen_sari_vec(vece, t, a, (8 << vece) - 1); } else { - do_dupi_vec(t, MO_REG, 0); - tcg_gen_cmp_vec(TCG_COND_LT, vece, t, a, t); + tcg_gen_cmp_vec(TCG_COND_LT, vece, t, a, + tcg_constant_vec(type, vece, 0)); } tcg_gen_xor_vec(vece, r, a, t); tcg_gen_sub_vec(vece, r, r, t);