ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

contrib/plugins/howvec: migrate to new per_vcpu API 

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240304130036.124418-11-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240305121005.3528075-24-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier 2024-03-05 12:09:59 +00:00 committed by Alex Bennée
parent 2d0d551442
commit c125a8ab04
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
contrib/plugins/howvec.c
View File

@ -43,13 +43,13 @@ typedef struct {
uint32_t mask; uint32_t mask;
uint32_t pattern; uint32_t pattern;
CountType what; CountType what;
uint64_t count; qemu_plugin_u64 count;
} InsnClassExecCount; } InsnClassExecCount;
typedef struct { typedef struct {
char *insn; char *insn;
uint32_t opcode; uint32_t opcode;
uint64_t count; qemu_plugin_u64 count;
InsnClassExecCount *class; InsnClassExecCount *class;
} InsnExecCount; } InsnExecCount;
@ -159,7 +159,9 @@ static gint cmp_exec_count(gconstpointer a, gconstpointer b)
{ {
InsnExecCount *ea = (InsnExecCount *) a; InsnExecCount *ea = (InsnExecCount *) a;
InsnExecCount *eb = (InsnExecCount *) b; InsnExecCount *eb = (InsnExecCount *) b;
return ea->count > eb->count ? -1 : 1; uint64_t count_a = qemu_plugin_u64_sum(ea->count);
uint64_t count_b = qemu_plugin_u64_sum(eb->count);
return count_a > count_b ? -1 : 1;
} }
static void free_record(gpointer data) static void free_record(gpointer data)
@ -167,12 +169,14 @@ static void free_record(gpointer data)
InsnExecCount *rec = (InsnExecCount *) data; InsnExecCount *rec = (InsnExecCount *) data;
g_free(rec->insn); g_free(rec->insn);
g_free(rec); g_free(rec);
qemu_plugin_scoreboard_free(rec->count.score);
} }
static void plugin_exit(qemu_plugin_id_t id, void *p) static void plugin_exit(qemu_plugin_id_t id, void *p)
{ {
g_autoptr(GString) report = g_string_new("Instruction Classes:\n"); g_autoptr(GString) report = g_string_new("Instruction Classes:\n");
int i; int i;
uint64_t total_count;
GList *counts; GList *counts;
InsnClassExecCount *class = NULL; InsnClassExecCount *class = NULL;
@ -180,11 +184,12 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
class = &class_table[i]; class = &class_table[i];
switch (class->what) { switch (class->what) {
case COUNT_CLASS: case COUNT_CLASS:
if (class->count || verbose) { total_count = qemu_plugin_u64_sum(class->count);
if (total_count || verbose) {
g_string_append_printf(report, g_string_append_printf(report,
"Class: %-24s\t(%" PRId64 " hits)\n", "Class: %-24s\t(%" PRId64 " hits)\n",
class->class, class->class,
class->count); total_count);
} }
break; break;
case COUNT_INDIVIDUAL: case COUNT_INDIVIDUAL:
@ -212,7 +217,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
"Instr: %-24s\t(%" PRId64 " hits)" "Instr: %-24s\t(%" PRId64 " hits)"
"\t(op=0x%08x/%s)\n", "\t(op=0x%08x/%s)\n",
rec->insn, rec->insn,
rec->count, qemu_plugin_u64_sum(rec->count),
rec->opcode, rec->opcode,
rec->class ? rec->class ?
rec->class->class : "un-categorised"); rec->class->class : "un-categorised");
@ -221,6 +226,12 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
} }
g_hash_table_destroy(insns); g_hash_table_destroy(insns);
for (i = 0; i < ARRAY_SIZE(class_tables); i++) {
for (int j = 0; j < class_tables[i].table_sz; ++j) {
qemu_plugin_scoreboard_free(class_tables[i].table[j].count.score);
}
}
qemu_plugin_outs(report->str); qemu_plugin_outs(report->str);
} }
@ -232,11 +243,12 @@ static void plugin_init(void)
static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata)
{ {
uint64_t *count = (uint64_t *) udata; struct qemu_plugin_scoreboard *score = udata;
(*count)++; qemu_plugin_u64_add(qemu_plugin_scoreboard_u64(score), cpu_index, 1);
} }
static uint64_t *find_counter(struct qemu_plugin_insn *insn) static struct qemu_plugin_scoreboard *find_counter(
struct qemu_plugin_insn *insn)
{ {
int i; int i;
uint64_t *cnt = NULL; uint64_t *cnt = NULL;
@ -265,7 +277,7 @@ static uint64_t *find_counter(struct qemu_plugin_insn *insn)
case COUNT_NONE: case COUNT_NONE:
return NULL; return NULL;
case COUNT_CLASS: case COUNT_CLASS:
return &class->count; return class->count.score;
case COUNT_INDIVIDUAL: case COUNT_INDIVIDUAL:
{ {
InsnExecCount *icount; InsnExecCount *icount;
@ -279,13 +291,16 @@ static uint64_t *find_counter(struct qemu_plugin_insn *insn)
icount->opcode = opcode; icount->opcode = opcode;
icount->insn = qemu_plugin_insn_disas(insn); icount->insn = qemu_plugin_insn_disas(insn);
icount->class = class; icount->class = class;
struct qemu_plugin_scoreboard *score =
qemu_plugin_scoreboard_new(sizeof(uint64_t));
icount->count = qemu_plugin_scoreboard_u64(score);
g_hash_table_insert(insns, GUINT_TO_POINTER(opcode), g_hash_table_insert(insns, GUINT_TO_POINTER(opcode),
(gpointer) icount); (gpointer) icount);
} }
g_mutex_unlock(&lock); g_mutex_unlock(&lock);
return &icount->count; return icount->count.score;
} }
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -300,14 +315,14 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
size_t i; size_t i;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
uint64_t *cnt;
struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i);
cnt = find_counter(insn); struct qemu_plugin_scoreboard *cnt = find_counter(insn);
if (cnt) { if (cnt) {
if (do_inline) { if (do_inline) {
qemu_plugin_register_vcpu_insn_exec_inline( qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(
insn, QEMU_PLUGIN_INLINE_ADD_U64, cnt, 1); insn, QEMU_PLUGIN_INLINE_ADD_U64,
qemu_plugin_scoreboard_u64(cnt), 1);
} else { } else {
qemu_plugin_register_vcpu_insn_exec_cb( qemu_plugin_register_vcpu_insn_exec_cb(
insn, vcpu_insn_exec_before, QEMU_PLUGIN_CB_NO_REGS, cnt); insn, vcpu_insn_exec_before, QEMU_PLUGIN_CB_NO_REGS, cnt);
@ -322,6 +337,14 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(class_tables); i++) {
for (int j = 0; j < class_tables[i].table_sz; ++j) {
struct qemu_plugin_scoreboard *score =
qemu_plugin_scoreboard_new(sizeof(uint64_t));
class_tables[i].table[j].count = qemu_plugin_scoreboard_u64(score);
}
}
/* Select a class table appropriate to the guest architecture */ /* Select a class table appropriate to the guest architecture */
for (i = 0; i < ARRAY_SIZE(class_tables); i++) { for (i = 0; i < ARRAY_SIZE(class_tables); i++) {
ClassSelector *entry = &class_tables[i]; ClassSelector *entry = &class_tables[i];