OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/plugin/bb: migrate to new per_vcpu API

Browse Source 
Reviewed-by: Luc Michel <luc.michel@amd.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240304130036.124418-9-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240305121005.3528075-22-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier 2024-03-05 12:09:57 +00:00 committed by Alex Bennée
parent 3d15c8d87e
commit dd0f775074
1 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
tests/plugin/bb.c
View File

@ -17,27 +17,25 @@
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
typedef struct { typedef struct {
GMutex lock;
int index;
uint64_t bb_count; uint64_t bb_count;
uint64_t insn_count; uint64_t insn_count;
} CPUCount; } CPUCount;
/* Used by the inline & linux-user counts */ static struct qemu_plugin_scoreboard *counts;
static bool do_inline; static qemu_plugin_u64 bb_count;
static CPUCount inline_count; static qemu_plugin_u64 insn_count;
static bool do_inline;
/* Dump running CPU total on idle? */ /* Dump running CPU total on idle? */
static bool idle_report; static bool idle_report;
static GPtrArray *counts;
static int max_cpus;
static void gen_one_cpu_report(CPUCount *count, GString *report) static void gen_one_cpu_report(CPUCount *count, GString *report,
unsigned int cpu_index)
{ {
if (count->bb_count) { if (count->bb_count) {
g_string_append_printf(report, "CPU%d: " g_string_append_printf(report, "CPU%d: "
"bb's: %" PRIu64", insns: %" PRIu64 "\n", "bb's: %" PRIu64", insns: %" PRIu64 "\n",
count->index, cpu_index,
count->bb_count, count->insn_count); count->bb_count, count->insn_count);
} }
} }
@ -46,20 +44,23 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
{ {
g_autoptr(GString) report = g_string_new(""); g_autoptr(GString) report = g_string_new("");
if (do_inline || !max_cpus) { for (int i = 0; i < qemu_plugin_num_vcpus(); ++i) {
g_string_printf(report, "bb's: %" PRIu64", insns: %" PRIu64 "\n", CPUCount *count = qemu_plugin_scoreboard_find(counts, i);
inline_count.bb_count, inline_count.insn_count); gen_one_cpu_report(count, report, i);
} else {
g_ptr_array_foreach(counts, (GFunc) gen_one_cpu_report, report);
} }
g_string_append_printf(report, "Total: "
"bb's: %" PRIu64", insns: %" PRIu64 "\n",
qemu_plugin_u64_sum(bb_count),
qemu_plugin_u64_sum(insn_count));
qemu_plugin_outs(report->str); qemu_plugin_outs(report->str);
qemu_plugin_scoreboard_free(counts);
} }
static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index) static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index)
{ {
CPUCount *count = g_ptr_array_index(counts, cpu_index); CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index);
g_autoptr(GString) report = g_string_new(""); g_autoptr(GString) report = g_string_new("");
gen_one_cpu_report(count, report); gen_one_cpu_report(count, report, cpu_index);
if (report->len > 0) { if (report->len > 0) {
g_string_prepend(report, "Idling "); g_string_prepend(report, "Idling ");
@ -69,14 +70,11 @@ static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index)
static void vcpu_tb_exec(unsigned int cpu_index, void *udata) static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
{ {
CPUCount *count = max_cpus ? CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index);
g_ptr_array_index(counts, cpu_index) : &inline_count;
uintptr_t n_insns = (uintptr_t)udata; uintptr_t n_insns = (uintptr_t)udata;
g_mutex_lock(&count->lock);
count->insn_count += n_insns; count->insn_count += n_insns;
count->bb_count++; count->bb_count++;
g_mutex_unlock(&count->lock);
} }
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
@ -84,11 +82,10 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
size_t n_insns = qemu_plugin_tb_n_insns(tb); size_t n_insns = qemu_plugin_tb_n_insns(tb);
if (do_inline) { if (do_inline) {
qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64, qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
&inline_count.bb_count, 1); tb, QEMU_PLUGIN_INLINE_ADD_U64, bb_count, 1);
qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64, qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
&inline_count.insn_count, tb, QEMU_PLUGIN_INLINE_ADD_U64, insn_count, n_insns);
n_insns);
} else { } else {
qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec, qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec,
QEMU_PLUGIN_CB_NO_REGS, QEMU_PLUGIN_CB_NO_REGS,
@ -121,18 +118,10 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
} }
} }
if (info->system_emulation && !do_inline) { counts = qemu_plugin_scoreboard_new(sizeof(CPUCount));
max_cpus = info->system.max_vcpus; bb_count = qemu_plugin_scoreboard_u64_in_struct(counts, CPUCount, bb_count);
counts = g_ptr_array_new(); insn_count = qemu_plugin_scoreboard_u64_in_struct(
for (i = 0; i < max_cpus; i++) { counts, CPUCount, insn_count);
CPUCount *count = g_new0(CPUCount, 1);
g_mutex_init(&count->lock);
count->index = i;
g_ptr_array_add(counts, count);
}
} else if (!do_inline) {
g_mutex_init(&inline_count.lock);
}
if (idle_report) { if (idle_report) {
qemu_plugin_register_vcpu_idle_cb(id, vcpu_idle); qemu_plugin_register_vcpu_idle_cb(id, vcpu_idle);