From nobody Sat May 18 06:04:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686152513; cv=none; d=zohomail.com; s=zohoarc; b=X4DyLBaRsvPQ5c+NZ/5LGbnLkMhAJi8OyodE90BwYjOIroc9SdKx6rUQrdgpg1MKPXsbQtWWppp9lAX97uJwuBH5nPXrI3YTMwBJS+PWAIpVYgn8aalTxkvAsO3qrxXHZZyC2EBG0Km9O037EHXPEpgm8Qxob4aUr/snB3XY0ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686152513; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7KdnjcOJ+qNxqu7A3MMGtBdXHktohSTiwAh5//+RHTU=; b=eLueBUxyhduQBIhdqlZ2bN8tPq37CyLbZhEpy3lnhpeHstR4b0UroCN5l8YUjECYCpAOP8ZBtp3Gq46JEHmv0kX3KHgaqx6yTYyRz8nxk81mc+pKzC1DGk5K7Tc4XJtawGriezotEWBVlAYTQWrBZuqHVzLGw4HCbR59R6HNouU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686152513077777.8490345709373; Wed, 7 Jun 2023 08:41:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHR-0001WA-4k; Wed, 07 Jun 2023 11:41: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 1q6vHP-0001VX-Ln for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:40:59 -0400 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHN-0001zP-Tm for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:40:59 -0400 Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-38dec65ab50so6512511b6e.2 for ; Wed, 07 Jun 2023 08:40:57 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152457; x=1688744457; 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=7KdnjcOJ+qNxqu7A3MMGtBdXHktohSTiwAh5//+RHTU=; b=SDPmjk2LkJAeZsCwZKZw6OHOOLw0aPJkleq+0CWt3LsD1/B5l4FNACgP9BfHTPaLO6 TD/G2n7Vn27Em7VsduwP/zOXpEYiVLAo1CNmjWcRHMOQfZzdbgHYEgjy+dj3zJWgNsLd UCd/GgNgih/8nCSfMydqb2KKKt1iEF2zRT9OFUyFfRrS2Uy+xiA+H40EYIDOCFrTgE6k cyoVTQ10HIW/l9n2sRWCGTKx1InHa5OEsuQUHGBB7+4wLKagvJuZLHDAeuiHYBqqdIyH +ip3A6FI5PRzcsKKTf8cIaTWVNdt+PCuv+HSK0XJLbhMR5BqBjUJkbjHpfbRUUJsQp/+ jpSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152457; x=1688744457; 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=7KdnjcOJ+qNxqu7A3MMGtBdXHktohSTiwAh5//+RHTU=; b=e1MtVo5Atma5AbkItsbc4g9kLbGy/PxImEtPlW0qE5H6MRmAsHg/jiYqZa2eGO/lfg oXqsHAtdcvmbUPiBbP7Wt9IV6KNB1BqSRsE21M/BHUv1Ie5Sl2ZrWbyTECrsc/P0+vxM zvsclArv5ziSEVgJz4lQ960om/pU/iutHAo1yEdx/Ow7zC/PIPEO7OsPG1/TrDnZ7Nj2 m5+Hl1Q86hT0n4p9s7nqF2y6JVjTHeYvw2iDu1GQ2Ry6s/2YiZyUAdtp0GKVS5QP83z0 7ZUbBSSd/wHkdcb91k1XvreltjwcOqT3J5+utURWLuDUZEXQ0Z0Gk/NaaCqiyzFZ2lbu 1d9Q== X-Gm-Message-State: AC+VfDxZMmI7/h+u5xxkf/eY9W0vIyBohL6dpM7jgqIGxAxWR1cGpwrx KI+ldzjI5J3qqrBfeDh4NlwcNTyceYxHdrHQblE= X-Google-Smtp-Source: ACHHUZ5M5J9nUIV8Ybjk7Y1xqbP1fPkZijzIwPL6nLCFfs8uxasFh+J4ByNUTSfS8zGeE1zGq3F5qw== X-Received: by 2002:aca:2817:0:b0:398:45bf:6e65 with SMTP id 23-20020aca2817000000b0039845bf6e65mr5884378oix.9.1686152456840; Wed, 07 Jun 2023 08:40:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/5] tcg/tci: Adjust passing of MemOpIdx Date: Wed, 7 Jun 2023 08:40:50 -0700 Message-Id: <20230607154054.625513-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686152513428100003 Content-Type: text/plain; charset="utf-8" Since adding MO_ATOM_MASK, the maximum MemOpIdx requires 15 bits, which overflows the 12 bit field allocated for TCI memory ops. Expand the field to 16 bits for 2-operand memory ops, and place the value in TCG_REG_TMP for 3-operand memory ops (same as we already do for 4-operand memory ops). Cures a debug assert for aarch64, with FEAT_LSE2 enabled. Signed-off-by: Richard Henderson --- tcg/tci.c | 30 +++++++++++++----------------- tcg/tci/tcg-target.c.inc | 21 ++++----------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index 813572ff39..4640902c88 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -106,7 +106,7 @@ static void tci_args_rrm(uint32_t insn, TCGReg *r0, { *r0 =3D extract32(insn, 8, 4); *r1 =3D extract32(insn, 12, 4); - *m2 =3D extract32(insn, 20, 12); + *m2 =3D extract32(insn, 16, 16); } =20 static void tci_args_rrr(uint32_t insn, TCGReg *r0, TCGReg *r1, TCGReg *r2) @@ -141,15 +141,6 @@ static void tci_args_rrrc(uint32_t insn, *c3 =3D extract32(insn, 20, 4); } =20 -static void tci_args_rrrm(uint32_t insn, - TCGReg *r0, TCGReg *r1, TCGReg *r2, MemOpIdx *m3) -{ - *r0 =3D extract32(insn, 8, 4); - *r1 =3D extract32(insn, 12, 4); - *r2 =3D extract32(insn, 16, 4); - *m3 =3D extract32(insn, 20, 12); -} - static void tci_args_rrrbb(uint32_t insn, TCGReg *r0, TCGReg *r1, TCGReg *r2, uint8_t *i3, uint8_t *i4) { @@ -929,8 +920,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchStat= e *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr =3D regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr =3D tci_uint64(regs[r2], regs[r1]); + oi =3D regs[r3]; } do_ld_i32: regs[r0] =3D tci_qemu_ld(env, taddr, oi, tb_ptr); @@ -941,8 +933,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchStat= e *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr =3D (uint32_t)regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr =3D (uint32_t)regs[r2]; + oi =3D regs[r3]; } goto do_ld_i64; case INDEX_op_qemu_ld_a64_i64: @@ -972,8 +965,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchStat= e *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr =3D regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr =3D tci_uint64(regs[r2], regs[r1]); + oi =3D regs[r3]; } do_st_i32: tci_qemu_st(env, taddr, regs[r0], oi, tb_ptr); @@ -985,9 +979,10 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchSta= te *env, tmp64 =3D regs[r0]; taddr =3D (uint32_t)regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); tmp64 =3D tci_uint64(regs[r1], regs[r0]); taddr =3D (uint32_t)regs[r2]; + oi =3D regs[r3]; } goto do_st_i64; case INDEX_op_qemu_st_a64_i64: @@ -1293,9 +1288,10 @@ int print_insn_tci(bfd_vma addr, disassemble_info *i= nfo) op_name, str_r(r0), str_r(r1), oi); break; case 3: - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); - info->fprintf_func(info->stream, "%-12s %s, %s, %s, %x", - op_name, str_r(r0), str_r(r1), str_r(r2), o= i); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); + info->fprintf_func(info->stream, "%-12s %s, %s, %s, %s", + op_name, str_r(r0), str_r(r1), + str_r(r2), str_r(r3)); break; case 4: tci_args_rrrrr(insn, &r0, &r1, &r2, &r3, &r4); diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index c9516a5e8b..5b456e1277 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -331,11 +331,11 @@ static void tcg_out_op_rrm(TCGContext *s, TCGOpcode o= p, { tcg_insn_unit insn =3D 0; =20 - tcg_debug_assert(m2 =3D=3D extract32(m2, 0, 12)); + tcg_debug_assert(m2 =3D=3D extract32(m2, 0, 16)); insn =3D deposit32(insn, 0, 8, op); insn =3D deposit32(insn, 8, 4, r0); insn =3D deposit32(insn, 12, 4, r1); - insn =3D deposit32(insn, 20, 12, m2); + insn =3D deposit32(insn, 16, 16, m2); tcg_out32(s, insn); } =20 @@ -392,20 +392,6 @@ static void tcg_out_op_rrrc(TCGContext *s, TCGOpcode o= p, tcg_out32(s, insn); } =20 -static void tcg_out_op_rrrm(TCGContext *s, TCGOpcode op, - TCGReg r0, TCGReg r1, TCGReg r2, TCGArg m3) -{ - tcg_insn_unit insn =3D 0; - - tcg_debug_assert(m3 =3D=3D extract32(m3, 0, 12)); - insn =3D deposit32(insn, 0, 8, op); - insn =3D deposit32(insn, 8, 4, r0); - insn =3D deposit32(insn, 12, 4, r1); - insn =3D deposit32(insn, 16, 4, r2); - insn =3D deposit32(insn, 20, 12, m3); - tcg_out32(s, insn); -} - static void tcg_out_op_rrrbb(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1, TCGReg r2, uint8_t b3, uint8_t b4) { @@ -860,7 +846,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, if (TCG_TARGET_REG_BITS =3D=3D 64) { tcg_out_op_rrm(s, opc, args[0], args[1], args[2]); } else { - tcg_out_op_rrrm(s, opc, args[0], args[1], args[2], args[3]); + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_TMP, args[4]); + tcg_out_op_rrrr(s, opc, args[0], args[1], args[2], TCG_REG_TMP= ); } break; case INDEX_op_qemu_ld_a64_i64: --=20 2.34.1 From nobody Sat May 18 06:04:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686152496; cv=none; d=zohomail.com; s=zohoarc; b=U6kidvE9awOpMLSa6QvTHwMqFDRs8wRJNJo0qS0VYW4Y1GB/pf+/sT4Jqq8veKT3ArrEgREuggK2l23217X5bM0VouQQl+2oEnWO47GtBO3DHoau589eWSwEsjmPdFCMVaf2M08jriG+Tbkuf5QXlb0Sw4FZZfZ9LxCe0QbVK7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686152496; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SjOlV3XXmAHIFsGaSRKptyRzWhnKbHdg3ZoAqbceQ4A=; b=bPUFE20C5YJiBKYFj+MPyAvr1puc7w4seLVWwBKxx9ll6xs15y6CyGyr9poi6GEReVTNq6I4J3ElFHl7cB29pZfWPH/WfDiTbLr0p2gtR1yiuROrh36CFN3zK7vyIb0zfVOietkar+XlDxISrgqaIjwTr1Zjyew5Evs/e9kUk3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686152496599155.60294800165468; Wed, 7 Jun 2023 08:41:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHS-0001WX-NR; Wed, 07 Jun 2023 11:41:02 -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 1q6vHR-0001WC-8O for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:01 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHP-0001zW-M1 for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:00 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5440e98616cso550325a12.0 for ; Wed, 07 Jun 2023 08:40:59 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152458; x=1688744458; 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=SjOlV3XXmAHIFsGaSRKptyRzWhnKbHdg3ZoAqbceQ4A=; b=igJsmhPMZ7nqLTWyTxvsD9/80rlkAdoAu2TpQC4pXtkKptj74VrAUAyLJugUBpKeE7 2Pn0+NNkG7Extnge1+rjcYE8Rku/W51610XtenT5cSYYsEpI0l2ETsgNlPdGArU4lo8X eqwALC0DyHgRadv5agv2C3yrka2HSKyuscWRZTods5bfXIAlV9ubvuNoxdfGkHH+6jKr W5x8hrtHtIvLFRrae+uY/Tg9QoD9659hKGGXXnFfJDMtSMslIXYXiLGMoGg6aJFVAql2 +jFJ9WVUJW8DsPJ6OEv8Ev4K6gyHQH6rbr1E3+mTrHC7jzFFCScypZ7s0PJwFcB1QRp/ WN9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152458; x=1688744458; 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=SjOlV3XXmAHIFsGaSRKptyRzWhnKbHdg3ZoAqbceQ4A=; b=UowHhnoqoGhOOcCqdau4HAZmhsUiVhx1Z5ThCkgCw65ymtMD125ddqBO1+tZZCYYVP QJp7DFmn2wnKv1Uic75N0pR03csKsYJXxVabilRH7GCs7YP4mu3FPJnxHo1iEt0MqyAM wJ9bHdzQs/rAmBz4VMOhxoJv0wUbXqwIilV/ryxy4sn7w16saAirXBz/riDFQamJjTvK 89f1IVG+CyA661Wbzn+ftRulJ4mf/oEMdJv4Vw4VGk5ekA8Fp6Xl5kZjv/G8a073tgS2 6BAJ8Isny9WAJYL+XsBGm6/onbaxns5J+0u0LSjYzAv5k57C1Mue3zu2ajVK+5W4LvBX mc+A== X-Gm-Message-State: AC+VfDz9EZ7qcAcbjF55y8049x7X53V3P8faSR14GiRfaUgR43PSp9jm jpjKVexTigKrEH00DeXKvs9UgZV5M97eEWJb5uk= X-Google-Smtp-Source: ACHHUZ52cqxkd+1URXa8xmQ9Z8+dT1NdXhmuT8XbGYaj37E0E5tjDjW3pQL3n0rZ4JwYaspvV1qahA== X-Received: by 2002:a17:90a:348f:b0:259:ba4a:134d with SMTP id p15-20020a17090a348f00b00259ba4a134dmr3705416pjb.20.1686152457679; Wed, 07 Jun 2023 08:40:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/5] tcg/tci: Adjust call-clobbered regs for int128_t Date: Wed, 7 Jun 2023 08:40:51 -0700 Message-Id: <20230607154054.625513-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x534.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686152512434100001 We require either 2 or 4 registers to hold int128_t. Failure to do so results in a register allocation assert. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/tci/tcg-target.c.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 5b456e1277..0037f904f1 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -179,8 +179,6 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcod= e op) } =20 static const int tcg_target_reg_alloc_order[] =3D { - TCG_REG_R2, - TCG_REG_R3, TCG_REG_R4, TCG_REG_R5, TCG_REG_R6, @@ -193,6 +191,9 @@ static const int tcg_target_reg_alloc_order[] =3D { TCG_REG_R13, TCG_REG_R14, TCG_REG_R15, + /* Either 2 or 4 of these are call clobbered, so use them last. */ + TCG_REG_R3, + TCG_REG_R2, TCG_REG_R1, TCG_REG_R0, }; @@ -934,11 +935,11 @@ static void tcg_target_init(TCGContext *s) /* * The interpreter "registers" are in the local stack frame and * cannot be clobbered by the called helper functions. However, - * the interpreter assumes a 64-bit return value and assigns to + * the interpreter assumes a 128-bit return value and assigns to * the return value registers. */ tcg_target_call_clobber_regs =3D - MAKE_64BIT_MASK(TCG_REG_R0, 64 / TCG_TARGET_REG_BITS); + MAKE_64BIT_MASK(TCG_REG_R0, 128 / TCG_TARGET_REG_BITS); =20 s->reserved_regs =3D 0; tcg_regset_set_reg(s->reserved_regs, TCG_REG_TMP); --=20 2.34.1 From nobody Sat May 18 06:04:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686152495; cv=none; d=zohomail.com; s=zohoarc; b=fY+XspuPnGCqANFnts6BG/vIJ+3P7Gl5Hn63o5a4EcBedihluIm/XZVSL1zUnh5TrR9mV7f9yMCXCx90HZJUgiOsuLexv4+xlIN3KFEghRr6BVHpfUK3fjtvF2SnFHFI93oWB8JB2ovrsY/aM9zMjdwlRjdERXhhX8V1N9HhWYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686152495; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=gzHXkCw5Fx5G9l4hp3HQ+hjveaIYnlQw7TzIYuer24B1ZnmwZf0VafGtxlsyzb6tpQGKRthEZOifUbZzEgtBIu3RTHXX960sSz5Z6E7v1Hs6F6pydBXEzil8Jns7VwNw4e8YSlG2Z3D2+cOmx5WPtVHd8jTViUOR9L9fwbW4VqA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686152495382802.6308704219372; Wed, 7 Jun 2023 08:41:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHS-0001Wd-Rx; Wed, 07 Jun 2023 11:41:02 -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 1q6vHR-0001WI-E2 for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:01 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHP-0001zb-Rg for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:01 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2564dc37c3eso585050a91.0 for ; Wed, 07 Jun 2023 08:40:59 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152458; x=1688744458; 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=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=oxhAaeg+UEn9MZztaWoV1zcFpw0aA2ISAps6Ue/xze2ELtIDXNTE2ZpyuJiKNjtK2Z sYdFGI6TIM0Yl3+fIgdtcXleEvsf7UqmwlZtbIEwErB5xz5Mtb/mycjjeg3H+s+f0hYi PZW3w7ymTYZrI5QLPIw/fzWd8R6FIh6zs0c2aIRUUweMNSwcMjMJNUCzZqucpFR7CLMc WcXvA9derWcNDEM/GI/mcmrlQP8is6ImelQfN3L8KbHI2I8UFaaKPQdfKOuzWXfn3/GW cg/XdcHfbdvfE8woatZv5sFZtWUOTl96lut0eKUFdsQ86haiPBVaqDzBZ50UJs8xz8ef pp3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152458; x=1688744458; 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=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=RCW11BFUcXaShV0Dd00vXH1kgtUyzSz6xtgKmh7VXtoUMMRtFTL9WkhmEt5LDbSuYX UOGatS02KrqVEn/0e/3KxFfjRsphN9VZPnBJAShxL2+tAUB6gho+ksgZ3VNEzSEE/GcK 6tG3qhRAjDCfeN4raEKPxrkOCGYtpR4ZtYy1W9AxXyQGyCEoOyQX9J8DclcCA7vRe1yE Qh6c91aznjKMjkmcGgDcGik+PvOhhfUN2Pxl1Ywet/svLBydzWCwEpxDoh8+qcL1uNN4 9qEkI3FZTDHa91WRfEknWk1+cfTxRrXhWogU3Mv/xvVGONI/Ir1Es8pcpvFb079R9XJr Hlog== X-Gm-Message-State: AC+VfDzRv8n+3hT5LnQU+ehkoFS8zmOtdEmtukCdTMLHqVHf0O9v0/Lo 0Lc85glvWgUJY/KLcNlXz21DU79CHYsvVOylSC4= X-Google-Smtp-Source: ACHHUZ4xebvCBFDP5UrdXJ0jNCfGUQEui1hLM6AbU6PFgo1p8W5mvfQT9K1TctRvULieQfo3KKAuww== X-Received: by 2002:a17:90b:8d7:b0:256:7866:8c06 with SMTP id ds23-20020a17090b08d700b0025678668c06mr16806499pjb.19.1686152458540; Wed, 07 Jun 2023 08:40:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 3/5] target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG Date: Wed, 7 Jun 2023 08:40:52 -0700 Message-Id: <20230607154054.625513-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686152508014100002 Fixes the build for --disable-tcg. This header is only needed for cross-hosting. Without CONFIG_TCG, we know this is an AArch64 host, CONFIG_ATOMIC64 will be set, and the TCG_OVERSIZED_GUEST block will never be compiled. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- target/arm/ptw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index b2dc223525..37bcb17a9e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,8 +14,9 @@ #include "cpu.h" #include "internals.h" #include "idau.h" -#include "tcg/oversized-guest.h" - +#ifdef CONFIG_TCG +# include "tcg/oversized-guest.h" +#endif =20 typedef struct S1Translate { ARMMMUIdx in_mmu_idx; --=20 2.34.1 From nobody Sat May 18 06:04:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686152521; cv=none; d=zohomail.com; s=zohoarc; b=b8iotkVGSRz5FMaXsTC8Gxl8FAf7W5dWYz8VZPnIWTl5e7+1SacSW3ZPvQSXfas6SBQqosx7R+OJR/eoEJ2iQfO6hQ/6UoUM/Uw3S4BHk/yxVg+yXqRDmUV4T/+5qG3OvAiuKguJCq1mOSP3B0m6VZlCVunbQygvsUvkcDc7vCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686152521; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pa4S7jJz81Gz70anasGmPBYA2dZgq4FTivtkn/UEopk=; b=nTj0y9IXHC4sB18dxgfUaalWD/pJZX/YQUoni3sScuORbm4I8vcR5qNhTPnheRIeCYFjDGtQNEuCwcFDku0Eo5jv/3d+lQ83KQF+LNKJdLV2HSBdQcfD6mqPi1BtBJZIyPZMrW3LAIi9tvPv2BOgNeU/96GBaujfBgcCmZuXNz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168615252111184.645290320821; Wed, 7 Jun 2023 08:42:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHT-0001XI-JO; Wed, 07 Jun 2023 11:41:03 -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 1q6vHS-0001WV-Ij for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:02 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHQ-0001zs-KK for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:02 -0400 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-33c1e7743b7so6235975ab.1 for ; Wed, 07 Jun 2023 08:41:00 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152459; x=1688744459; 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=Pa4S7jJz81Gz70anasGmPBYA2dZgq4FTivtkn/UEopk=; b=K3l/sVSEE2eRD4Jh88uqNsnFv9e0nHalEdMLrQLngLu630mYMimv1dytMb1mZHg6mD SQyjznxcl9DSC3DN4AJqG+0zpW/mMcOrRQuyrcN5yFNF1GAWTrJpvPxFtIIMsYU+v8CX ndqsP/1RwkIuBKkWh7iBF1gJCX/6aT1FzSZW2P2BI8OXJyqCtecpDG4FVWFQ/L0PeP4x rBsmEcjXEsB5MHNMHzdFuaqmdnD9RaZ6k0NCoXZFy0cOY1Mi1onymGparpYjk2z1JRxj SPbc+8x5LCzQ5Gm8hnEJ2CpHxexRivBrcOh9kYSerbWh+EkE6w0T+R5xWcb3KmjQgqsY SYGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152459; x=1688744459; 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=Pa4S7jJz81Gz70anasGmPBYA2dZgq4FTivtkn/UEopk=; b=Vo3mNAnkGvAqGOaP67K6rhkSeL1kmeOTWCH2J38kuxP7019enhUukqieXO7HHDK8lF gLPcuDNrgo7H3g8pCnIQHeZzMp9Z+iP4cP0LLBDAKeOB+GnznwUOeWFDTjtzwLfZjB62 R1yL8KWIoP2lTh+Kp9JsdmuiITOyHl5z9GUdzMpqzdiQ4YEamEP8uX3CrvHBNUa9BFuv fQoD9rlf2VZdzdyfdm09QQRmqCup1KSEtQ1TofGwz1vT+STkWgWmDj+6X1DqtxmWRzcw sGvp6z+GRZRYB9pvrOWyRgZe6XP7k0T7oLdr1BF1xlMDzPqU8squPdpnBdAXmrK1a335 LWww== X-Gm-Message-State: AC+VfDx4qqzUMm/kqvNe/a1kDgrUQ6l7YyFZz0LJWvhRUcGHILT8oZjO 1s3+7zE2RrfN9X8n9vLorfHLooglb3xUBHBZwqI= X-Google-Smtp-Source: ACHHUZ6l/ZtwDzrUinSczSMlsxvhYLTvud1eHRUgkaAd30+cilp0x7MYx9FjCAWwEZryHh2gNdVolw== X-Received: by 2002:a92:4a02:0:b0:33b:6cc0:ee6b with SMTP id m2-20020a924a02000000b0033b6cc0ee6bmr8464011ilf.13.1686152459512; Wed, 07 Jun 2023 08:40:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 4/5] gitlab: Add cross-arm64-kvm-only Date: Wed, 7 Jun 2023 08:40:53 -0700 Message-Id: <20230607154054.625513-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::12e; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x12e.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686152521647100001 We are not currently running a --disable-tcg test for arm64, like we are for mips, ppc and s390x. We have a job for the native aarch64 runner, but it is not run by default and it is not helpful for normal developer testing without access to qemu's private runner. Use --without-default-features to eliminate most tests. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Richard Henderson --- .gitlab-ci.d/crossbuilds.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 61b8ac86ee..1e0e6c7f2c 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -29,6 +29,14 @@ cross-arm64-user: variables: IMAGE: debian-arm64-cross =20 +cross-arm64-kvm-only: + extends: .cross_accel_build_job + needs: + job: arm64-debian-cross-container + variables: + IMAGE: debian-arm64-cross + EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features + cross-i386-user: extends: - .cross_user_build_job --=20 2.34.1 From nobody Sat May 18 06:04:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1686152522; cv=none; d=zohomail.com; s=zohoarc; b=TDkOIK5DBtHu4uYg9QqevMQXCb2j1Mcsg3RhUHdrhGHkmtUUuAcTBzwJ7zyvTBNuz/eL2nwVcnRLWCOJ6iBXcjRnbl4xr46Sx3uvsn3Mg6WGOSAokXMj7WIM5xn74bzoQfSc3C07B8nql49eYBPvZZ01YClA0j2E0DzmRiEaBeY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686152522; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jkV4dgiuSw7Bz1OcKScp/tlysTyCyTSWhxkylwg7EAE=; b=LggWH9NOKmIfEFRp1zAPglltUtFQglDIxrk2VYZrUni2IBnjGxhAVvAxwm9loZSgMU88nZkmzULtVEWsdjYGiQMA1dk9rjTHKPpMibAoa8VYoTO5e7oRHd7SHGHhRQmp1onQR1NkqWdxyM9m1f9qJaNkBtyUheS8MNerMYLUIH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686152522575116.76069790902511; Wed, 7 Jun 2023 08:42:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHV-0001Xo-7N; Wed, 07 Jun 2023 11:41:05 -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 1q6vHT-0001XE-Al for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:03 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHR-0001zz-Mi for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:03 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2566ed9328eso6361706a91.2 for ; Wed, 07 Jun 2023 08:41:01 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152460; x=1688744460; 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=jkV4dgiuSw7Bz1OcKScp/tlysTyCyTSWhxkylwg7EAE=; b=W1WPiae3dzEICmVdrbZpLmtmPK8BKLnhC0h2RuPjdLi5DX7dJk/TkJjfpAT7RjYTri dECNTI2zo/JnUQouuwPdnJ7J1HJaBP8t7M8fQlDWgDk4qf1GLJJa3sWy3/xRABwTeXvo Dfpwtwe/YhBIaLd6tUZV2bESfXKqU+MHpSRwav4S/K/Zi6Mj6uxxDVHdmqq0bZy99uPv qUznZaAePGtnGgZ3n9mqoqT9cYIBsh1asl0939wqdlVTWyqUFO5dk2SARfbpRhYjCldO qrIySY8FK43bAWDY3/f3Xao9cHWk+CUF49jUpAcopE+WM32A/VdCkPcwss9GJDQml8Kd 46rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152460; x=1688744460; 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=jkV4dgiuSw7Bz1OcKScp/tlysTyCyTSWhxkylwg7EAE=; b=FxeAjjrFh2uIBD7jWtyLgYBFEcdE4xNSacUhFCOMcqC0shS1JLNLfNoPNGFj7p8sV3 dZQ/s+Xjn/fYRHFb8Oip0LuiGNDH92evuiZkMhhGE2RGsIdirjIpZNZF8jdu+mNMSt6O 4wTLKmtkkvOxj9KRWXHes8z9cEBD3+W0PRkzohVxgmk1jRxQOUATCSTy5HmUKoJyeD+E HPEm2S5i3WHv5ZdUqc+Mrk2QXrGALyxj/3Qomlm/mqUKI9pQ2zgRmxulPV6ObrkRPEev fxpnw/DldFrCtWOu7iSJ6e6YJVnnKOvn6yw7n3yFrTTEN3KzuLx1xuMfSpKkDdyiwHgv xz3w== X-Gm-Message-State: AC+VfDw0Us8Nv0n/gdp+oZwAIiujXatEUxSng20tsW9q4yTD718UcZhy 73/s/yHsOosjO5mLtQLhm1o4vbjnwK6l4K20lSk= X-Google-Smtp-Source: ACHHUZ5bKahx7rVqqCOMqJL92N9QnwUzubiawLnWsR8tk2iafxoJInqCJ1krp4r1Jpj/WVf4gqdMGQ== X-Received: by 2002:a17:90b:1916:b0:256:c3dc:dae6 with SMTP id mp22-20020a17090b191600b00256c3dcdae6mr5327724pjb.31.1686152460239; Wed, 07 Jun 2023 08:41:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy Subject: [PULL 5/5] iotests: fix 194: filter out racy postcopy-active event Date: Wed, 7 Jun 2023 08:40:54 -0700 Message-Id: <20230607154054.625513-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1686152523226100005 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy The event is racy: it will not appear in the output if bitmap is migrated during downtime period of migration and postcopy phase is not started. Fixes: ae00aa239847 "iotests: 194: test also migration of dirty bitmap" Reported-by: Richard Henderson Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20230607143606.1557395-1-vsementsov@yandex-team.ru> Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson --- tests/qemu-iotests/194 | 5 +++++ tests/qemu-iotests/194.out | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 68894371f5..c0ce82dd25 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -74,6 +74,11 @@ with iotests.FilePath('source.img') as source_img_path, \ =20 while True: event1 =3D source_vm.event_wait('MIGRATION') + if event1['data']['status'] =3D=3D 'postcopy-active': + # This event is racy, it depends do we really do postcopy or b= itmap + # was migrated during downtime (and no data to migrate in post= copy + # phase). So, don't log it. + continue iotests.log(event1, filters=3D[iotests.filter_qmp_event]) if event1['data']['status'] in ('completed', 'failed'): iotests.log('Gracefully ending the `drive-mirror` job on sourc= e...') diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out index 4e6df1565a..376ed1d2e6 100644 --- a/tests/qemu-iotests/194.out +++ b/tests/qemu-iotests/194.out @@ -14,7 +14,6 @@ Starting migration... {"return": {}} {"data": {"status": "setup"}, "event": "MIGRATION", "timestamp": {"microse= conds": "USECS", "seconds": "SECS"}} {"data": {"status": "active"}, "event": "MIGRATION", "timestamp": {"micros= econds": "USECS", "seconds": "SECS"}} -{"data": {"status": "postcopy-active"}, "event": "MIGRATION", "timestamp":= {"microseconds": "USECS", "seconds": "SECS"}} {"data": {"status": "completed"}, "event": "MIGRATION", "timestamp": {"mic= roseconds": "USECS", "seconds": "SECS"}} Gracefully ending the `drive-mirror` job on source... {"return": {}} --=20 2.34.1