From patchwork Wed May 30 18:01:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 137276 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5640064lji; Wed, 30 May 2018 11:13:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ/PuriLjj3nJBwhVMvxwDnkJJGaNjZutFrXWn8OyF9L/fhVCu3t5zKj+2HeIur62nfrQXY X-Received: by 2002:ac8:70c3:: with SMTP id g3-v6mr3482165qtp.95.1527704001013; Wed, 30 May 2018 11:13:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527704001; cv=none; d=google.com; s=arc-20160816; b=cHhAUTDmsW/pxgBLvDzj85/HzAvzcTTLCiSjx/7Vie9+TCNRiT+B+eq5v4c4R9F4bX JXAU8RSBAV+qg/9/GQwPVIjfVgH9ZDp4QDEkW3oY3eSveE46zcYR4c2XQbe2/I/hKxa8 So4WPFSCyVoGo6wPxX4oiHo6dFG0JfUmbsPKObNfq1Hxo/JB8r9+qaAkrPeTgHvx/oVx 2Qrr0rEevaJ6aI/QaWCX9B9hD1adU0OYDP+XsR+HiMCduUZu3UHWT8+piQevCQNSQXAv h32t0JVuZ6686RC8/hJUIpoCzjEJ1FcP8PdIn0QmIaxUBdnQcY49CyrbXpjh7NWQBU9k 8z3A== 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=aA/5S2B3GjqKGo0kl9R3P8OKdMyH3ZHUd87Da/paKlg=; b=x+Fr2k4BvUB+ETr00Lu0XMLY5OvxHbV0767qgXyD2v71lRP8Vm4hMw5y4USmkEIUN9 W8XnR/2a45hOIbAFsMSM/rrVIEB5T3p0lbhZEMVRWp0NOlFQfhC/d6JwIO9uOXURbGdC kC3lFaoX9tt0hGyL2h6xiJcUvGvoDhGc3xGpKiQPkO5H4TeunOxkJVUv2qbz+xc5/GLb uWH93ybHJV50EfSUSy/L6GUySaHbFpTYeVeIe4kT+udmW3pdNEYzkoglox3+9m+dYo2W NSGMVFabfNWs50AA5j7TcAOHdut/3aIqWoCnD4UZBPjO8fKuluOBhTp7afn6M5iufKzO ygbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=afMY4qfZ; 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 l2-v6si7125367qvl.34.2018.05.30.11.13.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 30 May 2018 11:13:21 -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=afMY4qfZ; 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]:40112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO5b6-0002aj-FO for patch@linaro.org; Wed, 30 May 2018 14:13:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO5Q1-0002Ap-7F for qemu-devel@nongnu.org; Wed, 30 May 2018 14:01:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO5Pw-0004o3-O0 for qemu-devel@nongnu.org; Wed, 30 May 2018 14:01:53 -0400 Received: from mail-pf0-x22a.google.com ([2607:f8b0:400e:c00::22a]:44035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fO5Pw-0004nJ-Gh for qemu-devel@nongnu.org; Wed, 30 May 2018 14:01:48 -0400 Received: by mail-pf0-x22a.google.com with SMTP id q22-v6so9403936pff.11 for ; Wed, 30 May 2018 11:01:48 -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=aA/5S2B3GjqKGo0kl9R3P8OKdMyH3ZHUd87Da/paKlg=; b=afMY4qfZxvqQvTpb00F2BJkqB7b30V/b04qbLBZWR9LXoy+2Nst7zVwfZZGJHwJ/c0 MyMkjzd6kInkOg+4KrIuoji+IFBfLQQRPy1DUSzys3aJ0g0FDah6bobVkyvgbuz+JLdI wejRE0BlSxfqi70lqEJG7WkswmrTZZDnSz9cc= 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=aA/5S2B3GjqKGo0kl9R3P8OKdMyH3ZHUd87Da/paKlg=; b=IVRg8/rFF4h0J3q1ZwDTHNC2Z3PwNPHVb7uBA4Lcj9rXny+tl4ISyuMNMM2IpmG0gI lxP+IuLBXb9DWdsyzMwboZjvjlk4dkcu7vjkrin8kD/AvkCI4TyWi5UpLCxlydpRRYiA D6efxTGI5rqW9iZ7qVZn2XPiMYDHi/fP/Z8zcUiSpz9B0QmCGApxqr+W0fz/TpQd02is g4EG2sNow8Zi4wWi/UgF/hLAs1XVhVhAEuwaNOEsEnLZlfNLw2KMtL2U7QAZnCgYSTgh 6FujpmkMdYksIRxThemRthlLMrvmPuIpfn4YGmN5dHs09VyBCiGztAUv5LrWNmizUkh2 jvsA== X-Gm-Message-State: ALKqPwc8XzbsF0KgA7qgNmiu+ZO45rLqYJ/efB8hyJcX2Hy7h1cuFGMo 6TNitdQj7wSjE0pTBRYneTsRrRyDRx8= X-Received: by 2002:a62:5841:: with SMTP id m62-v6mr3657555pfb.116.1527703306707; Wed, 30 May 2018 11:01:46 -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 b84-v6sm28179157pfm.123.2018.05.30.11.01.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 11:01:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 11:01:17 -0700 Message-Id: <20180530180120.13355-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530180120.13355-1-richard.henderson@linaro.org> References: <20180530180120.13355-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::22a Subject: [Qemu-devel] [PATCH v3b 15/18] target/arm: Implement SVE Integer Compare - Scalars Group 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: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/helper-sve.h | 2 + target/arm/sve_helper.c | 31 +++++++++++ target/arm/translate-sve.c | 102 +++++++++++++++++++++++++++++++++++++ target/arm/sve.decode | 8 +++ 4 files changed, 143 insertions(+) -- 2.17.0 diff --git a/target/arm/helper-sve.h b/target/arm/helper-sve.h index dd4f8f754d..1863106d0f 100644 --- a/target/arm/helper-sve.h +++ b/target/arm/helper-sve.h @@ -678,3 +678,5 @@ DEF_HELPER_FLAGS_4(sve_brkn, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_4(sve_brkns, TCG_CALL_NO_RWG, i32, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sve_cntp, TCG_CALL_NO_RWG, i64, ptr, ptr, i32) + +DEF_HELPER_FLAGS_3(sve_while, TCG_CALL_NO_RWG, i32, ptr, i32, i32) diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index 8d1631ea3c..a65a06cc9e 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -2736,3 +2736,34 @@ uint64_t HELPER(sve_cntp)(void *vn, void *vg, uint32_t pred_desc) } return sum; } + +uint32_t HELPER(sve_while)(void *vd, uint32_t count, uint32_t pred_desc) +{ + uintptr_t oprsz = extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; + intptr_t esz = extract32(pred_desc, SIMD_DATA_SHIFT, 2); + uint64_t esz_mask = pred_esz_masks[esz]; + ARMPredicateReg *d = vd; + uint32_t flags; + intptr_t i; + + /* Begin with a zero predicate register. */ + flags = do_zero(d, oprsz); + if (count == 0) { + 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; + } + if (count & 63) { + d->p[i] = ~(-1ull << (count & 63)) & esz_mask; + } + + return predtest_ones(d, oprsz, esz_mask); +} diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index e4815e4912..75eb36f110 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3081,6 +3081,108 @@ static bool trans_SINCDECP_z(DisasContext *s, arg_incdec2_pred *a, return true; } +/* + *** SVE Integer Compare Scalars Group + */ + +static bool trans_CTERM(DisasContext *s, arg_CTERM *a, uint32_t insn) +{ + if (!sve_access_check(s)) { + return true; + } + + TCGCond cond = (a->ne ? TCG_COND_NE : TCG_COND_EQ); + TCGv_i64 rn = read_cpu_reg(s, a->rn, a->sf); + TCGv_i64 rm = read_cpu_reg(s, a->rm, a->sf); + TCGv_i64 cmp = tcg_temp_new_i64(); + + tcg_gen_setcond_i64(cond, cmp, rn, rm); + tcg_gen_extrl_i64_i32(cpu_NF, cmp); + tcg_temp_free_i64(cmp); + + /* VF = !NF & !CF. */ + tcg_gen_xori_i32(cpu_VF, cpu_NF, 1); + tcg_gen_andc_i32(cpu_VF, cpu_VF, cpu_CF); + + /* Both NF and VF actually look at bit 31. */ + tcg_gen_neg_i32(cpu_NF, cpu_NF); + tcg_gen_neg_i32(cpu_VF, cpu_VF); + return true; +} + +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_i32 t2, t3; + TCGv_ptr ptr; + unsigned desc, vsz = vec_full_reg_size(s); + TCGCond cond; + + if (!a->sf) { + if (a->u) { + tcg_gen_ext32u_i64(op0, op0); + tcg_gen_ext32u_i64(op1, op1); + } else { + tcg_gen_ext32s_i64(op0, op0); + tcg_gen_ext32s_i64(op1, op1); + } + } + + /* 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. + */ + tcg_gen_sub_i64(t0, op1, op0); + + /* t0 = MIN(op1 - op0, vsz). */ + if (a->eq) { + /* Equality means one more iteration. */ + tcg_gen_movi_i64(t1, vsz - 1); + tcg_gen_movcond_i64(TCG_COND_LTU, t0, t0, t1, t0, t1); + tcg_gen_addi_i64(t0, t0, 1); + } else { + tcg_gen_movi_i64(t1, vsz); + tcg_gen_movcond_i64(TCG_COND_LTU, t0, t0, t1, t0, t1); + } + + /* t0 = (condition true ? t0 : 0). */ + 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); + + t2 = tcg_temp_new_i32(); + tcg_gen_extrl_i64_i32(t2, t0); + tcg_temp_free_i64(t0); + tcg_temp_free_i64(t1); + + desc = (vsz / 8) - 2; + desc = deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz); + t3 = tcg_const_i32(desc); + + ptr = tcg_temp_new_ptr(); + tcg_gen_addi_ptr(ptr, cpu_env, pred_full_reg_offset(s, a->rd)); + + gen_helper_sve_while(t2, ptr, t2, t3); + do_pred_flags(t2); + + tcg_temp_free_ptr(ptr); + tcg_temp_free_i32(t2); + tcg_temp_free_i32(t3); + return true; +} + /* *** SVE Memory - 32-bit Gather and Unsized Contiguous Group */ diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 62d51c252b..4b718060a9 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -606,6 +606,14 @@ SINCDECP_r_64 00100101 .. 1010 d:1 u:1 10001 10 .... ..... @incdec_pred # SVE saturating inc/dec vector by predicate count SINCDECP_z 00100101 .. 1010 d:1 u:1 10000 00 .... ..... @incdec2_pred +### SVE Integer Compare - Scalars Group + +# SVE conditionally terminate scalars +CTERM 00100101 1 sf:1 1 rm:5 001000 rn:5 ne:1 0000 + +# SVE integer compare scalar count and limit +WHILE 00100101 esz:2 1 rm:5 000 sf:1 u:1 1 rn:5 eq:1 rd:4 + ### SVE Memory - 32-bit Gather and Unsized Contiguous Group # SVE load predicate register