From patchwork Sat Feb 4 16:33:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 650646 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp1446089pva; Sat, 4 Feb 2023 08:34:43 -0800 (PST) X-Google-Smtp-Source: AK7set+32Q3SmyguvxnrC6yGGIKNDLVugtklp4VdW9u7qajrMeK9qGhDrludrakd38k9qRQQdWZ/ X-Received: by 2002:a05:622a:4cc:b0:3b8:385f:d72e with SMTP id q12-20020a05622a04cc00b003b8385fd72emr25740248qtx.48.1675528483819; Sat, 04 Feb 2023 08:34:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675528483; cv=none; d=google.com; s=arc-20160816; b=fzHPQyuQik4NlV9IjRDELd75K69Vjq+SFDv9ZneA+CEJrHF+CyUVIw/56QUeatKtBQ kre6DevreH/VGiSvu12VnkCCQuF6nvmUqEJJC6brHAp6mZrxnuUsDt98/fu8zpCM0IQT gH+mRhyyFSKzi3DFgbgJnJgESgZ//wizBg4m0tzNpjoNmB3XhDZG5gcJq93r9XtwmYv9 1LNf5Guz90snPd7JqguNAiLM+bxbqD+AisKFBACR+xriAvNm+o6+kT7R1SCA3VPSuIZr 7MZaFj0SqNOXzpb0B9jP1Mhu8O354QhoZNMfWiSzmCNk2YKsj9sAdcZDx4ZN1cizurnC fnBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:cc:to :from:dkim-signature; bh=cQ165mRq6HYu4kMjD+zLDVRfxYUnWTcoWt25Iq3UDtY=; b=RrHpN66I0GzTKsCxGhIzuKr6XBLYiYiiaU1/me51hUoWAcZmnXRh46HztEj06C8+lq SBaMK9v0K0qOTgBrXmRLA4x8yQLstsPza7TkYW6qnV9s1OQ6nMbGJhwBDEi5nX1fh90T Mn34KyZtc+N7GUCMLSFY4DrbcrgrdYUu3Q53Wb6u0horGsLMN9cd1suxIbQTdsSyqQ3E UEcQqrCH89eeqIfRysxj8HUubcU2M4YPgC6xLGhiREoZR1F7gBg5yDGGjJYOKis0r/KH /7yHd/YJiNmAZpVo/B6IeHOcBM6Iu+wBWIQeilu9vlmzbc3zi3uuTIkHnZFwaAzPleGQ 2cZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OTh0oZWX; 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 m20-20020a05620a24d400b006fa57ff8d78si5142676qkn.67.2023.02.04.08.34.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Feb 2023 08:34:43 -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=pass header.i=@linaro.org header.s=google header.b=OTh0oZWX; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOLUN-0005G5-Jx; Sat, 04 Feb 2023 11:34:07 -0500 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 1pOLUM-0005Fr-P8 for qemu-devel@nongnu.org; Sat, 04 Feb 2023 11:34:06 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOLUK-0002Yw-Uy for qemu-devel@nongnu.org; Sat, 04 Feb 2023 11:34:06 -0500 Received: by mail-pj1-x102a.google.com with SMTP id pj3so7856654pjb.1 for ; Sat, 04 Feb 2023 08:34:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cQ165mRq6HYu4kMjD+zLDVRfxYUnWTcoWt25Iq3UDtY=; b=OTh0oZWX1ih4YEbVgXfqDw5XCq4LxufTh3q+RNpiFdiqqsUFiY+N5l17FEvvPnQ1I6 K1HdYkfph+24WqXI37v5p7Gj8FV73rflf295hZF21eVwMz/YuoShAQRPE3vD8RN1ggp7 SetMFDeK8C0vDKHxOzhsVz1IhF3aO5BuQ3ewKPv1zy5kH0wL6h/EkzqMD+UV9uGv2ti4 2ihxcMZxJJIvaQy+ZplY5foKKdEpg6xVzLvVWSeAPR5eJSdz352wBvPOeJg5TTsm/svt jIXsIHqwRw/vd/7pkLK2HFhiMjXV7FttNQWdCcrReSITMRf7yJAvBryzo4o3qrME3ga9 G+kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cQ165mRq6HYu4kMjD+zLDVRfxYUnWTcoWt25Iq3UDtY=; b=Ldl57Ua80jRZrP0v2NvOXo5mQ4ht/wJTKiZt16XPCgpk60OS6Cw8IJ0n37GADDsCHN R5BBy/Yeb9tlFKdMrxyuT/BeCj4nMzI/usm02HTyXY90aAxA7k5tRwQITnRXAdRFtOyE myAE735qfcbtR1SZzjNbgNgPOt43WWTbX1/92zSRHPd8I2643uiu1xodqCVnSn1PLvra XAFxCalzL4yB6aZUqOZYNGtCSOYX7EtBsbZIDONuIjYh+8ftnnOEFPGQissifcKvF25b gQsmpiueJ19OEiEIPjetGszrjg0OUXCPJtZXG6CLpml1UdXa5bpZ7h7HTJNzSJZhN19D urig== X-Gm-Message-State: AO0yUKUgBEG02RzMieSqv9E0BPcq9Dt3lVP6Txt4s5fXeNlvgcRoAMlN ymyLswcneqy3U3GrySSYSGapAX+iHNM4lAOK X-Received: by 2002:a17:902:da85:b0:198:b99c:f6ee with SMTP id j5-20020a170902da8500b00198b99cf6eemr14267611plx.65.1675528443528; Sat, 04 Feb 2023 08:34:03 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id w19-20020a1709029a9300b00186b69157ecsm3660859plp.202.2023.02.04.08.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 08:34:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 32/40] target/s390x: Copy wout_x1 to wout_x1_P Date: Sat, 4 Feb 2023 06:33:02 -1000 Message-Id: <20230204163310.815536-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230204163310.815536-1-richard.henderson@linaro.org> References: <20230204163310.815536-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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 Make a copy of wout_x1 before modifying it, as wout_x1_P emphasizing that it operates on the out/out2 pair. The insns that use x1_P are data movement that will not change to Int128. Acked-by: Ilya Leoshkevich Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/s390x/tcg/insn-data.h.inc | 12 ++++++------ target/s390x/tcg/translate.c | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.h.inc index 79c6ab509a..d0814cb218 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -422,7 +422,7 @@ F(0x3800, LER, RR_a, Z, 0, e2, 0, cond_e1e2, mov2, 0, IF_AFP1 | IF_AFP2) F(0x7800, LE, RX_a, Z, 0, m2_32u, 0, e1, mov2, 0, IF_AFP1) F(0xed64, LEY, RXY_a, LD, 0, m2_32u, 0, e1, mov2, 0, IF_AFP1) - F(0xb365, LXR, RRE, Z, x2h, x2l, 0, x1, movx, 0, IF_AFP1) + F(0xb365, LXR, RRE, Z, x2h, x2l, 0, x1_P, movx, 0, IF_AFP1) /* LOAD IMMEDIATE */ C(0xc001, LGFI, RIL_a, EI, 0, i2, 0, r1, mov2, 0) /* LOAD RELATIVE LONG */ @@ -461,7 +461,7 @@ C(0xe332, LTGF, RXY_a, GIE, 0, a2, r1, 0, ld32s, s64) F(0xb302, LTEBR, RRE, Z, 0, e2, 0, cond_e1e2, mov2, f32, IF_BFP) F(0xb312, LTDBR, RRE, Z, 0, f2, 0, f1, mov2, f64, IF_BFP) - F(0xb342, LTXBR, RRE, Z, x2h, x2l, 0, x1, movx, f128, IF_BFP) + F(0xb342, LTXBR, RRE, Z, x2h, x2l, 0, x1_P, movx, f128, IF_BFP) /* LOAD AND TRAP */ C(0xe39f, LAT, RXY_a, LAT, 0, m2_32u, r1, 0, lat, 0) C(0xe385, LGAT, RXY_a, LAT, 0, a2, r1, 0, lgat, 0) @@ -483,7 +483,7 @@ C(0xb913, LCGFR, RRE, Z, 0, r2_32s, r1, 0, neg, neg64) F(0xb303, LCEBR, RRE, Z, 0, e2, new, e1, negf32, f32, IF_BFP) F(0xb313, LCDBR, RRE, Z, 0, f2, new, f1, negf64, f64, IF_BFP) - F(0xb343, LCXBR, RRE, Z, x2h, x2l, new_P, x1, negf128, f128, IF_BFP) + F(0xb343, LCXBR, RRE, Z, x2h, x2l, new_P, x1_P, negf128, f128, IF_BFP) F(0xb373, LCDFR, RRE, FPSSH, 0, f2, new, f1, negf64, 0, IF_AFP1 | IF_AFP2) /* LOAD COUNT TO BLOCK BOUNDARY */ C(0xe727, LCBB, RXE, V, la2, 0, r1, 0, lcbb, 0) @@ -552,7 +552,7 @@ C(0xb911, LNGFR, RRE, Z, 0, r2_32s, r1, 0, nabs, nabs64) F(0xb301, LNEBR, RRE, Z, 0, e2, new, e1, nabsf32, f32, IF_BFP) F(0xb311, LNDBR, RRE, Z, 0, f2, new, f1, nabsf64, f64, IF_BFP) - F(0xb341, LNXBR, RRE, Z, x2h, x2l, new_P, x1, nabsf128, f128, IF_BFP) + F(0xb341, LNXBR, RRE, Z, x2h, x2l, new_P, x1_P, nabsf128, f128, IF_BFP) F(0xb371, LNDFR, RRE, FPSSH, 0, f2, new, f1, nabsf64, 0, IF_AFP1 | IF_AFP2) /* LOAD ON CONDITION */ C(0xb9f2, LOCR, RRF_c, LOC, r1, r2, new, r1_32, loc, 0) @@ -577,7 +577,7 @@ C(0xb910, LPGFR, RRE, Z, 0, r2_32s, r1, 0, abs, abs64) F(0xb300, LPEBR, RRE, Z, 0, e2, new, e1, absf32, f32, IF_BFP) F(0xb310, LPDBR, RRE, Z, 0, f2, new, f1, absf64, f64, IF_BFP) - F(0xb340, LPXBR, RRE, Z, x2h, x2l, new_P, x1, absf128, f128, IF_BFP) + F(0xb340, LPXBR, RRE, Z, x2h, x2l, new_P, x1_P, absf128, f128, IF_BFP) F(0xb370, LPDFR, RRE, FPSSH, 0, f2, new, f1, absf64, 0, IF_AFP1 | IF_AFP2) /* LOAD REVERSED */ C(0xb91f, LRVR, RRE, Z, 0, r2_32u, new, r1_32, rev32, 0) @@ -588,7 +588,7 @@ /* LOAD ZERO */ F(0xb374, LZER, RRE, Z, 0, 0, 0, e1, zero, 0, IF_AFP1) F(0xb375, LZDR, RRE, Z, 0, 0, 0, f1, zero, 0, IF_AFP1) - F(0xb376, LZXR, RRE, Z, 0, 0, 0, x1, zero2, 0, IF_AFP1) + F(0xb376, LZXR, RRE, Z, 0, 0, 0, x1_P, zero2, 0, IF_AFP1) /* LOAD FPC */ F(0xb29d, LFPC, S, Z, 0, m2_32u, 0, 0, sfpc, 0, IF_BFP) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index f3e4b70ed9..d25b6f3c03 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -5518,6 +5518,14 @@ static void wout_x1(DisasContext *s, DisasOps *o) } #define SPEC_wout_x1 SPEC_r1_f128 +static void wout_x1_P(DisasContext *s, DisasOps *o) +{ + int f1 = get_field(s, r1); + store_freg(f1, o->out); + store_freg(f1 + 2, o->out2); +} +#define SPEC_wout_x1_P SPEC_r1_f128 + static void wout_cond_r1r2_32(DisasContext *s, DisasOps *o) { if (get_field(s, r1) != get_field(s, r2)) {