From patchwork Thu Mar 7 14:41:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159853 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp7526336jad; Thu, 7 Mar 2019 06:55:15 -0800 (PST) X-Google-Smtp-Source: APXvYqxFllGR/gzX42jdg+KWYa1O1HBvyPER9ttRXDMSl2fSVmesgnXsYM1EmSHVxr/xNtapiS72 X-Received: by 2002:a0d:ca07:: with SMTP id m7mr10064935ywd.192.1551970515250; Thu, 07 Mar 2019 06:55:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551970515; cv=none; d=google.com; s=arc-20160816; b=EVl5Xa9sZpP9l4mPnz2RagKcMmBRxjjXgwIEDrW4YWqr8k+N7SoUKN9Qe754b/0P+M kG1CAHGGjSGlSc7GHIEk4v9N8Mz1w+Y0Wc6+h2jOmPG5aoqpG+ZGf8x1K/arVBHeufqu D66Ruq+N3+e4luEUvjF4KvkeLpreN5G2ZXVBssAUjbHYsfjixULIz2uzkxrJ53boPUJb dhFq8Ht8Zy2UeoWByP3evww904iu6tVoOgvzTpBOKetSnRG5Fv9AorrOckYkzIpCP4qd odf8HbS8NWPT+h8/S/uOnBDI+uIcRUNFbBPUFF/TfHrmr7wQLBC9l+/1Z6FO23w4XDYH 3qWg== 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=eu3UcP6XYcEcl5Ty9GSI2+W4Hww6Yf+5rGz/kG2iBME=; b=PDkNIMM78G1g9UlZrVmB1GCbBtUgR7GkkTjvKpMLhH+eisRbrfUa28a7xnTPh0mNDO 4FKuoV426BpQYs/PKehvLSkSVoMWrjJ10wRwvRCrx3HNvN3DYfO6JyLgmLOTd6FdJXZn 5z7hp7ZSilaXtcn2IoXAqPQOTI06CZuM1CFAFZz6MoVeTPlYSudOTGuGqTEJdzXXRro4 qKbnYe11rDivewc9nqtcFPL2fxazd2/UDt6rIxsGPYRfHdGxD7DMHLyeHeYJ1JnUgr4t 4ZjTrdp3BRX0Bgoe0OdnZWCg24/UqunnEMk5LiVl7IX6yXOoSKNOVRX948gaUmtzr2ZY iqkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ul4DdExq; 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 e1si2863512ybp.338.2019.03.07.06.55.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Mar 2019 06:55:15 -0800 (PST) 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=Ul4DdExq; 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]:53154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uQU-0001Bz-Qj for patch@linaro.org; Thu, 07 Mar 2019 09:55:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uDJ-0006oe-Qo for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:41:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1uDI-0003XF-WE for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:41:37 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:39259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1uDI-0003Wk-Oy for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:41:36 -0500 Received: by mail-pg1-x544.google.com with SMTP id h8so11414959pgp.6 for ; Thu, 07 Mar 2019 06:41:36 -0800 (PST) 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=eu3UcP6XYcEcl5Ty9GSI2+W4Hww6Yf+5rGz/kG2iBME=; b=Ul4DdExqLJVgxo2SFABsdWSRA8W6xTZGHff8KB3Gd1mx7dK+XCe9FT321+Qahlw5At tunxOdPVLeph+Z0rgAv3EnegXB3KG+bDbIJy6Pp6BvpOt+BjXYFL4/JFw2YDyuVf6kg/ FlaI/PkS3CJ7h4OJXlv/hZ8X+5Kn0bTnxx6HrrDEH0oGxXkm+votZn4loRPKdXaX2gdD 2iR8nBl+JePlQDK12GCRTYpL84Xb36YTqoqf5OaEYfaC5pVCYO8hU6S5a3Jdywz5Ct4G HFuj5IUtMdVfbWlbYZxKXxPT8Y/VRTRjLRrN+XjSZoZcBnYgpEJ22pTLX27O4T1yPTmp tiog== 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=eu3UcP6XYcEcl5Ty9GSI2+W4Hww6Yf+5rGz/kG2iBME=; b=RsKJXjJx3XiPsV7OCCSiDzB6h3BHTxT61EoPVxFxPZpNUS4AM/hA9zI8wMHqU1GKI5 e90DWo6zEqakoFsmJgLau0ZOOZMpNvtmffex7qzd7qwnHKaok5ZQwW5RMmuDC9Y05kb0 MP2dFtJ0PgaM7oChTQmelQCKQDiYbMyY7fClCt5f4sGGBURPCXXyJ92gH4oYlHvKU+QP KnIZ3DA2s+y0Ev7hYHVI9okOkbKaoiclS22KcvNuu+LRrrJtJC/QTfatqUxBF4OgUor5 ZxVSfbg02unBLCYI+HDs0EsO30SOSt2/ryn2dsy6Y7Judee75tgCcVOYq+Fsg59/92v0 s1mQ== X-Gm-Message-State: APjAAAUTNPuJaECRYxxgDapDfpOaoJpuOcK+TjiD2e1OojXFWM63M/wJ 30qdv9B/aQk5R6VjYynKitYE7QHxpHU= X-Received: by 2002:a62:ea0f:: with SMTP id t15mr13288137pfh.124.1551969695523; Thu, 07 Mar 2019 06:41:35 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id p2sm6222838pgs.7.2019.03.07.06.41.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 06:41:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 06:41:23 -0800 Message-Id: <20190307144126.31847-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190307144126.31847-1-richard.henderson@linaro.org> References: <20190307144126.31847-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::544 Subject: [Qemu-devel] [PATCH 6/9] tcg/arm: Support INDEX_op_extract2_i32 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: david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.h | 2 +- tcg/arm/tcg-target.inc.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) -- 2.17.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 4ee6c98958..17e771374d 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -116,7 +116,7 @@ extern bool use_idiv_instructions; #define TCG_TARGET_HAS_deposit_i32 use_armv7_instructions #define TCG_TARGET_HAS_extract_i32 use_armv7_instructions #define TCG_TARGET_HAS_sextract_i32 use_armv7_instructions -#define TCG_TARGET_HAS_extract2_i32 0 +#define TCG_TARGET_HAS_extract2_i32 1 #define TCG_TARGET_HAS_movcond_i32 1 #define TCG_TARGET_HAS_mulu2_i32 1 #define TCG_TARGET_HAS_muls2_i32 1 diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 2245a8aeb9..6873b0cf95 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -2064,6 +2064,27 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_sextract_i32: tcg_out_sextract(s, COND_AL, args[0], args[1], args[2], args[3]); break; + case INDEX_op_extract2_i32: + /* ??? These optimization vs zero should be generic. */ + /* ??? But we can't substitute 2 for 1 in the opcode stream yet. */ + if (const_args[1]) { + if (const_args[2]) { + tcg_out_movi(s, TCG_TYPE_REG, args[0], 0); + } else { + tcg_out_dat_reg(s, COND_AL, ARITH_MOV, args[0], 0, + args[2], SHIFT_IMM_LSL(32 - args[3])); + } + } else if (const_args[2]) { + tcg_out_dat_reg(s, COND_AL, ARITH_MOV, args[0], 0, + args[1], SHIFT_IMM_LSR(args[3])); + } else { + /* We can do extract2 in 2 insns, vs the 3 required otherwise. */ + tcg_out_dat_reg(s, COND_AL, ARITH_MOV, TCG_REG_TMP, 0, + args[2], SHIFT_IMM_LSL(32 - args[3])); + tcg_out_dat_reg(s, COND_AL, ARITH_ORR, args[0], TCG_REG_TMP, + args[1], SHIFT_IMM_LSR(args[3])); + } + break; case INDEX_op_div_i32: tcg_out_sdiv(s, COND_AL, args[0], args[1], args[2]); @@ -2108,6 +2129,8 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) = { .args_ct_str = { "s", "s", "s", "s" } }; static const TCGTargetOpDef br = { .args_ct_str = { "r", "rIN" } }; + static const TCGTargetOpDef ext2 + = { .args_ct_str = { "r", "rZ", "rZ" } }; static const TCGTargetOpDef dep = { .args_ct_str = { "r", "0", "rZ" } }; static const TCGTargetOpDef movc @@ -2174,6 +2197,8 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) return &br; case INDEX_op_deposit_i32: return &dep; + case INDEX_op_extract2_i32: + return &ext2; case INDEX_op_movcond_i32: return &movc; case INDEX_op_add2_i32: