|
@@ -28,9 +28,25 @@ static uint64_t inline_insn_count;
|
|
|
|
|
|
static bool do_inline;
|
|
static bool do_inline;
|
|
static bool do_size;
|
|
static bool do_size;
|
|
-static bool do_frequency;
|
|
|
|
static GArray *sizes;
|
|
static GArray *sizes;
|
|
|
|
|
|
|
|
+typedef struct {
|
|
|
|
+ char *match_string;
|
|
|
|
+ uint64_t hits[MAX_CPUS];
|
|
|
|
+ uint64_t last_hit[MAX_CPUS];
|
|
|
|
+ uint64_t total_delta[MAX_CPUS];
|
|
|
|
+ GPtrArray *history[MAX_CPUS];
|
|
|
|
+} Match;
|
|
|
|
+
|
|
|
|
+static GArray *matches;
|
|
|
|
+
|
|
|
|
+typedef struct {
|
|
|
|
+ Match *match;
|
|
|
|
+ uint64_t vaddr;
|
|
|
|
+ uint64_t hits;
|
|
|
|
+ char *disas;
|
|
|
|
+} Instruction;
|
|
|
|
+
|
|
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;
|
|
unsigned int i = cpu_index % MAX_CPUS;
|
|
@@ -45,6 +61,37 @@ static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata)
|
|
c->insn_count++;
|
|
c->insn_count++;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void vcpu_insn_matched_exec_before(unsigned int cpu_index, void *udata)
|
|
|
|
+{
|
|
|
|
+ unsigned int i = cpu_index % MAX_CPUS;
|
|
|
|
+ Instruction *insn = (Instruction *) udata;
|
|
|
|
+ Match *match = insn->match;
|
|
|
|
+ g_autoptr(GString) ts = g_string_new("");
|
|
|
|
+
|
|
|
|
+ insn->hits++;
|
|
|
|
+ g_string_append_printf(ts, "0x%" PRIx64 ", '%s', %"PRId64 " hits",
|
|
|
|
+ insn->vaddr, insn->disas, insn->hits);
|
|
|
|
+
|
|
|
|
+ uint64_t icount = counts[i].insn_count;
|
|
|
|
+ uint64_t delta = icount - match->last_hit[i];
|
|
|
|
+
|
|
|
|
+ match->hits[i]++;
|
|
|
|
+ match->total_delta[i] += delta;
|
|
|
|
+
|
|
|
|
+ g_string_append_printf(ts,
|
|
|
|
+ ", %"PRId64" match hits, "
|
|
|
|
+ "Δ+%"PRId64 " since last match,"
|
|
|
|
+ " %"PRId64 " avg insns/match\n",
|
|
|
|
+ match->hits[i], delta,
|
|
|
|
+ match->total_delta[i] / match->hits[i]);
|
|
|
|
+
|
|
|
|
+ match->last_hit[i] = icount;
|
|
|
|
+
|
|
|
|
+ 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)
|
|
{
|
|
{
|
|
size_t n = qemu_plugin_tb_n_insns(tb);
|
|
size_t n = qemu_plugin_tb_n_insns(tb);
|
|
@@ -71,6 +118,29 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
|
|
unsigned long *cnt = &g_array_index(sizes, unsigned long, sz);
|
|
unsigned long *cnt = &g_array_index(sizes, unsigned long, sz);
|
|
(*cnt)++;
|
|
(*cnt)++;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * If we are tracking certain instructions we will need more
|
|
|
|
+ * information about the instruction which we also need to
|
|
|
|
+ * save if there is a hit.
|
|
|
|
+ */
|
|
|
|
+ if (matches) {
|
|
|
|
+ char *insn_disas = qemu_plugin_insn_disas(insn);
|
|
|
|
+ int j;
|
|
|
|
+ for (j = 0; j < matches->len; j++) {
|
|
|
|
+ Match *m = &g_array_index(matches, Match, j);
|
|
|
|
+ if (g_str_has_prefix(insn_disas, m->match_string)) {
|
|
|
|
+ Instruction *rec = g_new0(Instruction, 1);
|
|
|
|
+ rec->disas = g_strdup(insn_disas);
|
|
|
|
+ rec->vaddr = qemu_plugin_insn_vaddr(insn);
|
|
|
|
+ rec->match = m;
|
|
|
|
+ qemu_plugin_register_vcpu_insn_exec_cb(
|
|
|
|
+ insn, vcpu_insn_matched_exec_before,
|
|
|
|
+ QEMU_PLUGIN_CB_NO_REGS, rec);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ g_free(insn_disas);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -105,6 +175,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
|
|
qemu_plugin_outs(out->str);
|
|
qemu_plugin_outs(out->str);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+/* Add a match to the array of matches */
|
|
|
|
+static void parse_match(char *match)
|
|
|
|
+{
|
|
|
|
+ Match new_match = { .match_string = match };
|
|
|
|
+ int i;
|
|
|
|
+ for (i = 0; i < MAX_CPUS; i++) {
|
|
|
|
+ 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);
|
|
|
|
+}
|
|
|
|
+
|
|
QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
|
|
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)
|
|
@@ -122,6 +207,8 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
|
|
fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
|
|
fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
+ } else if (g_strcmp0(tokens[0], "match") == 0) {
|
|
|
|
+ parse_match(tokens[1]);
|
|
} else {
|
|
} else {
|
|
fprintf(stderr, "option parsing failed: %s\n", opt);
|
|
fprintf(stderr, "option parsing failed: %s\n", opt);
|
|
return -1;
|
|
return -1;
|