From patchwork Tue Jan 2 01:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 759328 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp5850799wrw; Mon, 1 Jan 2024 17:36:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXfAu0PtLFOHo7XCCdBQvtOUwlcBg7mby0WBoPdJ1A/DUJCptUgIDpLra3Tu6xUBlcm1FA X-Received: by 2002:a05:620a:2481:b0:781:c15c:dd53 with SMTP id i1-20020a05620a248100b00781c15cdd53mr4474811qkn.95.1704159376097; Mon, 01 Jan 2024 17:36:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704159376; cv=none; d=google.com; s=arc-20160816; b=ERmi/YwPzerkQakHWBjKv/VQDVbX4VqUPLiVfNZwE8606cW0jWKs4B79wiAzEULBeg UNy+UGPY32nJqQvVK5VGt0DHOgpElBFsvm+nFmwXqqOC44b1L6ZUERQRMgoQbBCSlHXn Kx1KyPDER5hTnW9rY9OswXpsClF9250Km3sl+kUITCFM/eCyQTkgtJ0uRxHvUFajDn0W TugJXnR7yssCNLF+x9HehFuOtKV+PBzMqzigbHG+Gh0srqaOhAa1d2eJ/J4HrK8BG46h x4cNim/DspR3qMwLOx3VVqY8xlar/ejDM8cycjY3F9JE6Kt/Hcrwc0zRDxamYHgGx9g0 7Log== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=8sooKBESMwiRbV7J/EJZrL8fz1lrtlkfYgONVpEAYSw=; fh=+gkn74XflHDw2pG/qoweCNMPQxuJZicgeJb/G21dWVw=; b=Si1K0UuC++EMlrH03F06424NGSyzuCua7mGVw74eNpNMEYbGbB0kvdHv673A6ZfLUW HG+SIaXvrnNjHEZ6TT5zGU49y6U2W3KDcHOxr+iJveRuUcOQyJxlGWOkTuD1jw4mIUaC ghgMRjB9E9YLlMPwlkuO6ATeFL9K7Y6+48HD7zAi9ZeXxywAnFgrM576QmQSWMbRyDy+ CpNp+Lea1AjCer21VuRvAoPdq3naDGPRFfflUZKY2VUMYjL9ddEpp49PXvbaLgi0Nqx4 4CKUDizyFDmcKnh1AX5KnXmMolWulcQo6zpXlQ9PnuDqv0O9vpSqKlS0ZkF1ZpWNFzs1 VXXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vPwvFN3G; 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 k21-20020a05620a0b9500b00781613c7d9csi11813208qkh.719.2024.01.01.17.36.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Jan 2024 17:36:16 -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=vPwvFN3G; 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 1rKTgY-0006Y8-Eh; Mon, 01 Jan 2024 20:35:14 -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 1rKTgV-0006Xz-6p for qemu-devel@nongnu.org; Mon, 01 Jan 2024 20:35:11 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rKTgS-0004pV-32 for qemu-devel@nongnu.org; Mon, 01 Jan 2024 20:35:10 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1d4b650bc9cso8168915ad.0 for ; Mon, 01 Jan 2024 17:35:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704159302; x=1704764102; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8sooKBESMwiRbV7J/EJZrL8fz1lrtlkfYgONVpEAYSw=; b=vPwvFN3G9V4u6iQW3pnAd9IJ+5IKjrfDXAWZuodqaEk8AC1fpeDXSk8H75lKCd2YlX REom0czQOwSB4HRgOzKo3BJi2UU00/rweBvGOw9WSIh2T0V8NJHGTP1j8vAOrm41ZgaG wHJByH3QIpQBLqWDsAbkQgF4YQi9EOAp4fHXuOihm8kkeM/GgDC5d5AdqLioZbdIU+4e 3U3OJ1t9V/slQYvVOzSMW+3hkeq84SKG78HZKYXUKEKqqmXoW/7wJlkZ+ugQzRFZZ0Jq gYpWxWwfQfyScBV8IJ2J12biA2YYjRrTNIre0yfKkHwi0QhVWl4+/4L1Tfltc/J68KJl 5dzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704159302; x=1704764102; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8sooKBESMwiRbV7J/EJZrL8fz1lrtlkfYgONVpEAYSw=; b=dvUOIdkqLOCmRngOjDUOxdekiXwoveDP/Dh/kLUAEA/N3s2YJ3YtDRQ+jdVRAX3+is dDk4wwZY6rUF2Igz2EE43GrS4MbqWP6DJ+Pc9nWTPrEwdci2FX4Vpt2zmoP5/awQ/Z0L yCFC+jX718zaX87GYoG9FKRKX+J/0kBDRQ7EU7uHYf+l02paC6zXuwffhlr98iD9LAIz i4dyTNCqCl/B8P/mViijB1MfR+FSPVFfI95YWhMwimp7MWAbcf9w/igNQEfm8CwwhyJu FsRgI/ABtPkOqXH6wDtvurkH2JvGeJJiisdHZWGcHkD3Iop8VvQzWASx/QX8roPbQKeA Z98A== X-Gm-Message-State: AOJu0YyJ7PdIWZUErF5+QvdNFtCO+9Qvf+6Ae5z8BbNQg5O2dP8Lgecx BO3srbjPe5vaH65MnNDl27sMMZ3LK9GJdKPDjVY1AP66xLA= X-Received: by 2002:a17:902:b213:b0:1d4:3dfd:7e31 with SMTP id t19-20020a170902b21300b001d43dfd7e31mr17554714plr.139.1704159302604; Mon, 01 Jan 2024 17:35:02 -0800 (PST) Received: from stoup.. (124-149-254-207.tpgi.com.au. [124.149.254.207]) by smtp.gmail.com with ESMTPSA id jm7-20020a17090304c700b001d3e6f58e5esm20675565plb.6.2024.01.01.17.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 17:35:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-stable@nongnu.org Subject: [PATCH] tcg/ppc: Use new registers for LQ destination Date: Tue, 2 Jan 2024 12:34:56 +1100 Message-Id: <20240102013456.131846-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 LQ has a constraint that RTp != RA, else SIGILL. Therefore, force the destination of INDEX_op_qemu_*_ld128 to be a new register pair, so that it cannot overlap the input address. This requires new support in process_op_defs and tcg_reg_alloc_op. Cc: qemu-stable@nongnu.org Fixes: 526cd4ec01f ("tcg/ppc: Support 128-bit load/store") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- This bug may be triggered with qemu-aarch64 and tests/tcg/multiarch/linux-test.c. r~ --- tcg/ppc/tcg-target-con-set.h | 2 +- tcg/tcg.c | 21 ++++++++++++++++----- tcg/ppc/tcg-target.c.inc | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tcg/ppc/tcg-target-con-set.h b/tcg/ppc/tcg-target-con-set.h index bbd7b21247..cb47b29452 100644 --- a/tcg/ppc/tcg-target-con-set.h +++ b/tcg/ppc/tcg-target-con-set.h @@ -35,7 +35,7 @@ C_O1_I3(v, v, v, v) C_O1_I4(r, r, ri, rZ, rZ) C_O1_I4(r, r, r, ri, ri) C_O2_I1(r, r, r) -C_O2_I1(o, m, r) +C_N1O1_I1(o, m, r) C_O2_I2(r, r, r, r) C_O2_I4(r, r, rI, rZM, r, r) C_O2_I4(r, r, r, r, rI, rZM) diff --git a/tcg/tcg.c b/tcg/tcg.c index 896a36caeb..e2c38f6d11 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -653,6 +653,7 @@ static void tcg_out_movext3(TCGContext *s, const TCGMovExtend *i1, #define C_O1_I4(O1, I1, I2, I3, I4) C_PFX5(c_o1_i4_, O1, I1, I2, I3, I4), #define C_N1_I2(O1, I1, I2) C_PFX3(c_n1_i2_, O1, I1, I2), +#define C_N1O1_I1(O1, O2, I1) C_PFX3(c_n1o1_i1_, O1, O2, I1), #define C_N2_I1(O1, O2, I1) C_PFX3(c_n2_i1_, O1, O2, I1), #define C_O2_I1(O1, O2, I1) C_PFX3(c_o2_i1_, O1, O2, I1), @@ -676,6 +677,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode); #undef C_O1_I3 #undef C_O1_I4 #undef C_N1_I2 +#undef C_N1O1_I1 #undef C_N2_I1 #undef C_O2_I1 #undef C_O2_I2 @@ -696,6 +698,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode); #define C_O1_I4(O1, I1, I2, I3, I4) { .args_ct_str = { #O1, #I1, #I2, #I3, #I4 } }, #define C_N1_I2(O1, I1, I2) { .args_ct_str = { "&" #O1, #I1, #I2 } }, +#define C_N1O1_I1(O1, O2, I1) { .args_ct_str = { "&" #O1, #O2, #I1 } }, #define C_N2_I1(O1, O2, I1) { .args_ct_str = { "&" #O1, "&" #O2, #I1 } }, #define C_O2_I1(O1, O2, I1) { .args_ct_str = { #O1, #O2, #I1 } }, @@ -718,6 +721,7 @@ static const TCGTargetOpDef constraint_sets[] = { #undef C_O1_I3 #undef C_O1_I4 #undef C_N1_I2 +#undef C_N1O1_I1 #undef C_N2_I1 #undef C_O2_I1 #undef C_O2_I2 @@ -738,6 +742,7 @@ static const TCGTargetOpDef constraint_sets[] = { #define C_O1_I4(O1, I1, I2, I3, I4) C_PFX5(c_o1_i4_, O1, I1, I2, I3, I4) #define C_N1_I2(O1, I1, I2) C_PFX3(c_n1_i2_, O1, I1, I2) +#define C_N1O1_I1(O1, O2, I1) C_PFX3(c_n1o1_i1_, O1, O2, I1) #define C_N2_I1(O1, O2, I1) C_PFX3(c_n2_i1_, O1, O2, I1) #define C_O2_I1(O1, O2, I1) C_PFX3(c_o2_i1_, O1, O2, I1) @@ -2988,6 +2993,7 @@ static void process_op_defs(TCGContext *s) .pair = 2, .pair_index = o, .regs = def->args_ct[o].regs << 1, + .newreg = def->args_ct[o].newreg, }; def->args_ct[o].pair = 1; def->args_ct[o].pair_index = i; @@ -3004,6 +3010,7 @@ static void process_op_defs(TCGContext *s) .pair = 1, .pair_index = o, .regs = def->args_ct[o].regs >> 1, + .newreg = def->args_ct[o].newreg, }; def->args_ct[o].pair = 2; def->args_ct[o].pair_index = i; @@ -5036,17 +5043,21 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCGOp *op) break; case 1: /* first of pair */ - tcg_debug_assert(!arg_ct->newreg); if (arg_ct->oalias) { reg = new_args[arg_ct->alias_index]; - break; + } else if (arg_ct->newreg) { + reg = tcg_reg_alloc_pair(s, arg_ct->regs, + i_allocated_regs | o_allocated_regs, + output_pref(op, k), + ts->indirect_base); + } else { + reg = tcg_reg_alloc_pair(s, arg_ct->regs, o_allocated_regs, + output_pref(op, k), + ts->indirect_base); } - reg = tcg_reg_alloc_pair(s, arg_ct->regs, o_allocated_regs, - output_pref(op, k), ts->indirect_base); break; case 2: /* second of pair */ - tcg_debug_assert(!arg_ct->newreg); if (arg_ct->oalias) { reg = new_args[arg_ct->alias_index]; } else { diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 856c3b18f5..54816967bc 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -2595,6 +2595,7 @@ static void tcg_out_qemu_ldst_i128(TCGContext *s, TCGReg datalo, TCGReg datahi, tcg_debug_assert(!need_bswap); tcg_debug_assert(datalo & 1); tcg_debug_assert(datahi == datalo - 1); + tcg_debug_assert(!is_ld || datahi != index); insn = is_ld ? LQ : STQ; tcg_out32(s, insn | TAI(datahi, index, 0)); } else { @@ -4071,7 +4072,7 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) case INDEX_op_qemu_ld_a32_i128: case INDEX_op_qemu_ld_a64_i128: - return C_O2_I1(o, m, r); + return C_N1O1_I1(o, m, r); case INDEX_op_qemu_st_a32_i128: case INDEX_op_qemu_st_a64_i128: return C_O0_I3(o, m, r);