From patchwork Fri Aug 4 05:44:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 797634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f1z8bo5D"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xNwv56Vl4z9s4s for ; Fri, 4 Aug 2017 15:48:01 +1000 (AEST) Received: from localhost ([::1]:36669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVSp-0006F2-Op for incoming@patchwork.ozlabs.org; Fri, 04 Aug 2017 01:47:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddVPa-0003uM-CT for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddVPY-0003Fl-NA for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:38 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33045) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddVPY-0003Db-F0 for qemu-devel@nongnu.org; Fri, 04 Aug 2017 01:44:36 -0400 Received: by mail-pg0-x241.google.com with SMTP id u185so853471pgb.0 for ; Thu, 03 Aug 2017 22:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=HK/tKI+UX+583UXkdChp1m60YTPflzL8govNBUO7npA=; b=f1z8bo5Dx2BSfKK3o6QL+QdNk+/NmY5W+IAezK13pG+t5sXYzAD83EmGcUttl/8AVF c3319+a57lmWpfIqq9AloTv5nr3LWgGuGikmxYb7epJ0QSTgXQ92zL7xPWgCpXCXzK02 FoZJDc2zhjPnLEFRZCxfVYQtur2hR0MA+X+zQpWS3YYFT0PMStjLYCus1CG4RLg7Sc7c ct3FjuRLMYWDAM9/UN+o18IQsuz6UOwz5VnCpnM9gwbN4McaoNE7g6de0vTAivKl71nd VAQzUJd7EUqJE+wiFG5IF2gaFXPA/gruDlIDCYmgCyDDbZo91ewzECQICw54sCwrEk/v P70Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=HK/tKI+UX+583UXkdChp1m60YTPflzL8govNBUO7npA=; b=OsyzM4CS/YSIEwmxvKmFNU9j8keGdJIigJhWL9jZs0A8KHPLlZjSYTA61/hOyWOBpk v0jTAWMln4jt19LsUNnZk9OW5f/lv98Oksezah3EskfSQs2SbR7bdB8UcN5xVg9ykJmt zmhY/FtrMozQ5CoaY46RveulKLVKQH9o6X3IzrSIIYUfpw0l7sarv6xl/+I0lbYr8yNm KSyQTtN4hyyojhk3iSe5YagHtrCKmLsHFGIeXtA+QXp1s7DM3Zo7evYhm1xaDw83giWp bYi4aYxxXkSilbi5Roza+mDdnpK8sBdc2zXVw98G9qMb1dfMMWgdH1FUpv6HwoHmfjlr CqHw== X-Gm-Message-State: AIVw111vW6fatOmi1nLGNLldMsYiMhdXxAxskW833uVAjUkI7sRI6rs4 Rog6C4AZUtFrNfbuUIQ= X-Received: by 10.84.231.197 with SMTP id g5mr1402260pln.152.1501825475242; Thu, 03 Aug 2017 22:44:35 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id o14sm1061063pfi.158.2017.08.03.22.44.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 22:44:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 3 Aug 2017 22:44:11 -0700 Message-Id: <20170804054426.10590-9-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170804054426.10590-1-rth@twiddle.net> References: <20170804054426.10590-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH for-2.11 08/23] tcg/s390: Use constant pool for andi 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index 29b77ff67f..4be57c5765 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -224,6 +224,7 @@ typedef enum S390Opcode { RXY_LRVG = 0xe30f, RXY_LRVH = 0xe31f, RXY_LY = 0xe358, + RXY_NG = 0xe380, RXY_STCY = 0xe372, RXY_STG = 0xe324, RXY_STHY = 0xe370, @@ -985,8 +986,17 @@ static void tgen_andi(TCGContext *s, TCGType type, TCGReg dest, uint64_t val) return; } - /* Fall back to loading the constant. */ - tcg_out_movi(s, type, TCG_TMP0, val); + /* Use the constant pool if USE_REG_TB, but not for small constants. */ + if (USE_REG_TB) { + if (!maybe_out_small_movi(s, type, TCG_TMP0, val)) { + tcg_out_insn(s, RXY, NG, dest, TCG_REG_TB, TCG_REG_NONE, 0); + new_pool_label(s, val & valid, R_390_20, s->code_ptr - 2, + -(intptr_t)s->code_gen_ptr); + return; + } + } else { + tcg_out_movi(s, type, TCG_TMP0, val); + } if (type == TCG_TYPE_I32) { tcg_out_insn(s, RR, NR, dest, TCG_TMP0); } else { @@ -2341,6 +2351,8 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) return &r_r_ri; case INDEX_op_sub_i32: case INDEX_op_sub_i64: + case INDEX_op_and_i32: + case INDEX_op_and_i64: return (s390_facilities & FACILITY_DISTINCT_OPS ? &r_r_ri : &r_0_ri); case INDEX_op_mul_i32: @@ -2375,10 +2387,6 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) ? (s390_facilities & FACILITY_DISTINCT_OPS ? &r_r_rM : &r_0_rM) : &r_0_r); - case INDEX_op_and_i32: - case INDEX_op_and_i64: - return (s390_facilities & FACILITY_DISTINCT_OPS ? &r_r_ri : &r_0_ri); - case INDEX_op_shl_i32: case INDEX_op_shr_i32: case INDEX_op_sar_i32: