From patchwork Wed Aug 1 12:31:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 143285 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp816609ljj; Wed, 1 Aug 2018 05:35:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc4Q2SrRIFRDgHyYcGoMwud8rG1sEJcGBACauk9OSt+S85HZ6/FeCgk72rW3cwSbhGSvGse X-Received: by 2002:aed:3966:: with SMTP id l93-v6mr10517782qte.48.1533126907749; Wed, 01 Aug 2018 05:35:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533126907; cv=none; d=google.com; s=arc-20160816; b=0BTgGKwUJdFF4e34TjBiaWI2c5XG/SamYlWgafclo0qbzMuNm8OD9BNJ9zi5qgmEZq Igzbqryc9Z9UDl1VDVHetQBWhQwTkGZ35Lf7ANVZZ5HfvmkNMGk+DNaP0jHHB8AzbjQr Uf2gjVIh5eGy7Zknf7o0xvre/y4dUz/ub+jwowne2XwF+8B/X0L8dUucz0qZptaLZd1c IDpzbuFDOcp1fyQbNOHZnQRk2MpzHoEYn72y+IHKSnZ/6KdQys2bEQ6RUGdOU9KHJj/n 6qv8clg6ShzQ3qwCzWzeZgxdRMZLjX8U0EuyuSSGcDjYv57Dc0T4+8RFnXZOvmCFN9u7 /HIA== 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=gaII0zNOehxL/uVYcqOMRBb0l0zQg1hJOdueMjvS+cs=; b=wXFyxqiu70DwUkvWiej1nadl65Of9Zn5G87Fstx6G1NdDLDUVKQpVeNXyE96J1YEKQ bObjTnpf3KqPSSPpDdNlgFTepWCfAV+NYNlvUfOzNbSyVu1hiQ7us6t64wuH5a4KuwFu ZFBZBH7NQO8amuy20pHqhRczKlpCNuI0en1zGDl4SiL+EKgkjhYwjtXGln+buXL41Z5e ajOpsEWGBqDg8bhWHlUNGBtIi9n4dAr6DX6ub2URiD8QxuoRgDD0fiXtagDwKg23lATI 4oGkwShe32rTvhpAntIND+KzKKRujJCJT8tP3F4JBM/cnWh/UXoNce2Du5FYncbYSZQx ak7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QWQSGj2D; 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 s35-v6si1105490qta.330.2018.08.01.05.35.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 01 Aug 2018 05:35:07 -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=QWQSGj2D; 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]:39627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fkqLL-00081h-5G for patch@linaro.org; Wed, 01 Aug 2018 08:35:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fkqHp-0005sT-St for qemu-devel@nongnu.org; Wed, 01 Aug 2018 08:31:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fkqHj-0004Uy-Sh for qemu-devel@nongnu.org; Wed, 01 Aug 2018 08:31:29 -0400 Received: from mail-ua0-x242.google.com ([2607:f8b0:400c:c08::242]:39890) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fkqHj-0004Ua-OX for qemu-devel@nongnu.org; Wed, 01 Aug 2018 08:31:23 -0400 Received: by mail-ua0-x242.google.com with SMTP id g18-v6so12543556uam.6 for ; Wed, 01 Aug 2018 05:31:23 -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=gaII0zNOehxL/uVYcqOMRBb0l0zQg1hJOdueMjvS+cs=; b=QWQSGj2DmKBGSsWJOjHYpfCzs08Y543d94SZCbKennPay4LW3IuguFP9xv24i5sdlV mXo4lfsAeXxyO6hk8AS2yVL4YwXTwceBO0FC1ExoBB7Wp14ydfNVGCgr/kIi1Y/nmIg+ eRLHzk6tp3AL0uDPOQ45OaV/xP8AIxo7saq50= 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=gaII0zNOehxL/uVYcqOMRBb0l0zQg1hJOdueMjvS+cs=; b=qZfplYl3z7PerOo8eNEmhkNwkFu6c7iNJVU2y8CHlQ/phpngmis/nraesa7aRf/T1v zw/u6O+eG0VGb3cTnojE7ocq20yTHJjaPNqgvf4mY7Spbi/qaOjtaVoJcgrFpbuxWTmK s6hIp2Qap2xe8aQ/569Np7wMN5MA5//rBmA9xmKrpSNlOVmfHvvlkCci8yZyObORsOSL sCr5ZL99GBDRltzEIITbkK65Spxvi9s5XjtvCj1qoj7yVFmGkPU6WEak8JioVm7nFy4v Xz2Rac7864EfFRufgkJrm4EmKQHUlO7pk3D5FuxWwxao45rr+niSkMnkxI20CDp9QzUC /Yzg== X-Gm-Message-State: AOUpUlHXiMmGvf7OjqdSL4y2zNoW3BOYsluPnNeVD7DgKBQ25Nb2+0q0 BRYJVk+IDrVUx+Y81K8E8ahYu7ElhYM= X-Received: by 2002:ab0:6a6:: with SMTP id g35-v6mr18381341uag.16.1533126682855; Wed, 01 Aug 2018 05:31:22 -0700 (PDT) Received: from cloudburst.twiddle.net ([190.166.236.188]) by smtp.gmail.com with ESMTPSA id f60-v6sm4247847uaf.10.2018.08.01.05.31.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 05:31:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 1 Aug 2018 08:31:10 -0400 Message-Id: <20180801123111.3595-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180801123111.3595-1-richard.henderson@linaro.org> References: <20180801123111.3595-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::242 Subject: [Qemu-devel] [PATCH 3/4] target/arm: Reorganize SVE WHILE 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: laurent.desnogues@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The pseudocode for this operation is an increment + compare loop, so comparing <= the maximum integer produces an all-true predicate. Rather than bound in both the inline code and the helper, pass the helper the number of predicate bits to set instead of the number of predicate elements to set. Reported-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/sve_helper.c | 5 ---- target/arm/translate-sve.c | 49 +++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 22 deletions(-) -- 2.17.1 Reviewed-by: Laurent Desnogues Tested-by: Laurent Desnogues diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 9bd0694d55..87594a8adb 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -2846,11 +2846,6 @@ uint32_t HELPER(sve_while)(void *vd, uint32_t count, uint32_t pred_desc) return flags; } - /* Scale from predicate element count to bits. */ - count <<= esz; - /* Bound to the bits in the predicate. */ - count = MIN(count, oprsz * 8); - /* Set all of the requested bits. */ for (i = 0; i < count / 64; ++i) { d->p[i] = esz_mask; diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 9dd4c38bab..89efc80ee7 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3173,19 +3173,19 @@ static bool trans_CTERM(DisasContext *s, arg_CTERM *a, uint32_t insn) static bool trans_WHILE(DisasContext *s, arg_WHILE *a, uint32_t insn) { - if (!sve_access_check(s)) { - return true; - } - - TCGv_i64 op0 = read_cpu_reg(s, a->rn, 1); - TCGv_i64 op1 = read_cpu_reg(s, a->rm, 1); - TCGv_i64 t0 = tcg_temp_new_i64(); - TCGv_i64 t1 = tcg_temp_new_i64(); + TCGv_i64 op0, op1, t0, t1, tmax; TCGv_i32 t2, t3; TCGv_ptr ptr; unsigned desc, vsz = vec_full_reg_size(s); TCGCond cond; + if (!sve_access_check(s)) { + return true; + } + + op0 = read_cpu_reg(s, a->rn, 1); + op1 = read_cpu_reg(s, a->rm, 1); + if (!a->sf) { if (a->u) { tcg_gen_ext32u_i64(op0, op0); @@ -3198,32 +3198,47 @@ static bool trans_WHILE(DisasContext *s, arg_WHILE *a, uint32_t insn) /* For the helper, compress the different conditions into a computation * of how many iterations for which the condition is true. - * - * This is slightly complicated by 0 <= UINT64_MAX, which is nominally - * 2**64 iterations, overflowing to 0. Of course, predicate registers - * aren't that large, so any value >= predicate size is sufficient. */ + t0 = tcg_temp_new_i64(); + t1 = tcg_temp_new_i64(); tcg_gen_sub_i64(t0, op1, op0); - /* t0 = MIN(op1 - op0, vsz). */ - tcg_gen_movi_i64(t1, vsz); - tcg_gen_umin_i64(t0, t0, t1); + tmax = tcg_const_i64(vsz >> a->esz); if (a->eq) { /* Equality means one more iteration. */ tcg_gen_addi_i64(t0, t0, 1); + + /* If op1 is max (un)signed integer (and the only time the addition + * above could overflow), then we produce an all-true predicate by + * setting the count to the vector length. This is because the + * pseudocode is described as an increment + compare loop, and the + * max integer would always compare true. + */ + tcg_gen_movi_i64(t1, (a->sf + ? (a->u ? UINT64_MAX : INT64_MAX) + : (a->u ? UINT32_MAX : INT32_MAX))); + tcg_gen_movcond_i64(TCG_COND_EQ, t0, op1, t1, tmax, t0); } - /* t0 = (condition true ? t0 : 0). */ + /* Bound to the maximum. */ + tcg_gen_umin_i64(t0, t0, tmax); + tcg_temp_free_i64(tmax); + + /* Set the count to zero if the condition is false. */ cond = (a->u ? (a->eq ? TCG_COND_LEU : TCG_COND_LTU) : (a->eq ? TCG_COND_LE : TCG_COND_LT)); tcg_gen_movi_i64(t1, 0); tcg_gen_movcond_i64(cond, t0, op0, op1, t0, t1); + tcg_temp_free_i64(t1); + /* Since we're bounded, pass as a 32-bit type. */ t2 = tcg_temp_new_i32(); tcg_gen_extrl_i64_i32(t2, t0); tcg_temp_free_i64(t0); - tcg_temp_free_i64(t1); + + /* Scale elements to bits. */ + tcg_gen_shli_i32(t2, t2, a->esz); desc = (vsz / 8) - 2; desc = deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz);