[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/28] tests/plugin: allow libinsn.so per-CPU counts
From: |
Alex Bennée |
Subject: |
[PULL 23/28] tests/plugin: allow libinsn.so per-CPU counts |
Date: |
Wed, 9 Feb 2022 14:15:24 +0000 |
We won't go fully flexible but for most system emulation 8 vCPUs
resolution should be enough for anybody ;-)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220204204335.1689602-24-alex.bennee@linaro.org>
diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c
index d229fdc001..d5a0a08cb4 100644
--- a/tests/plugin/insn.c
+++ b/tests/plugin/insn.c
@@ -16,22 +16,33 @@
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
-static uint64_t insn_count;
+#define MAX_CPUS 8 /* lets not go nuts */
+
+typedef struct {
+ uint64_t last_pc;
+ uint64_t insn_count;
+} InstructionCount;
+
+static InstructionCount counts[MAX_CPUS];
+static uint64_t inline_insn_count;
+
static bool do_inline;
static bool do_size;
+static bool do_frequency;
static GArray *sizes;
static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata)
{
- static uint64_t last_pc;
+ unsigned int i = cpu_index % MAX_CPUS;
+ InstructionCount *c = &counts[i];
uint64_t this_pc = GPOINTER_TO_UINT(udata);
- if (this_pc == last_pc) {
+ if (this_pc == c->last_pc) {
g_autofree gchar *out = g_strdup_printf("detected repeat execution @
0x%"
PRIx64 "\n", this_pc);
qemu_plugin_outs(out);
}
- last_pc = this_pc;
- insn_count++;
+ c->last_pc = this_pc;
+ c->insn_count++;
}
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
@@ -44,7 +55,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
if (do_inline) {
qemu_plugin_register_vcpu_insn_exec_inline(
- insn, QEMU_PLUGIN_INLINE_ADD_U64, &insn_count, 1);
+ insn, QEMU_PLUGIN_INLINE_ADD_U64, &inline_insn_count, 1);
} else {
uint64_t vaddr = qemu_plugin_insn_vaddr(insn);
qemu_plugin_register_vcpu_insn_exec_cb(
@@ -66,9 +77,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
static void plugin_exit(qemu_plugin_id_t id, void *p)
{
g_autoptr(GString) out = g_string_new(NULL);
+ int i;
if (do_size) {
- int i;
for (i = 0; i <= sizes->len; i++) {
unsigned long *cnt = &g_array_index(sizes, unsigned long, i);
if (*cnt) {
@@ -76,8 +87,20 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
"len %d bytes: %ld insns\n", i, *cnt);
}
}
+ } else if (do_inline) {
+ g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_count);
} else {
- g_string_append_printf(out, "insns: %" PRIu64 "\n", insn_count);
+ uint64_t total_insns = 0;
+ for (i = 0; i < MAX_CPUS; i++) {
+ InstructionCount *c = &counts[i];
+ if (c->insn_count) {
+ g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n",
+ i, c->insn_count);
+ total_insns += c->insn_count;
+ }
+ }
+ g_string_append_printf(out, "total insns: %" PRIu64 "\n",
+ total_insns);
}
qemu_plugin_outs(out->str);
}
--
2.30.2
- [PULL 00/28] testing and plugin updates, Alex Bennée, 2022/02/09
- [PULL 22/28] contrib/plugins: add a drcov plugin, Alex Bennée, 2022/02/09
- [PULL 01/28] tests/Makefile.include: clean-up old code, Alex Bennée, 2022/02/09
- [PULL 24/28] tests/plugins: add instruction matching to libinsn.so, Alex Bennée, 2022/02/09
- [PULL 09/28] tests/lcitool: Refresh submodule and remove libxml2, Alex Bennée, 2022/02/09
- [PULL 14/28] tests/lcitool: Allow lcitool-refresh in out-of-tree builds, too, Alex Bennée, 2022/02/09
- [PULL 23/28] tests/plugin: allow libinsn.so per-CPU counts,
Alex Bennée <=
- [PULL 03/28] Makefile: also remove .gcno files when cleaning, Alex Bennée, 2022/02/09
- [PULL 02/28] tests/qtest: enable more vhost-user tests by default, Alex Bennée, 2022/02/09
- [PULL 05/28] MAINTAINERS: Cover lcitool submodule with build test / automation, Alex Bennée, 2022/02/09
- [PULL 07/28] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files, Alex Bennée, 2022/02/09
- [PULL 04/28] .gitignore: add .gcov pattern, Alex Bennée, 2022/02/09
- [PULL 06/28] gitmodules: Correct libvirt-ci submodule URL, Alex Bennée, 2022/02/09
- [PULL 12/28] docs/devel: mention our .editorconfig, Alex Bennée, 2022/02/09
- [PULL 17/28] docs: remove references to TCG tracing, Alex Bennée, 2022/02/09
- [PULL 08/28] drop libxml2 checks since libxml is not actually used (for parallels), Alex Bennée, 2022/02/09
- [PULL 11/28] tests/lcitool: Install libibumad to cover RDMA on Debian based distros, Alex Bennée, 2022/02/09