From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: "Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-arm@nongnu.org, "Bin Meng" <bmeng.cn@gmail.com>,
qemu-riscv@nongnu.org, "Aleksandar Rikalo" <arikalo@gmail.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Li-Wen Hsu" <lwhsu@freebsd.org>, "Ed Maste" <emaste@freebsd.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Weiwei Li" <liwei1518@gmail.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: Re: [PATCH 06/15] tests/plugins: use qemu_plugin_outs for inline stats
Date: Thu, 18 Jul 2024 09:37:16 -0700 [thread overview]
Message-ID: <0d515c6c-c046-4704-b69a-4b3cf535577c@linaro.org> (raw)
In-Reply-To: <20240718094523.1198645-7-alex.bennee@linaro.org>
On 7/18/24 02:45, Alex Bennée wrote:
> Using bare printf's in plugins is perfectly acceptable but they do
> rather mess up the output of "make check-tcg". Convert the printfs to
> use g_string and then output with the plugin output helper which will
> already be captured to .pout files by the test harness.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/plugin/inline.c | 58 ++++++++++++++++++++++++-------------------
> 1 file changed, 33 insertions(+), 25 deletions(-)
>
> diff --git a/tests/plugin/inline.c b/tests/plugin/inline.c
> index cd63827b7d..73dde99578 100644
> --- a/tests/plugin/inline.c
> +++ b/tests/plugin/inline.c
> @@ -71,10 +71,12 @@ static void stats_insn(void)
> const uint64_t cond_track_left = qemu_plugin_u64_sum(insn_cond_track_count);
> const uint64_t conditional =
> cond_num_trigger * cond_trigger_limit + cond_track_left;
> - printf("insn: %" PRIu64 "\n", expected);
> - printf("insn: %" PRIu64 " (per vcpu)\n", per_vcpu);
> - printf("insn: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> - printf("insn: %" PRIu64 " (cond cb)\n", conditional);
> + g_autoptr(GString) stats = g_string_new("");
> + g_string_append_printf(stats, "insn: %" PRIu64 "\n", expected);
> + g_string_append_printf(stats, "insn: %" PRIu64 " (per vcpu)\n", per_vcpu);
> + g_string_append_printf(stats, "insn: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> + g_string_append_printf(stats, "insn: %" PRIu64 " (cond cb)\n", conditional);
> + qemu_plugin_outs(stats->str);
> g_assert(expected > 0);
> g_assert(per_vcpu == expected);
> g_assert(inl_per_vcpu == expected);
> @@ -91,10 +93,12 @@ static void stats_tb(void)
> const uint64_t cond_track_left = qemu_plugin_u64_sum(tb_cond_track_count);
> const uint64_t conditional =
> cond_num_trigger * cond_trigger_limit + cond_track_left;
> - printf("tb: %" PRIu64 "\n", expected);
> - printf("tb: %" PRIu64 " (per vcpu)\n", per_vcpu);
> - printf("tb: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> - printf("tb: %" PRIu64 " (conditional cb)\n", conditional);
> + g_autoptr(GString) stats = g_string_new("");
> + g_string_append_printf(stats, "tb: %" PRIu64 "\n", expected);
> + g_string_append_printf(stats, "tb: %" PRIu64 " (per vcpu)\n", per_vcpu);
> + g_string_append_printf(stats, "tb: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> + g_string_append_printf(stats, "tb: %" PRIu64 " (conditional cb)\n", conditional);
> + qemu_plugin_outs(stats->str);
> g_assert(expected > 0);
> g_assert(per_vcpu == expected);
> g_assert(inl_per_vcpu == expected);
> @@ -107,9 +111,11 @@ static void stats_mem(void)
> const uint64_t per_vcpu = qemu_plugin_u64_sum(count_mem);
> const uint64_t inl_per_vcpu =
> qemu_plugin_u64_sum(count_mem_inline);
> - printf("mem: %" PRIu64 "\n", expected);
> - printf("mem: %" PRIu64 " (per vcpu)\n", per_vcpu);
> - printf("mem: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> + g_autoptr(GString) stats = g_string_new("");
> + g_string_append_printf(stats, "mem: %" PRIu64 "\n", expected);
> + g_string_append_printf(stats, "mem: %" PRIu64 " (per vcpu)\n", per_vcpu);
> + g_string_append_printf(stats, "mem: %" PRIu64 " (per vcpu inline)\n", inl_per_vcpu);
> + qemu_plugin_outs(stats->str);
> g_assert(expected > 0);
> g_assert(per_vcpu == expected);
> g_assert(inl_per_vcpu == expected);
> @@ -118,6 +124,7 @@ static void stats_mem(void)
> static void plugin_exit(qemu_plugin_id_t id, void *udata)
> {
> const unsigned int num_cpus = qemu_plugin_num_vcpus();
> + g_autoptr(GString) stats = g_string_new("");
> g_assert(num_cpus == max_cpu_index + 1);
>
> for (int i = 0; i < num_cpus ; ++i) {
> @@ -135,20 +142,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *udata)
> qemu_plugin_u64_get(insn_cond_num_trigger, i);
> const uint64_t insn_cond_left =
> qemu_plugin_u64_get(insn_cond_track_count, i);
> - printf("cpu %d: tb (%" PRIu64 ", %" PRIu64
> - ", %" PRIu64 " * %" PRIu64 " + %" PRIu64
> - ") | "
> - "insn (%" PRIu64 ", %" PRIu64
> - ", %" PRIu64 " * %" PRIu64 " + %" PRIu64
> - ") | "
> - "mem (%" PRIu64 ", %" PRIu64 ")"
> - "\n",
> - i,
> - tb, tb_inline,
> - tb_cond_trigger, cond_trigger_limit, tb_cond_left,
> - insn, insn_inline,
> - insn_cond_trigger, cond_trigger_limit, insn_cond_left,
> - mem, mem_inline);
> + g_string_printf(stats, "cpu %d: tb (%" PRIu64 ", %" PRIu64
> + ", %" PRIu64 " * %" PRIu64 " + %" PRIu64
> + ") | "
> + "insn (%" PRIu64 ", %" PRIu64
> + ", %" PRIu64 " * %" PRIu64 " + %" PRIu64
> + ") | "
> + "mem (%" PRIu64 ", %" PRIu64 ")"
> + "\n",
> + i,
> + tb, tb_inline,
> + tb_cond_trigger, cond_trigger_limit, tb_cond_left,
> + insn, insn_inline,
> + insn_cond_trigger, cond_trigger_limit, insn_cond_left,
> + mem, mem_inline);
> + qemu_plugin_outs(stats->str);
> g_assert(tb == tb_inline);
> g_assert(insn == insn_inline);
> g_assert(mem == mem_inline);
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
next prev parent reply other threads:[~2024-07-18 16:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-18 9:45 [PATCH 00/15] Final bits for 9.1-rc0 (docker, plugins, gdbstub, semihosting) Alex Bennée
2024-07-18 9:45 ` [PATCH 01/15] testing: bump to latest libvirt-ci Alex Bennée
2024-07-18 11:30 ` Philippe Mathieu-Daudé
2024-07-18 9:45 ` [PATCH 02/15] tests/avocado: Remove non-working sparc leon3 test Alex Bennée
2024-07-18 9:45 ` [PATCH 03/15] gdbstub: Re-factor gdb command extensions Alex Bennée
2024-07-18 9:45 ` [PATCH 04/15] plugins/stoptrigger: TCG plugin to stop execution under conditions Alex Bennée
2024-07-18 9:45 ` [PATCH 05/15] plugins: fix mem callback array size Alex Bennée
2024-07-18 9:45 ` [PATCH 06/15] tests/plugins: use qemu_plugin_outs for inline stats Alex Bennée
2024-07-18 11:32 ` Philippe Mathieu-Daudé
2024-07-18 16:37 ` Pierrick Bouvier [this message]
2024-07-18 9:45 ` [PATCH 07/15] plugins/execlog.c: correct dump of registers values Alex Bennée
2024-07-18 9:45 ` [PATCH 08/15] semihosting: Include missing 'gdbstub/syscalls.h' header Alex Bennée
2024-07-18 9:45 ` [PATCH 09/15] target/m68k: Add semihosting stub Alex Bennée
2024-07-18 9:45 ` [PATCH 10/15] target/mips: " Alex Bennée
2024-07-18 9:45 ` [PATCH 11/15] target/m68k: Restrict semihosting to TCG Alex Bennée
2024-07-18 9:45 ` [PATCH 12/15] target/mips: " Alex Bennée
2024-07-18 9:45 ` [PATCH 13/15] target/riscv: " Alex Bennée
2024-07-18 9:45 ` [PATCH 14/15] target/xtensa: " Alex Bennée
2024-07-18 9:45 ` [PATCH 15/15] semihosting: Restrict " Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d515c6c-c046-4704-b69a-4b3cf535577c@linaro.org \
--to=pierrick.bouvier@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=arikalo@gmail.com \
--cc=aurelien@aurel32.net \
--cc=bleal@redhat.com \
--cc=bmeng.cn@gmail.com \
--cc=dbarboza@ventanamicro.com \
--cc=emaste@freebsd.org \
--cc=erdnaxe@crans.org \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=ma.mandourr@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).