* [PATCH v1 1/2] tests/tcg: add memory-sve test for aarch64
2022-03-28 15:26 [PATCH v1 0/2] some tests and plugin tweaks for SVE Alex Bennée
@ 2022-03-28 15:26 ` Alex Bennée
2022-03-28 15:26 ` [PATCH v1 2/2] plugins: extend execlog to filter matches Alex Bennée
1 sibling, 0 replies; 4+ messages in thread
From: Alex Bennée @ 2022-03-28 15:26 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, aaron, robhenry, mahmoudabdalghany, minyihh, cota,
Luke.Craig, kuhn.chenqun, ma.mandourr, Alex Bennée,
open list:ARM TCG CPUs
This will be helpful in debugging problems with tracking SVE memory
accesses via the TCG plugins system.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Robert Henry <robhenry@microsoft.com>
Cc: Aaron Lindsay <aaron@os.amperecomputing.com>
---
tests/tcg/aarch64/Makefile.softmmu-target | 7 +++++++
tests/tcg/aarch64/system/boot.S | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target
index a7286ac295..cc02814065 100644
--- a/tests/tcg/aarch64/Makefile.softmmu-target
+++ b/tests/tcg/aarch64/Makefile.softmmu-target
@@ -31,6 +31,13 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
memory: CFLAGS+=-DCHECK_UNALIGNED=1
+memory-sve: memory.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
+
+memory-sve: CFLAGS+=-DCHECK_UNALIGNED=1 -march=armv8.1-a+sve -O3 -fno-tree-loop-distribute-patterns
+
+TESTS+=memory-sve
+
# Running
QEMU_BASE_MACHINE=-M virt -cpu max -display none
QEMU_OPTS+=$(QEMU_BASE_MACHINE) -semihosting-config enable=on,target=native,chardev=output -kernel
diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boot.S
index e190b1efa6..f136363d2a 100644
--- a/tests/tcg/aarch64/system/boot.S
+++ b/tests/tcg/aarch64/system/boot.S
@@ -179,12 +179,13 @@ __start:
isb
/*
- * Enable FP registers. The standard C pre-amble will be
+ * Enable FP/SVE registers. The standard C pre-amble will be
* saving these and A-profile compilers will use AdvSIMD
* registers unless we tell it not to.
*/
mrs x0, cpacr_el1
orr x0, x0, #(3 << 20)
+ orr x0, x0, #(3 << 16)
msr cpacr_el1, x0
/* Setup some stack space and enter the test code.
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v1 2/2] plugins: extend execlog to filter matches
2022-03-28 15:26 [PATCH v1 0/2] some tests and plugin tweaks for SVE Alex Bennée
2022-03-28 15:26 ` [PATCH v1 1/2] tests/tcg: add memory-sve test for aarch64 Alex Bennée
@ 2022-03-28 15:26 ` Alex Bennée
2022-04-03 13:14 ` Alexandre IOOSS
1 sibling, 1 reply; 4+ messages in thread
From: Alex Bennée @ 2022-03-28 15:26 UTC (permalink / raw)
To: qemu-devel
Cc: aaron, robhenry, mahmoudabdalghany, minyihh, cota, Luke.Craig,
Alexandre Iooss, kuhn.chenqun, ma.mandourr, Alex Bennée
Sometimes the whole execlog is just two much so add the ability to
filter by instruction opcode or address.
[AJB: this shows for example
.qemu-system-aarch64 -display none -serial mon:stdio \
-M virt -cpu max \
-semihosting-config enable=on \
-kernel ./tests/tcg/aarch64-softmmu/memory-sve \
-plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin -D plugin.out
the st1w SVE instruction is not instrumenting its stores.]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Robert Henry <robhenry@microsoft.com>
Cc: Aaron Lindsay <aaron@os.amperecomputing.com>
---
docs/devel/tcg-plugins.rst | 9 +++-
contrib/plugins/execlog.c | 96 ++++++++++++++++++++++++++++++++------
2 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst
index a7cc44aa20..a503d44cee 100644
--- a/docs/devel/tcg-plugins.rst
+++ b/docs/devel/tcg-plugins.rst
@@ -346,7 +346,7 @@ The execlog tool traces executed instructions with memory access. It can be used
for debugging and security analysis purposes.
Please be aware that this will generate a lot of output.
-The plugin takes no argument::
+The plugin needs default argument::
qemu-system-arm $(QEMU_ARGS) \
-plugin ./contrib/plugins/libexeclog.so -d plugin
@@ -364,6 +364,13 @@ which will output an execution trace following this structure::
0, 0xd34, 0xf9c8f000, "bl #0x10c8"
0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM
+the output can be filtered to only track certain instructions or
+addresses using the `ifilter` or `afilter` options. You can stack the
+arguments if required::
+
+ qemu-system-arm $(QEMU_ARGS) \
+ -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin
+
- contrib/plugins/cache.c
Cache modelling plugin that measures the performance of a given L1 cache
diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c
index a5275dcc15..e659ac9cbb 100644
--- a/contrib/plugins/execlog.c
+++ b/contrib/plugins/execlog.c
@@ -20,6 +20,9 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
/* Store last executed instruction on each vCPU as a GString */
GArray *last_exec;
+static GPtrArray *imatches;
+static GArray *amatches;
+
/**
* Add memory read or write information to current instruction log
*/
@@ -85,12 +88,13 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata)
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
struct qemu_plugin_insn *insn;
- uint64_t insn_vaddr;
- uint32_t insn_opcode;
- char *insn_disas;
+ bool skip = (imatches || amatches) ? true : false;
size_t n = qemu_plugin_tb_n_insns(tb);
for (size_t i = 0; i < n; i++) {
+ char *insn_disas;
+ uint64_t insn_vaddr;
+
/*
* `insn` is shared between translations in QEMU, copy needed data here.
* `output` is never freed as it might be used multiple times during
@@ -99,20 +103,52 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
* a limitation for CISC architectures.
*/
insn = qemu_plugin_tb_get_insn(tb, i);
- insn_vaddr = qemu_plugin_insn_vaddr(insn);
- insn_opcode = *((uint32_t *)qemu_plugin_insn_data(insn));
insn_disas = qemu_plugin_insn_disas(insn);
- char *output = g_strdup_printf("0x%"PRIx64", 0x%"PRIx32", \"%s\"",
- insn_vaddr, insn_opcode, insn_disas);
+ insn_vaddr = qemu_plugin_insn_vaddr(insn);
+
+ /*
+ * If we are filtering we better check out if we have any
+ * hits. The skip "latches" so we can track memory accesses
+ * after the instruction we care about.
+ */
+ if (skip && imatches) {
+ int j;
+ for (j = 0; j < imatches->len && skip; j++) {
+ char *m = g_ptr_array_index(imatches, j);
+ if (g_str_has_prefix(insn_disas, m)) {
+ skip = false;
+ }
+ }
+ }
+
+ if (skip && amatches) {
+ int j;
+ for (j = 0; j < amatches->len && skip; j++) {
+ uint64_t v = g_array_index(amatches, uint64_t, j);
+ if (v == insn_vaddr) {
+ skip = false;
+ }
+ }
+ }
- /* Register callback on memory read or write */
- qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem,
- QEMU_PLUGIN_CB_NO_REGS,
- QEMU_PLUGIN_MEM_RW, NULL);
+ if (skip) {
+ g_free(insn_disas);
+ } else {
+ uint32_t insn_opcode;
+ insn_opcode = *((uint32_t *)qemu_plugin_insn_data(insn));
+ char *output = g_strdup_printf("0x%"PRIx64", 0x%"PRIx32", \"%s\"",
+ insn_vaddr, insn_opcode, insn_disas);
+
+ /* Register callback on memory read or write */
+ qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem,
+ QEMU_PLUGIN_CB_NO_REGS,
+ QEMU_PLUGIN_MEM_RW, NULL);
+
+ /* Register callback on instruction */
+ qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec,
+ QEMU_PLUGIN_CB_NO_REGS, output);
+ }
- /* Register callback on instruction */
- qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec,
- QEMU_PLUGIN_CB_NO_REGS, output);
}
}
@@ -132,6 +168,25 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
}
}
+/* Add a match to the array of matches */
+static void parse_insn_match(char *match)
+{
+ if (!imatches) {
+ imatches = g_ptr_array_new();
+ }
+ g_ptr_array_add(imatches, match);
+}
+
+static void parse_vaddr_match(char *match)
+{
+ uint64_t v = g_ascii_strtoull(match, NULL, 16);
+
+ if (!amatches) {
+ amatches = g_array_new(false, true, sizeof(uint64_t));
+ }
+ g_array_append_val(amatches, v);
+}
+
/**
* Install the plugin
*/
@@ -145,6 +200,19 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
*/
last_exec = g_array_new(FALSE, FALSE, sizeof(GString *));
+ for (int i = 0; i < argc; i++) {
+ char *opt = argv[i];
+ g_autofree char **tokens = g_strsplit(opt, "=", 2);
+ if (g_strcmp0(tokens[0], "ifilter") == 0) {
+ parse_insn_match(tokens[1]);
+ } else if (g_strcmp0(tokens[0], "afilter") == 0) {
+ parse_vaddr_match(tokens[1]);
+ } else {
+ fprintf(stderr, "option parsing failed: %s\n", opt);
+ return -1;
+ }
+ }
+
/* Register translation block and exit callbacks */
qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread