From patchwork Mon Nov 20 15:08:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 745365 Delivered-To: patch@linaro.org Received: by 2002:a5d:5052:0:b0:32d:baff:b0ca with SMTP id h18csp1344871wrt; Mon, 20 Nov 2023 07:11:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IGEmay4ufedjVL8J+d+GgbaPAQXl1zQpqG+UvWCbAIQTtdVq+VT1dCKRmZ78hHlkj5F2HRa X-Received: by 2002:a05:600c:3c92:b0:401:2ee0:7558 with SMTP id bg18-20020a05600c3c9200b004012ee07558mr6154401wmb.32.1700493062877; Mon, 20 Nov 2023 07:11:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493062; cv=none; d=google.com; s=arc-20160816; b=J4m1UQlnXVd5mYlkheOARlnbN7C1Z1IS/yCCwuZpwnkc4aiiTBkvn9YpNPsAK5OosB ritB1kBVWY05RU14md45SLGPimrFQVk3+vGevoiD9o990gTISBwkvdL7lRQQZ1b05oOo O9SrxS3VpqStWQpazHYv1ZD9B0Pt17CZLh/BkIr32uqlBzYrV/avBD8KZdcR/10GOu+R Vs/PxVGjA4Hy2pGYoGfzZxqa3j3VtDJmyLV6wfCdb8ASnGm/z9N3lINYUtLBZojVvCNP /mfs7dXDmky5NasmvSps20Mij6SROkgAMRCme0MsaXFf3SBghRwFmImlZS6kuXN3wOOq WEBQ== 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=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; fh=vuMr5Iq/iMnTlXliAuVMjPSqmXpFYJrVmR7aRVaPSRM=; b=iQwAanCYVay+MX2bnl4R3rtgz4USp40WC6V1Wx2/R/BXEinlTVKNAmawwL5dCQGMx7 9HaZMzT6lpkZHlYcu5ZwxOkdpCvhpx2caK3SorOjVGMrzMv+zOSQpOpiMdi3Sg1Gf/iX GiuvFm0mdGmTIN11+567cyaG6Oiv70Vx6+Mk3kk6VDQUJ1yFmU89aQqMkJbIkTv7Spaf HSwtMc825ZIHQRvREKChRS1oGQGkv/BVulN5vxKudKtaDYjDyZn1qKm+c1q+tPP8BKPx sD/yfwhNJU21F1StwHuOB0xLEVOakdslrmtO51c/CBW9QKFhSbRKD7ymMqWjkOjIcm5m M0eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s90ZyPdy; 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 d10-20020adfe88a000000b003316b5d2398si4674509wrm.1034.2023.11.20.07.11.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Nov 2023 07:11:02 -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=s90ZyPdy; 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 1r55ty-0006gD-8P; Mon, 20 Nov 2023 10:09:30 -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 1r55tU-0005v8-8r for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:09:01 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r55tG-0001J4-FF for qemu-devel@nongnu.org; Mon, 20 Nov 2023 10:08:59 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-408382da7f0so18221305e9.0 for ; Mon, 20 Nov 2023 07:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700492924; x=1701097724; darn=nongnu.org; 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=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; b=s90ZyPdy82Yrqg579JYbDvzGJF3c7EglpDX0o35QKX76cq5VqKFUEJDSgjL6vGNafe kx06A0He0O65aLvpQxF3ZhBg8MLslq7Oy5fF/IOESm0QiIB9oXtb3CZKD+DgT3i0N13V qkTlv24sMVSfgWtO7Yh7bzos63KUOKjEWig+g9MbwP904/OLuh0iuYOBDe4AO8la5cN5 fIdAXIhbJZKAU+9ECk1/6eVgTWNfyy6zi8yTGU7tqln87LeyRXuRI6x90tTv4s4lbQfC wrWQSEUZK1vTkc484vrtWiO3j/hCGCqsSQaaueonG0mel7U1Kyk+YoKKco4cVjFOWhDx qfEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700492924; x=1701097724; 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=L8kjzVNoA7e3cvqH6712uj0UfEN18Da8qVe7RzxNxzg=; b=R9q+jnSm6jOmLDXlqKPvgLhpODWmjIJecL9lSuj3OdIetKNHA+gZqTzNgy8nsPzoCD k8r7EmUDjEygLVLVMGGfdKKCbOdsYnTJ800zzloy1DebuWN2fqD18x9cITN/0YNQtJEp MKXOlnUHuSfWL7j6uiUT8X9Nz8Bdyi5t9HIHhZ5bVVRZYOuBp9Dh9fq+QIk+z8ph4pcF fETFNDcjP/wIdMyfjE3aR44P/HSEpsmlcDPvIJ9/08FoReH1gKasJA7bG23lcz06mMFY sVJi1izjEWmkVTBI31l9sK9rRVFoppStq2Qf8Sxv8pm9am+yQuv9/LopYRH/XeabVOeB Pe0Q== X-Gm-Message-State: AOJu0Yyjw68sJT0nqRaCg/yzZ/VLwKNKj+YJF93W9+WzlzhvoRJg4EgA kJ3Uhay1853X3BNO9MvLMKVfrQ== X-Received: by 2002:a05:600c:3108:b0:409:7aa9:a903 with SMTP id g8-20020a05600c310800b004097aa9a903mr6252825wmo.19.1700492924535; Mon, 20 Nov 2023 07:08:44 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c190700b004064cd71aa8sm13821581wmq.34.2023.11.20.07.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:08:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 456B16577B; Mon, 20 Nov 2023 15:08:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?C=C3=A9dric?= =?utf-8?q?_Le_Goater?= , Mahmoud Mandour , Peter Maydell , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-s390x@nongnu.org, Beraldo Leal , qemu-arm@nongnu.org, devel@lists.libvirt.org, qemu-ppc@nongnu.org, Daniel Henrique Barboza , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexandre Iooss , Marek Vasut , Thomas Huth , Chris Wulff , Ilya Leoshkevich , Richard Henderson , Nicholas Piggin , Luis Machado Subject: [PATCH v2 14/14] tests/tcg: finesse the registers check for "hidden" regs Date: Mon, 20 Nov 2023 15:08:33 +0000 Message-Id: <20231120150833.2552739-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120150833.2552739-1-alex.bennee@linaro.org> References: <20231120150833.2552739-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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 The reason the ppc64 and s390x test where failing was because gdb hides them although they are still accessible via regnum. We can re-arrange the test a little bit and include these two arches in our test. We still don't explicitly fail for registers that just disappear like in the ARM case: xml-tdesc has 228 registers remote-registers has 219 registers of which 0 are hidden {'name': 'CNTP_CVAL', 'regnum': 96} wasn't seen in remote-registers {'name': 'CNTV_CVAL', 'regnum': 101} wasn't seen in remote-registers {'name': 'PAR', 'regnum': 113} wasn't seen in remote-registers {'name': 'CPUACTLR', 'regnum': 114} wasn't seen in remote-registers {'name': 'CPUECTLR', 'regnum': 127} wasn't seen in remote-registers {'name': 'CPUMERRSR', 'regnum': 140} wasn't seen in remote-registers {'name': 'TTBR1', 'regnum': 148} wasn't seen in remote-registers {'name': 'L2MERRSR', 'regnum': 161} wasn't seen in remote-registers {'name': 'TTBR0', 'regnum': 168} wasn't seen in remote-registers Signed-off-by: Alex Bennée Cc: Ilya Leoshkevich Cc: qemu-s390x@nongnu.org Cc: Nicholas Piggin Cc: Daniel Henrique Barboza Cc: qemu-ppc@nongnu.org Cc: Luis Machado --- v2 - skip if check for total_regs != total_r_regs and always dump what is elided/missed --- tests/tcg/multiarch/gdbstub/registers.py | 87 +++++++++++++++++------- tests/tcg/ppc64/Makefile.target | 7 -- tests/tcg/s390x/Makefile.target | 4 -- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/tests/tcg/multiarch/gdbstub/registers.py b/tests/tcg/multiarch/gdbstub/registers.py index ff6076b09e..8ba14099b5 100644 --- a/tests/tcg/multiarch/gdbstub/registers.py +++ b/tests/tcg/multiarch/gdbstub/registers.py @@ -44,7 +44,6 @@ def fetch_xml_regmap(): total_regs = 0 reg_map = {} - frame = gdb.selected_frame() tree = ET.fromstring(xml) for f in tree.findall("feature"): @@ -61,12 +60,8 @@ def fetch_xml_regmap(): for r in regs: name = r.attrib["name"] regnum = int(r.attrib["regnum"]) - try: - value = frame.read_register(name) - except ValueError: - report(False, f"failed to read reg: {name}") - entry = { "name": name, "initial": value, "regnum": regnum } + entry = { "name": name, "regnum": regnum } if name in reg_map: report(False, f"duplicate register {entry} vs {reg_map[name]}") @@ -80,6 +75,15 @@ def fetch_xml_regmap(): return reg_map +def get_register_by_regnum(reg_map, regnum): + """ + Helper to find a register from the map via its XML regnum + """ + for regname, entry in reg_map.items(): + if entry['regnum'] == regnum: + return entry + return None + def crosscheck_remote_xml(reg_map): """ Cross-check the list of remote-registers with the XML info. @@ -90,6 +94,7 @@ def crosscheck_remote_xml(reg_map): total_regs = len(reg_map.keys()) total_r_regs = 0 + total_r_elided_regs = 0 for r in r_regs: fields = r.split() @@ -100,6 +105,15 @@ def crosscheck_remote_xml(reg_map): r_name = fields[0] r_regnum = int(fields[6]) + # Some registers are "hidden" so don't have a name + # although they still should have a register number + if r_name == "''": + total_r_elided_regs += 1 + x_reg = get_register_by_regnum(reg_map, r_regnum) + if x_reg is not None: + x_reg["hidden"] = True + continue + # check in the XML try: x_reg = reg_map[r_name] @@ -117,14 +131,39 @@ def crosscheck_remote_xml(reg_map): # Just print a mismatch in totals as gdb will filter out 64 bit # registers on a 32 bit machine. Also print what is missing to # help with debug. - if total_regs != total_r_regs: - print(f"xml-tdesc has ({total_regs}) registers") - print(f"remote-registers has ({total_r_regs}) registers") + print(f"xml-tdesc has {total_regs} registers") + print(f"remote-registers has {total_r_regs} registers") + print(f"of which {total_r_elided_regs} are hidden") + + for x_key in reg_map.keys(): + x_reg = reg_map[x_key] + if "hidden" in x_reg: + print(f"{x_reg} elided by gdb") + elif "seen" not in x_reg: + print(f"{x_reg} wasn't seen in remote-registers") + +def initial_register_read(reg_map): + """ + Do an initial read of all registers that we know gdb cares about + (so ignore the elided ones). + """ + frame = gdb.selected_frame() + + for e in reg_map.values(): + name = e["name"] + regnum = e["regnum"] + + try: + if "hidden" in e: + value = frame.read_register(regnum) + e["initial"] = value + elif "seen" in e: + value = frame.read_register(name) + e["initial"] = value + + except ValueError: + report(False, f"failed to read reg: {name}") - for x_key in reg_map.keys(): - x_reg = reg_map[x_key] - if "seen" not in x_reg: - print(f"{x_reg} wasn't seen in remote-registers") def complete_and_diff(reg_map): """ @@ -144,18 +183,19 @@ def complete_and_diff(reg_map): changed = 0 for e in reg_map.values(): - name = e["name"] - old_val = e["initial"] + if "initial" in e and "hidden" not in e: + name = e["name"] + old_val = e["initial"] - try: - new_val = frame.read_register(name) - except: - report(False, f"failed to read {name} at end of run") - continue + try: + new_val = frame.read_register(name) + except ValueError: + report(False, f"failed to read {name} at end of run") + continue - if new_val != old_val: - print(f"{name} changes from {old_val} to {new_val}") - changed += 1 + if new_val != old_val: + print(f"{name} changes from {old_val} to {new_val}") + changed += 1 # as long as something changed we can be confident its working report(changed > 0, f"{changed} registers were changed") @@ -168,6 +208,7 @@ def run_test(): if reg_map is not None: crosscheck_remote_xml(reg_map) + initial_register_read(reg_map) complete_and_diff(reg_map) diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 1d08076756..5721c159f2 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -38,11 +38,4 @@ PPC64_TESTS += signal_save_restore_xer PPC64_TESTS += xxspltw PPC64_TESTS += test-aes -ifneq ($(GDB),) -# Skip for now until vsx registers sorted out -run-gdbstub-registers: - $(call skip-test, $<, "BROKEN reading VSX registers") -endif - - TESTS += $(PPC64_TESTS) diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 46544fecd4..0e670f3f8b 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -103,10 +103,6 @@ run-gdbstub-svc: hello-s390x-asm --bin $< --test $(S390X_SRC)/gdbstub/test-svc.py, \ single-stepping svc) -# Skip for now until vx registers sorted out -run-gdbstub-registers: - $(call skip-test, $<, "BROKEN reading VX registers") - EXTRA_RUNS += run-gdbstub-signals-s390x run-gdbstub-svc endif