SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

contrib/plugins/hwprofile: fix 32-bit build

Browse Source 
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20241217224306.2900490-10-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250116160306.1709518-20-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier 2025-01-16 16:02:48 +00:00 committed by Alex Bennée
parent a5555b2548
commit cab85a63e0
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/plugins/hwprofile.c
View File

@ -43,6 +43,8 @@ typedef struct {
static GMutex lock; static GMutex lock;
static GHashTable *devices; static GHashTable *devices;
static struct qemu_plugin_scoreboard *source_pc_scoreboard;
static qemu_plugin_u64 source_pc;
/* track the access pattern to a piece of HW */ /* track the access pattern to a piece of HW */
static bool pattern; static bool pattern;
@ -159,7 +161,7 @@ static DeviceCounts *new_count(const char *name, uint64_t base)
count->name = name; count->name = name;
count->base = base; count->base = base;
if (pattern || source) { if (pattern || source) {
count->detail = g_hash_table_new(NULL, NULL); count->detail = g_hash_table_new(g_int64_hash, g_int64_equal);
} }
g_hash_table_insert(devices, (gpointer) name, count); g_hash_table_insert(devices, (gpointer) name, count);
return count; return count;
@ -169,7 +171,7 @@ static IOLocationCounts *new_location(GHashTable *table, uint64_t off_or_pc)
{ {
IOLocationCounts *loc = g_new0(IOLocationCounts, 1); IOLocationCounts *loc = g_new0(IOLocationCounts, 1);
loc->off_or_pc = off_or_pc; loc->off_or_pc = off_or_pc;
g_hash_table_insert(table, (gpointer) off_or_pc, loc); g_hash_table_insert(table, &loc->off_or_pc, loc);
return loc; return loc;
} }
@ -224,12 +226,12 @@ static void vcpu_haddr(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
/* either track offsets or source of access */ /* either track offsets or source of access */
if (source) { if (source) {
off = (uint64_t) udata; off = qemu_plugin_u64_get(source_pc, cpu_index);
} }
if (pattern || source) { if (pattern || source) {
IOLocationCounts *io_count = g_hash_table_lookup(counts->detail, IOLocationCounts *io_count = g_hash_table_lookup(counts->detail,
(gpointer) off); &off);
if (!io_count) { if (!io_count) {
io_count = new_location(counts->detail, off); io_count = new_location(counts->detail, off);
} }
@ -247,10 +249,14 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i);
gpointer udata = (gpointer) (source ? qemu_plugin_insn_vaddr(insn) : 0); if (source) {
uint64_t pc = qemu_plugin_insn_vaddr(insn);
qemu_plugin_register_vcpu_mem_inline_per_vcpu(
insn, rw, QEMU_PLUGIN_INLINE_STORE_U64,
source_pc, pc);
}
qemu_plugin_register_vcpu_mem_cb(insn, vcpu_haddr, qemu_plugin_register_vcpu_mem_cb(insn, vcpu_haddr,
QEMU_PLUGIN_CB_NO_REGS, QEMU_PLUGIN_CB_NO_REGS, rw, NULL);
rw, udata);
} }
} }
@ -306,10 +312,9 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
return -1; return -1;
} }
/* Just warn about overflow */ if (source) {
if (info->system.smp_vcpus > 64 || source_pc_scoreboard = qemu_plugin_scoreboard_new(sizeof(uint64_t));
info->system.max_vcpus > 64) { source_pc = qemu_plugin_scoreboard_u64(source_pc_scoreboard);
fprintf(stderr, "hwprofile: can only track up to 64 CPUs\n");
} }
plugin_init(); plugin_init();