From patchwork Tue Apr 15 19:24:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 881370 Delivered-To: patch@linaro.org Received: by 2002:adf:f902:0:b0:38f:210b:807b with SMTP id b2csp643123wrr; Tue, 15 Apr 2025 13:20:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDVv5VFUFg0NENLO2kwxokZr7rMPYLK+NwrHvzC7XwjbiUmy36Qtf7Fq4tx9baR9qdOSbKkQ==@linaro.org X-Google-Smtp-Source: AGHT+IFN8Cz6A0PIse46SVdOZHrFDV5PRfUv9ulnJfy90R2JLFsR99JGut1holGs2A0GvK7f+J7q X-Received: by 2002:a05:6214:b6e:b0:6e4:2d8e:5cce with SMTP id 6a1803df08f44-6f2ad9ff5d6mr17174396d6.36.1744748421815; Tue, 15 Apr 2025 13:20:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744748421; cv=none; d=google.com; s=arc-20240605; b=IEln9wCCPROFw2B/j/bJOEK/kzkQdFowbhKeaGU5ApXoeIGKkVIpJVYV/pGKUR4yqy 9rI0DVBwKEkw8XUJQlfcvsDGu4tOmncT3NrDdyh2JKg7Qxg4qJL97q/G/8albLRvTTl+ C4Wj5TF6wse0z9O/YYLseNdUyw9xWYab4Exf8zcoRU8hSqKbI0s15xmNZfOPjjWDm+0f Z81cPXgf44ock3Z5IgBibfPdRyVL/eNwj6x/NwJNz70XO0+hdfJ2lP05eSRhavdTg9ZE bTHo2nQBszag9Qc3cqnSrQPZFf+8AqG5/Zh9w9X1ypfbmpywhJn7cG1hzuWDiuO11VPK gv0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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=XpMdeCbNzg3JmqdW1xzLz7fjwZKDUFJmzeS0cLmNFrg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ZNFgU5FXrKMyVWz0QdwEebodaAt55WsYEB/jIB6/k5b+vyqQmTfW8nQXknPIP/MngI 1eARGddRDYku0N793cg/XcgB1po3Gfg3jXTAo0Un4RNhR3K6ZsctLtnYf95HMXvWlNNj m6zktOfX0uwH7NyT5ilt8iTSzWyVclbUKPsImrjkRHpHSBEctrWOf8KX+0lgFpYMXiAc gtBW43ip5hNXxwLraqlXkD3Jj5GS6cuPakbF0A7zoaov54BPh9ZOZgt3uktPhj9V5GFc /sPPvf6hoYSG61YHlEMyrVumW+5kef7EQwoSG0rySYF5092tqeKYl6x883tX0CluAVnF MDDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c2VMoHmG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f0de9732bfsi130774936d6.143.2025.04.15.13.20.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Apr 2025 13:20:21 -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=c2VMoHmG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4mCN-0002Tn-SI; Tue, 15 Apr 2025 15:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u4m5o-00005M-Bc for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:37:18 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4m54-0004X4-4N for qemu-devel@nongnu.org; Tue, 15 Apr 2025 15:37:11 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-22409077c06so78939805ad.1 for ; Tue, 15 Apr 2025 12:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744745772; x=1745350572; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XpMdeCbNzg3JmqdW1xzLz7fjwZKDUFJmzeS0cLmNFrg=; b=c2VMoHmGfHf7T13gqTxsPCvoxvgmT3AyZevIYMxR+mm7496AEx2wtBg8cCdfmTtqrV p+llFDV87nqNwZpmnZpuUKBsRR57yO60y33pu2+K6eUFMZ//ivsXyGdJVAjlzoM5dLBm PlrxsFT+YTKv++g9WSKsBP7nj3dSOEll8S3RU6NLM3OU6VBvliCT4E1ESrRpP0/QJKLe o/8fkxhlPe86W/ZhI91t9K1ZAo1WaLRXpzIe+4aAOzRBxanxi9LAuNINpm3YKVk43ID9 q9LQ4poMtfk4KwSERgROSy7dQayak3B8HjGZAj6pI19mrkSdiLO+4eJ5dt9mYeotyhQA CLQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745772; x=1745350572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XpMdeCbNzg3JmqdW1xzLz7fjwZKDUFJmzeS0cLmNFrg=; b=RZ7xfKK5xFePJAtbLnPYSi1P9Zfib8ctwzg5x9UMCogqNpOK/2iPLIDPYdEGJi9kiR wl3SOJx8308vpZw52g6W9zD77L6Foc95NTwHV71Tcp15mWCLUClrZRk309ziN2nhhazu Qh8RBh5CfzZsZbp7mqD53ZfqkiZS7dnmhJ6qCb6dpYgQVsCxHKYujj9PL63Nfy9VrwTZ dVpZGGkM5fEJznqgYT9JVvnzV3ZnhYZjf0LCUKDnb4Xi7N6rE+Rk83nni6OyCLRIle8D 7VNYI9HJE4Ue/mzGjR2IBcKkwMyn+6W3MZV2ewmPyJayPzAzTEldB1DTtFncOpkwH1v5 TQTQ== X-Gm-Message-State: AOJu0YwylIEMewt+KS94CKNJSG56oTm35++tFXwIC9i6CnqCXw0JDO0u BRfw+OFoX3u9D09PnWp9yp3ffHGqRMsboRrjOtVEA9Nb2GEBwT4KwmaPt5So0SGW8FoVBPdqcfG Q X-Gm-Gg: ASbGncvEFHHokFQ3l79JoW2VMLa9RS0WUICnUHk+Q0D4cTl4EcXF97MTdsi9uheAwob 3Er8WgyGxqmZh5C6oVlO6+/nHabF3I5NIxyHGyKRxUcf4htX6J5SYcOGyjEBkus2CzUqlDmUl05 EKNfCxJFpcx/HfG5y9m3ERvHOuAkB1/jaFdxBI6s3Lf23HpFob3TUFeOn6MOxv0K3PW7ICuzAOy y+zTZSRcFdCd19dht4Hpva5u+IILliI4J0ZSvsBijVsGyjnlHQrU8t9bGRlwp8fKZzetZXhaD8J b1lwXwd1q+wOcOnPLCAbVjgzu/dGPQ10r/sTres/Ckc8slUdUbMC0R++cLT6vYSpPg7utv+/q/Y = X-Received: by 2002:a17:902:d492:b0:224:2717:7993 with SMTP id d9443c01a7336-22c31aba252mr3999325ad.45.1744745771916; Tue, 15 Apr 2025 12:36:11 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd230e34asm9155603b3a.137.2025.04.15.12.36.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:36:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 139/163] tcg/s390x: Honor carry_live in tcg_out_movi Date: Tue, 15 Apr 2025 12:24:50 -0700 Message-ID: <20250415192515.232910-140-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250415192515.232910-1-richard.henderson@linaro.org> References: <20250415192515.232910-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.google.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Do not clobber flags if they're live. Required in order to perform register allocation on add/sub carry opcodes. LA and AGHI are the same size, so use LA unconditionally. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- tcg/s390x/tcg-target.c.inc | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index a30afb455e..e262876614 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -951,25 +951,32 @@ static void tcg_out_movi(TCGContext *s, TCGType type, if (pc_off == (int32_t)pc_off) { tcg_out_insn(s, RIL, LARL, ret, pc_off); if (sval & 1) { - tcg_out_insn(s, RI, AGHI, ret, 1); + tcg_out_insn(s, RX, LA, ret, ret, TCG_REG_NONE, 1); } return; } - /* Otherwise, load it by parts. */ - i = is_const_p16((uint32_t)uval); - if (i >= 0) { - tcg_out_insn_RI(s, li_insns[i], ret, uval >> (i * 16)); - } else { - tcg_out_insn(s, RIL, LLILF, ret, uval); - } - uval >>= 32; - i = is_const_p16(uval); - if (i >= 0) { - tcg_out_insn_RI(s, oi_insns[i + 2], ret, uval >> (i * 16)); - } else { - tcg_out_insn(s, RIL, OIHF, ret, uval); + if (!s->carry_live) { + /* Load by parts, at most 2 instructions. */ + i = is_const_p16((uint32_t)uval); + if (i >= 0) { + tcg_out_insn_RI(s, li_insns[i], ret, uval >> (i * 16)); + } else { + tcg_out_insn(s, RIL, LLILF, ret, uval); + } + uval >>= 32; + i = is_const_p16(uval); + if (i >= 0) { + tcg_out_insn_RI(s, oi_insns[i + 2], ret, uval >> (i * 16)); + } else { + tcg_out_insn(s, RIL, OIHF, ret, uval); + } + return; } + + /* Otherwise, stuff it in the constant pool. */ + tcg_out_insn(s, RIL, LGRL, ret, 0); + new_pool_label(s, sval, R_390_PC32DBL, s->code_ptr - 2, 2); } /* Emit a load/store type instruction. Inputs are: