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

tests/plugin/insn: migrate to new per_vcpu API

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

106
tests/plugin/insn.c
View File

@ -16,25 +16,21 @@
QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
#define MAX_CPUS 8 /* lets not go nuts */ static qemu_plugin_u64 insn_count;
typedef struct {
uint64_t insn_count;
} InstructionCount;
static InstructionCount counts[MAX_CPUS];
static uint64_t inline_insn_count;
static bool do_inline; static bool do_inline;
static bool do_size; static bool do_size;
static GArray *sizes; static GArray *sizes;
typedef struct {
uint64_t hits;
uint64_t last_hit;
uint64_t total_delta;
} MatchCount;
typedef struct { typedef struct {
char *match_string; char *match_string;
uint64_t hits[MAX_CPUS]; struct qemu_plugin_scoreboard *counts; /* MatchCount */
uint64_t last_hit[MAX_CPUS];
uint64_t total_delta[MAX_CPUS];
GPtrArray *history[MAX_CPUS];
} Match; } Match;
static GArray *matches; static GArray *matches;
@ -67,41 +63,40 @@ static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata)
{ {
unsigned int i = cpu_index % MAX_CPUS; qemu_plugin_u64_add(insn_count, cpu_index, 1);
InstructionCount *c = &counts[i];
c->insn_count++;
} }
static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata) static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata)
{ {
unsigned int i = cpu_index % MAX_CPUS;
Instruction *insn = (Instruction *) udata; Instruction *insn = (Instruction *) udata;
Match *match = insn->match; Match *insn_match = insn->match;
MatchCount *match = qemu_plugin_scoreboard_find(insn_match->counts,
cpu_index);
g_autoptr(GString) ts = g_string_new(""); g_autoptr(GString) ts = g_string_new("");
insn->hits++; insn->hits++;
g_string_append_printf(ts, "0x%" PRIx64 ", '%s', %"PRId64 " hits", g_string_append_printf(ts, "0x%" PRIx64 ", '%s', %"PRId64 " hits",
insn->vaddr, insn->disas, insn->hits); insn->vaddr, insn->disas, insn->hits);
uint64_t icount = counts[i].insn_count; uint64_t icount = qemu_plugin_u64_get(insn_count, cpu_index);
uint64_t delta = icount - match->last_hit[i]; uint64_t delta = icount - match->last_hit;
match->hits[i]++; match->hits++;
match->total_delta[i] += delta; match->total_delta += delta;
g_string_append_printf(ts, g_string_append_printf(ts,
", %"PRId64" match hits, " " , cpu %u,"
"Δ+%"PRId64 " since last match," " %"PRId64" match hits,"
" Δ+%"PRId64 " since last match,"
" %"PRId64 " avg insns/match\n", " %"PRId64 " avg insns/match\n",
match->hits[i], delta, cpu_index,
match->total_delta[i] / match->hits[i]); match->hits, delta,
match->total_delta / match->hits);
match->last_hit[i] = icount; match->last_hit = icount;
qemu_plugin_outs(ts->str); qemu_plugin_outs(ts->str);
g_ptr_array_add(match->history[i], insn);
} }
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)
@ -113,8 +108,8 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i);
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, &inline_insn_count, 1); insn, QEMU_PLUGIN_INLINE_ADD_U64, insn_count, 1);
} else { } else {
uint64_t vaddr = qemu_plugin_insn_vaddr(insn); uint64_t vaddr = qemu_plugin_insn_vaddr(insn);
qemu_plugin_register_vcpu_insn_exec_cb( qemu_plugin_register_vcpu_insn_exec_cb(
@ -136,10 +131,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
* information about the instruction which we also need to * information about the instruction which we also need to
* save if there is a hit. * save if there is a hit.
*/ */
if (matches) { if (matches->len) {
char *insn_disas = qemu_plugin_insn_disas(insn); char *insn_disas = qemu_plugin_insn_disas(insn);
int j; for (int j = 0; j < matches->len; j++) {
for (j = 0; j < matches->len; j++) {
Match *m = &g_array_index(matches, Match, j); Match *m = &g_array_index(matches, Match, j);
if (g_str_has_prefix(insn_disas, m->match_string)) { if (g_str_has_prefix(insn_disas, m->match_string)) {
Instruction *rec = g_new0(Instruction, 1); Instruction *rec = g_new0(Instruction, 1);
@ -169,36 +163,33 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
"len %d bytes: %ld insns\n", i, *cnt); "len %d bytes: %ld insns\n", i, *cnt);
} }
} }
} else if (do_inline) {
g_string_append_printf(out, "insns: %" PRIu64 "\n", inline_insn_count);
} else { } else {
uint64_t total_insns = 0; for (i = 0; i < qemu_plugin_num_vcpus(); i++) {
for (i = 0; i < MAX_CPUS; i++) { g_string_append_printf(out, "cpu %d insns: %" PRIu64 "\n",
InstructionCount *c = &counts[i]; i, qemu_plugin_u64_get(insn_count, 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", g_string_append_printf(out, "total insns: %" PRIu64 "\n",
total_insns); qemu_plugin_u64_sum(insn_count));
} }
qemu_plugin_outs(out->str); qemu_plugin_outs(out->str);
qemu_plugin_scoreboard_free(insn_count.score);
for (i = 0; i < matches->len; ++i) {
Match *m = &g_array_index(matches, Match, i);
g_free(m->match_string);
qemu_plugin_scoreboard_free(m->counts);
}
g_array_free(matches, TRUE);
g_array_free(sizes, TRUE);
} }
/* Add a match to the array of matches */ /* Add a match to the array of matches */
static void parse_match(char *match) static void parse_match(char *match)
{ {
Match new_match = { .match_string = match }; Match new_match = {
int i; .match_string = g_strdup(match),
for (i = 0; i < MAX_CPUS; i++) { .counts = qemu_plugin_scoreboard_new(sizeof(MatchCount)) };
new_match.history[i] = g_ptr_array_new();
}
if (!matches) {
matches = g_array_new(false, true, sizeof(Match));
}
g_array_append_val(matches, new_match); g_array_append_val(matches, new_match);
} }
@ -206,6 +197,10 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
const qemu_info_t *info, const qemu_info_t *info,
int argc, char **argv) int argc, char **argv)
{ {
matches = g_array_new(false, true, sizeof(Match));
/* null terminated so 0 is not a special case */
sizes = g_array_new(true, true, sizeof(unsigned long));
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
char *opt = argv[i]; char *opt = argv[i];
g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); g_auto(GStrv) tokens = g_strsplit(opt, "=", 2);
@ -227,9 +222,8 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
} }
} }
if (do_size) { insn_count = qemu_plugin_scoreboard_u64(
sizes = g_array_new(true, true, sizeof(unsigned long)); qemu_plugin_scoreboard_new(sizeof(uint64_t)));
}
/* Register init, translation block and exit callbacks */ /* Register init, translation block and exit callbacks */
qemu_plugin_register_vcpu_init_cb(id, vcpu_init); qemu_plugin_register_vcpu_init_cb(id, vcpu_init);