From patchwork Fri May 8 18:26:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 186433 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp233082ill; Fri, 8 May 2020 11:36:59 -0700 (PDT) X-Google-Smtp-Source: APiQypLIacPnwNV4tJ1KVFixpgfIowl+P+GGXGKyaKbwHkNItR4elB273X4UpAgu6BnPLPHZtKgO X-Received: by 2002:a05:620a:4fb:: with SMTP id b27mr3985222qkh.433.1588963019408; Fri, 08 May 2020 11:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588963019; cv=none; d=google.com; s=arc-20160816; b=L1cvL1/5cYrUwEJq1Kop/mbAv75F7+vSvb6PmrTRHxYTiocfoaTg3UrakewlfBJQBQ tejFBki2vhZfW0BgiVx5IMGnMpY1lTsjmbIVeFx2uauGYEP3fp5QZhrUZdnlS4BTKLEi jsg0DBh0qr1faUpSO5xdSb2kJ6Uoo75g+JAo2bUOqJszNZHVUfoTvqlEBkrnXz0gcZ4+ rHBP47Yh8RSJP2UyhR3hqyPUKYxNrvB6Gdp8CK727iCe2GB7tgt9LwhnqyyJhBnR8WJp DPSdWhNNNI6x43u/GP1wi0luekZ9bYMxj2RkBd4dUQpAhrRykuZmjdY4hlqTaSXsm+7n 9d2w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NvO2T1wYwGiRfWfqGrh6DB/67jrIMOZ5KtEk6dFeoQw=; b=RkiIL+0MxgxVN5FJdc+R8lbPdDEKrIFOl8OgPOXjEVyuELg4TOPcXuCNKvfW+rj2A/ kxgO2pC+CwEuYNQmmhq6r37FBpNDeIAJmUDhoZuYG4O7ktV0Pmx/sp+3aXg+koyfykPP BiTiEJK1I5vKxt2Z11hh28UBhN3ca7+RWzU2ZQZc7IG/KJE1jvH7Nrt6lWNS0P56xgdP H1bXBbMJ8Rkwy0bNj1276aBFMLPTMP4vVJIgDqePZfO1L6Ayq7QfYO2hutffbi0S5t6r rFSDpcOgyP8d8RSRwmDdO3BY+8XngCFGhgqR0hkBHMGO6ijJYqKZ/bak+os047bAQGNi n56w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bpjuu1vi; 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 j60si1427165qtd.320.2020.05.08.11.36.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 May 2020 11:36:59 -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=Bpjuu1vi; 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]:45928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX7rm-0005aq-U7 for patch@linaro.org; Fri, 08 May 2020 14:36:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX7hq-00072E-0t for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:42 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:41452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jX7ho-0007Fk-R2 for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:41 -0400 Received: by mail-pg1-x541.google.com with SMTP id r10so745545pgv.8 for ; Fri, 08 May 2020 11:26: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 :mime-version:content-transfer-encoding; bh=NvO2T1wYwGiRfWfqGrh6DB/67jrIMOZ5KtEk6dFeoQw=; b=Bpjuu1vi1ISatmjpQP8glGwpYO1NhrMKF9eWP26MTCy2EcTF38nQHNw8nmrUokoMqZ AvgYyo/581M+LFj5Aorq+41OtojKTcIJ1h4DA3Y7NUcR+LaZSoN1p6HjGMaIu3EsctAQ xYK42aQqWDkBznJCzt6y5V1EaMKm4kRIWx/C2FJa0yJCU8DafIjk1Dvjx/n/amtCVg5A qqMnt3zew51Qh2tVDPoi1ft/V/sEC1l5itmJucqygNtDDGSK4Nn8PGd6zxPoryRKvoH/ ZfHNBfhf7cfttqILTY5P7DoM6qZeWFujInl+IRbufFC9Z1dcTy/kVCUnI1s557IIFxnS Fs7g== 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:mime-version:content-transfer-encoding; bh=NvO2T1wYwGiRfWfqGrh6DB/67jrIMOZ5KtEk6dFeoQw=; b=iJ0oaR8Pfvhwq+hnb2Xfl5doJ4W4vV7adpNJOSLCoN3uZTALClFOOEPiwf3JXTjRXs th57v8ErhVLGU5EGWHKBIISpOAkO7HmwPhj+2GEv1ZWzQFnYi7SzbyCuf55j2WsULmP6 aSMk4LtMscsQO2ngZ3sPqCLbjsUmzIKkarxumd8twKlarY7qJG7kHX2SGeSusJqa4pvz JMUJj71f4jUP2fe79mfNf0NPnirhEKqA2QD+gb7dv03Dc3XYf766CLYjdfBUnFB7Zp44 3XDxzqCAjGxVQnHlLVcI8UrkQqQeMtxZY7zEH7szPY2qHLWb2ZopoGEec+2XSCYNBjld De5g== X-Gm-Message-State: AGi0Pub6/8RDNxiBEav/3Tazhd7lzhMLHu8Zpu6gRbSFBvkwhcF1+eeW myrTw/mK4hWFPAIJpRodbag0fdHfdag= X-Received: by 2002:a62:3584:: with SMTP id c126mr4210621pfa.316.1588962398740; Fri, 08 May 2020 11:26:38 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id u9sm2421775pfn.197.2020.05.08.11.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 11:26:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 15/19] tcg: Use tcg_out_dupi_vec from temp_load Date: Fri, 8 May 2020 11:26:12 -0700 Message-Id: <20200508182616.18318-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200508182616.18318-1-richard.henderson@linaro.org> References: <20200508182616.18318-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::541; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Having dupi pass though movi is confusing and arguably wrong. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.inc.c | 7 ---- tcg/i386/tcg-target.inc.c | 63 ++++++++++++++++++++++++------------ tcg/ppc/tcg-target.inc.c | 6 ---- tcg/tcg.c | 8 ++++- 4 files changed, 49 insertions(+), 35 deletions(-) -- 2.20.1 diff --git a/tcg/aarch64/tcg-target.inc.c b/tcg/aarch64/tcg-target.inc.c index d065fd600b..a7b1d36494 100644 --- a/tcg/aarch64/tcg-target.inc.c +++ b/tcg/aarch64/tcg-target.inc.c @@ -1010,13 +1010,6 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg rd, case TCG_TYPE_I64: tcg_debug_assert(rd < 32); break; - - case TCG_TYPE_V64: - case TCG_TYPE_V128: - tcg_debug_assert(rd >= 32); - tcg_out_dupi_vec(s, type, rd, value); - return; - default: g_assert_not_reached(); } diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c index bc957e7bed..4118071dd9 100644 --- a/tcg/i386/tcg-target.inc.c +++ b/tcg/i386/tcg-target.inc.c @@ -977,30 +977,32 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type, } } -static void tcg_out_movi(TCGContext *s, TCGType type, - TCGReg ret, tcg_target_long arg) +static void tcg_out_movi_vec(TCGContext *s, TCGType type, + TCGReg ret, tcg_target_long arg) +{ + if (arg == 0) { + tcg_out_vex_modrm(s, OPC_PXOR, ret, ret, ret); + return; + } + if (arg == -1) { + tcg_out_vex_modrm(s, OPC_PCMPEQB, ret, ret, ret); + return; + } + + int rexw = (type == TCG_TYPE_I32 ? 0 : P_REXW); + tcg_out_vex_modrm_pool(s, OPC_MOVD_VyEy + rexw, ret); + if (TCG_TARGET_REG_BITS == 64) { + new_pool_label(s, arg, R_386_PC32, s->code_ptr - 4, -4); + } else { + new_pool_label(s, arg, R_386_32, s->code_ptr - 4, 0); + } +} + +static void tcg_out_movi_int(TCGContext *s, TCGType type, + TCGReg ret, tcg_target_long arg) { tcg_target_long diff; - switch (type) { - case TCG_TYPE_I32: -#if TCG_TARGET_REG_BITS == 64 - case TCG_TYPE_I64: -#endif - if (ret < 16) { - break; - } - /* fallthru */ - case TCG_TYPE_V64: - case TCG_TYPE_V128: - case TCG_TYPE_V256: - tcg_debug_assert(ret >= 16); - tcg_out_dupi_vec(s, type, ret, arg); - return; - default: - g_assert_not_reached(); - } - if (arg == 0) { tgen_arithr(s, ARITH_XOR, ret, ret); return; @@ -1029,6 +1031,25 @@ static void tcg_out_movi(TCGContext *s, TCGType type, tcg_out64(s, arg); } +static void tcg_out_movi(TCGContext *s, TCGType type, + TCGReg ret, tcg_target_long arg) +{ + switch (type) { + case TCG_TYPE_I32: +#if TCG_TARGET_REG_BITS == 64 + case TCG_TYPE_I64: +#endif + if (ret < 16) { + tcg_out_movi_int(s, type, ret, arg); + } else { + tcg_out_movi_vec(s, type, ret, arg); + } + break; + default: + g_assert_not_reached(); + } +} + static inline void tcg_out_pushi(TCGContext *s, tcg_target_long val) { if (val == (int8_t)val) { diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index c525439b62..7111da34dd 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -987,12 +987,6 @@ static void tcg_out_movi(TCGContext *s, TCGType type, TCGReg ret, tcg_out_movi_int(s, type, ret, arg, false); break; - case TCG_TYPE_V64: - case TCG_TYPE_V128: - tcg_debug_assert(ret >= TCG_REG_V0); - tcg_out_dupi_vec(s, type, ret, arg); - break; - default: g_assert_not_reached(); } diff --git a/tcg/tcg.c b/tcg/tcg.c index 7a23ccb017..a84a9d3d63 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3400,7 +3400,13 @@ static void temp_load(TCGContext *s, TCGTemp *ts, TCGRegSet desired_regs, case TEMP_VAL_CONST: reg = tcg_reg_alloc(s, desired_regs, allocated_regs, preferred_regs, ts->indirect_base); - tcg_out_movi(s, ts->type, reg, ts->val); + if (ts->type <= TCG_TYPE_I64) { + tcg_out_movi(s, ts->type, reg, ts->val); + } else if (TCG_TARGET_REG_BITS == 64) { + tcg_out_dupi_vec(s, ts->type, reg, ts->val); + } else { + tcg_out_dupi_vec(s, ts->type, reg, dup_const(MO_32, ts->val)); + } ts->mem_coherent = 0; break; case TEMP_VAL_MEM: