From patchwork Tue Mar 19 17:21:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160604 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp4142240jad; Tue, 19 Mar 2019 10:30:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxmFemc8zbZLQc3LCh+Nx7xK0pw/QJ4KXG11BYsMiVSgGTccZ7WwA2Y7spLBXqhwF4JFW03 X-Received: by 2002:a7b:cd82:: with SMTP id y2mr4364775wmj.121.1553016639037; Tue, 19 Mar 2019 10:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553016639; cv=none; d=google.com; s=arc-20160816; b=iVPGMAfbjP1K3iOzWXwyshbV/FQBMu+FHV6N/xjdLlwasRkO0SlaipePkED5usxxeF Ig9eTiIhivzhxI9Kp45sb9A3ppomhz34qJoqZsR3Tl/R0Cwq6UsLYB18XIGb262DgATq hm5eGHlgGFTTdXzCSnbTqN5Au9sCm93jCssNV3BvNx5CF6uz9ZE2GdC+omeV0uaZfOhl 43eJwxoekovfnzpuKHll7JbQlQFxl+kcV3QiwsnggWDni90K2uAb4sMp5RIsqvLSR85I xqRVXTlzUbxS8pRXSW4A2ovVGKqLtbCpkeLxfRYFeMAaVK3w1W3d1arAPdlHoL+8K/lL /Ruw== 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; bh=kFPPZstBkas5qbjcpfxyoGriUyFM5j9wSpVME/IdO1s=; b=wxD1brZ4WcZ6yiXt6KiyY1CiH8osgAkWgYMiT32q+zGxidWmYVchf/TwKPzIfr9iFt 7uJGswiEdIWEKbxMka0hkwjTMuqKCM1426JKf0N9hTyddADFkRUZeP80yJqh8sUk4fhd zPgNJ4bfwW1/K493pECdV8znsA6v/mwW7gOFUMY7zO75/Jykw8KRLy+HZ70OEkjrV1eT L2mD921ONL6GfqFAn/NiJkVUprJr9agoeB7fQGO5a15HjwDmDENwSIZlWJhKQfj3wOf4 4HWUyuropuYjOXLSTd08dkhp+YiwMws3E2ppyJlmdbJJlE5SSm/viH7afCqOEaBLLhgX 2GuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rWhAw8lD; 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=fail (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 z19si2157147wma.93.2019.03.19.10.30.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Mar 2019 10:30:39 -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=fail header.i=@linaro.org header.s=google header.b=rWhAw8lD; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:60791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IZR-0002hm-Or for patch@linaro.org; Tue, 19 Mar 2019 13:30:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6IQp-0004et-TG for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6IQn-0004Y8-B4 for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:43 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:34879) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h6IQm-0004Xc-Ug for qemu-devel@nongnu.org; Tue, 19 Mar 2019 13:21:41 -0400 Received: by mail-pg1-x52d.google.com with SMTP id g8so3653300pgf.2 for ; Tue, 19 Mar 2019 10:21:40 -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=kFPPZstBkas5qbjcpfxyoGriUyFM5j9wSpVME/IdO1s=; b=rWhAw8lDYO4egtJ286jVkzMp9UHVb1S0BHzrHMR8sBzdsc0y47XUaBx+Fuq+DWRwGL jZj/ktnn0mH3rqh8J9h1NZs/NEo80JcYCIWm3/Vph5w67NQeTO9VRYpiI7jG2W0s6NfY pR1WFqKirJ+Teq1oebZSNQ01VW4Wrv9n6R6tP1VOacftXhMQvIpuIcNu04PQZhu0OFrz OUNfqIR0jln68dO1EMV4zSTj44lSpwTWToksYYeOraKcDzczg0nAVGcHm8imkKiKIDcN X+0ZnJSxF6TZkSJNxtJGdGG0Z26N2fUEjRdx/7tTcFtP2sU6knalhblgfidpycijvSnz f8Sw== 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=kFPPZstBkas5qbjcpfxyoGriUyFM5j9wSpVME/IdO1s=; b=sIyCdsQw++77TvXLqY8vH5QtqxkU4ZvBWvpn5JsmbNkzCrrPoIsw8oag5TEIOuyEFK 19/YKaPwZ+Uwpcxg/EYq3IcJ/QDp2mVQscKt2y9x18Xha8jHt4KdAKGIgBMOnUfIyX4k ynYOnp1fVkqI+INQ8123bGz84ebhuTFgFhekqh22BfmVEnJwZqC+CZ7iZvBx8Z5yJDjM ffrI8/vbf9sgPK0dGyP/aqdjLGQP0SkayBUWPUMtZcIJTmAXJq7iQz/t7SqxYhCkVZrS oAu3tHq8RTQeZ7296YM786G1Bgls+GZGnQEXNLjWcanRABc+T0IpxZyXdX253SDaUAwK ma8w== X-Gm-Message-State: APjAAAWYHFLXMuZFYYlU3sHKcAevk7X2qyLT516BhFfosFeHMLQZqUab EiW8BMEtPbY0ud5UeuXu6JGSO7B+wUA= X-Received: by 2002:a62:a509:: with SMTP id v9mr3233467pfm.64.1553016099538; Tue, 19 Mar 2019 10:21:39 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id w68sm5616666pfb.176.2019.03.19.10.21.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 10:21:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 10:21:16 -0700 Message-Id: <20190319172126.7502-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190319172126.7502-1-richard.henderson@linaro.org> References: <20190319172126.7502-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52d Subject: [Qemu-devel] [PATCH for-4.1 v3 07/17] tcg: Manually expand INDEX_op_dup_vec 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: mark.cave-ayland@ilande.co.uk, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This case is similar to INDEX_op_mov_* in that we need to do different things depending on the current location of the source. Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 9 ++-- tcg/i386/tcg-target.inc.c | 8 ++- tcg/tcg.c | 102 +++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 10 deletions(-) -- 2.17.2 diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index 3c786ee581..17e35f2fb6 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -2099,10 +2099,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_mov_i32: /* Always emitted via tcg_out_mov. */ case INDEX_op_mov_i64: - case INDEX_op_mov_vec: case INDEX_op_movi_i32: /* Always emitted via tcg_out_movi. */ case INDEX_op_movi_i64: - case INDEX_op_dupi_vec: case INDEX_op_call: /* Always emitted via tcg_out_call. */ default: g_assert_not_reached(); @@ -2199,9 +2197,6 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, case INDEX_op_not_vec: tcg_out_insn(s, 3617, NOT, is_q, 0, a0, a1); break; - case INDEX_op_dup_vec: - tcg_out_dup_vec(s, type, vece, a0, a1); - break; case INDEX_op_shli_vec: tcg_out_insn(s, 3614, SHL, is_q, a0, a1, a2 + (8 << vece)); break; @@ -2245,6 +2240,10 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, } } break; + + case INDEX_op_mov_vec: /* Always emitted via tcg_out_mov. */ + case INDEX_op_dupi_vec: /* Always emitted via tcg_out_movi. */ + case INDEX_op_dup_vec: /* Always emitted via tcg_out_dup_vec. */ default: g_assert_not_reached(); } diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index b8e677e46d..09e2308557 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -2594,10 +2594,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_mov_i32: /* Always emitted via tcg_out_mov. */ case INDEX_op_mov_i64: - case INDEX_op_mov_vec: case INDEX_op_movi_i32: /* Always emitted via tcg_out_movi. */ case INDEX_op_movi_i64: - case INDEX_op_dupi_vec: case INDEX_op_call: /* Always emitted via tcg_out_call. */ default: tcg_abort(); @@ -2786,9 +2784,6 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, case INDEX_op_st_vec: tcg_out_st(s, type, a0, a1, a2); break; - case INDEX_op_dup_vec: - tcg_out_dup_vec(s, type, vece, a0, a1); - break; case INDEX_op_x86_shufps_vec: insn = OPC_SHUFPS; @@ -2830,6 +2825,9 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc, tcg_out8(s, a2); break; + case INDEX_op_mov_vec: /* Always emitted via tcg_out_mov. */ + case INDEX_op_dupi_vec: /* Always emitted via tcg_out_movi. */ + case INDEX_op_dup_vec: /* Always emitted via tcg_out_dup_vec. */ default: g_assert_not_reached(); } diff --git a/tcg/tcg.c b/tcg/tcg.c index ca5f3ed5ce..b11b30bbec 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3406,6 +3406,105 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOp *op) } } +static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op) +{ + const TCGLifeData arg_life = op->life; + TCGRegSet dup_out_regs, dup_in_regs; + TCGTemp *its, *ots; + TCGType itype, vtype; + unsigned vece; + bool ok; + + ots = arg_temp(op->args[0]); + its = arg_temp(op->args[1]); + + /* There should be no fixed vector registers. */ + tcg_debug_assert(!ots->fixed_reg); + + itype = its->type; + vece = TCGOP_VECE(op); + vtype = TCGOP_VECL(op) + TCG_TYPE_V64; + + if (its->val_type == TEMP_VAL_CONST) { + /* Propagate constant via movi -> dupi. */ + tcg_target_ulong val = its->val; + if (IS_DEAD_ARG(1)) { + temp_dead(s, its); + } + tcg_reg_alloc_do_movi(s, ots, val, arg_life, op->output_pref[0]); + return; + } + + dup_out_regs = tcg_op_defs[INDEX_op_dup_vec].args_ct[0].u.regs; + dup_in_regs = tcg_op_defs[INDEX_op_dup_vec].args_ct[1].u.regs; + + /* Allocate the output register now. */ + if (ots->val_type != TEMP_VAL_REG) { + TCGRegSet allocated_regs = s->reserved_regs; + + if (!IS_DEAD_ARG(1) && its->val_type == TEMP_VAL_REG) { + /* Make sure to not spill the input register. */ + tcg_regset_set_reg(allocated_regs, its->reg); + } + ots->reg = tcg_reg_alloc(s, dup_out_regs, allocated_regs, + op->output_pref[0], ots->indirect_base); + ots->val_type = TEMP_VAL_REG; + ots->mem_coherent = 0; + s->reg_to_temp[ots->reg] = ots; + } + + switch (its->val_type) { + case TEMP_VAL_REG: + /* + * The dup constriaints must be broad, covering all possible VECE. + * However, tcg_op_dup_vec() gets to see the VECE and we allow it + * to fail, indicating that extra moves are required for that case. + */ + if (tcg_regset_test_reg(dup_in_regs, its->reg)) { + if (tcg_out_dup_vec(s, vtype, vece, ots->reg, its->reg)) { + goto done; + } + /* Try again from memory or a vector input register. */ + } + if (!its->mem_coherent) { + /* + * The input register is not synced, and so an extra store + * would be required to use memory. Attempt an integer-vector + * register move first. We do not have a TCGRegSet for this. + */ + if (tcg_out_mov(s, itype, ots->reg, its->reg)) { + break; + } + /* Sync the temp back to its slot and load from there. */ + temp_sync(s, its, s->reserved_regs, 0, 0); + } + /* fall through */ + + case TEMP_VAL_MEM: + /* TODO: dup from memory */ + tcg_out_ld(s, itype, ots->reg, its->mem_base->reg, its->mem_offset); + break; + + default: + g_assert_not_reached(); + } + + /* We now have a vector input register, so dup must succeed. */ + ok = tcg_out_dup_vec(s, vtype, vece, ots->reg, ots->reg); + tcg_debug_assert(ok); + + done: + if (IS_DEAD_ARG(1)) { + temp_dead(s, its); + } + if (NEED_SYNC_ARG(0)) { + temp_sync(s, ots, s->reserved_regs, 0, 0); + } + if (IS_DEAD_ARG(0)) { + temp_dead(s, ots); + } +} + static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) { const TCGLifeData arg_life = op->life; @@ -3974,6 +4073,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) case INDEX_op_dupi_vec: tcg_reg_alloc_movi(s, op); break; + case INDEX_op_dup_vec: + tcg_reg_alloc_dup(s, op); + break; case INDEX_op_insn_start: if (num_insns >= 0) { size_t off = tcg_current_code_size(s);