From patchwork Fri Jul 5 15:30:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 810429 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp1670236wru; Fri, 5 Jul 2024 08:39:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXCax0Tnc+5u47UMZKUF978CS+eppYrpqJM9IV2GMTAYPCHaAZNH6or59IRdqUJ0zHhyFDPrHO685xm5f5qTqd X-Google-Smtp-Source: AGHT+IGjS0dch2j636TasjKieJRphZ4IBPTHnnVrfpTOE0Fb0Wn5gcrcTe1+fB28yJ8dvPFSk0Zk X-Received: by 2002:a05:620a:29d0:b0:79d:710a:e9af with SMTP id af79cd13be357-79eee273efbmr555700585a.60.1720193961818; Fri, 05 Jul 2024 08:39:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720193961; cv=none; d=google.com; s=arc-20160816; b=ennw4x2xaruhXFyg58gOQargbelFkDe8gCEbzuC5zsp95WLH+sDivwTurKlbyxRgMl jbIjmIcyYsw8EjESKerw1xygQ0vNSBHlb268K+5Tdl94dXs0J50OYFLx7LTyrU6ZkI8f C1zwhUSs8/a6MH9CcQxJZpwaKJTQK68TIEvOJ4J++KcS3IE0U4Q8NStuiDFe3II3CxHN eNMnsXm4u2MvVvME4QlnlqvJmInAs0aKvyOSFrgvoREcIQOoXkr9Jz75GXPKEPmz/UjW Utpgkg8dIU5YjzuV3NfdxJG5clos20Th3TyR6e1rM1OyPXdhMOd6Q491mLw/sd/Oax1t vG3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Lf/1KqRAAMtl+wrn2ncS2jotaeqgCn1AGWcRKaNCTcQ=; fh=aiZZfsPL0mb5SWaIEkEIhV9A861gmKPH5EWZ09/byvk=; b=PStPBy7PYq7ZQxVgb13oicF0F8UhJXowMlu98eNAscpRQSgOR0zYoPhZ9cty0iJjYX m+3zLt5NnMrN6AbmtpUOBlIN3eJWVHO2bROM9oKz3lVqSkFheVTEL/tGaDSH7BbGYSYm fyuFZHBlD5AqQ0oh9aq0p1P6BsqPTcRkhVXzxNVjisMwj52nFDiVVNiIRVY4ll9E7iVS 8etg6fxPLhOS4qxqxDPBHABzsU9/Lx6oD8V88Cvi3iDrW2rNPFUn1FDYJOV8RVi8wKrF /gsf7rfaaGo0u+52QBkuh0fue+Nt6gjmBovUMotRFfTREIS4ww2TlPZbVZxZaYMVYJlf VIrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="evs/7AoS"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-79d69338dc8si1701689685a.591.2024.07.05.08.39.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jul 2024 08:39:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="evs/7AoS"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPl0G-00038X-AB; Fri, 05 Jul 2024 11:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPl07-0002g2-5H for qemu-devel@nongnu.org; Fri, 05 Jul 2024 11:37:31 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPkzv-0001Hz-2L for qemu-devel@nongnu.org; Fri, 05 Jul 2024 11:37:30 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a77cbb5e987so100505266b.3 for ; Fri, 05 Jul 2024 08:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720193837; x=1720798637; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lf/1KqRAAMtl+wrn2ncS2jotaeqgCn1AGWcRKaNCTcQ=; b=evs/7AoS4FzAabJJkG/Qni7EPuOAn8rQuYS9W44G7LIhu/12BhF/7YPKgNzX0YJSjQ 4H2KfNtH+Iq4BSs4t5wswEJQ0ODJDSSTgxrbDt3m7TNhzfBhGRE8BjMF3IGqs4TlEWnK w1x+x2+3Jq5gyJfaYwjygR/6D467YVFMuSkvB8D2pcX7CHQ/x06jt1gRbkQaNfjC/Z7G /QF/WggxSYUfvZelkOgVUe6DILQ6rbjBDOr3FHeIoCxHHHUBFBrBDommRiRf4sZiPlc5 SngQlntEb15zAkdHaCAfnMBKFm/28J5Nhh68QjtykSXL04z9cDDTwhgnkLEFstIU8G+c QcjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720193837; x=1720798637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lf/1KqRAAMtl+wrn2ncS2jotaeqgCn1AGWcRKaNCTcQ=; b=P1BbFa01ORhhkkeAookoJFX44IDk/BI83zxhE4yHctJGsbFlKSc8fOwOhuNsjI2wOo jx4yG6p0K0dNC8QgQbUwtAWITVbhNwkZhLB8mAtcAgF1Q3+umqS0BYx61fjHAlK+u4+v mzkQo5Efq8ukwHgdWiU/YQkhdaB81G8jLmOqGwfYvwfupILJRk3QDcAhHnOqvQwmr1Yz 9424F8G2bS+oWAf8CFgv1++noUZZ+aF5e3FxULMiWJgeDTTkUGTCeWU0wV5FL7uWqy5o K3lICuIM/UKSMRw1bbimVwPkpzK6tx24rh2R+1AZKxYMGCNKYLMxwYjn+hi2DKtO1ACQ XJBw== X-Gm-Message-State: AOJu0Yz/M5VvszwCmbrHfeEsLyyX7SDrdDo6Z/ZukxeOHRCmYKoTzdLn mMut7qYvTP1u7iSDj0DqBo7+9sWgQSTGGjwN7nRJDnfTBloSs/8tldzywUn51Qb/74xo5aa2BMh 9 X-Received: by 2002:a17:906:2514:b0:a77:cc6f:e77c with SMTP id a640c23a62f3a-a77cc6fed76mr170946166b.58.1720193837413; Fri, 05 Jul 2024 08:37:17 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77cf0b9181sm54418666b.99.2024.07.05.08.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 08:37:14 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1A3CF5F92B; Fri, 5 Jul 2024 16:30:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Manos Pitsidianakis , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 22/40] test/plugins: preserve the instruction record over translations Date: Fri, 5 Jul 2024 16:30:34 +0100 Message-Id: <20240705153052.1219696-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705153052.1219696-1-alex.bennee@linaro.org> References: <20240705153052.1219696-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We are interested in the particular instruction so we should use a stable record for it. We could bring this down to physical address but for now vaddr + disas seems to do the trick. Reviewed-by: Manos Pitsidianakis Signed-off-by: Alex Bennée Message-Id: <20240705084047.857176-23-alex.bennee@linaro.org> diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c index 524f9ddde8..baf2d07205 100644 --- a/tests/plugin/insn.c +++ b/tests/plugin/insn.c @@ -43,6 +43,44 @@ typedef struct { char *disas; } Instruction; +/* A hash table to hold matched instructions */ +static GHashTable *match_insn_records; +static GMutex match_hash_lock; + + +static Instruction * get_insn_record(const char *disas, uint64_t vaddr, Match *m) +{ + g_autofree char *str_hash = g_strdup_printf("%"PRIx64" %s", vaddr, disas); + Instruction *record; + + g_mutex_lock(&match_hash_lock); + + if (!match_insn_records) { + match_insn_records = g_hash_table_new(g_str_hash, g_str_equal); + } + + record = g_hash_table_lookup(match_insn_records, str_hash); + + if (!record) { + g_autoptr(GString) ts = g_string_new(str_hash); + + record = g_new0(Instruction, 1); + record->disas = g_strdup(disas); + record->vaddr = vaddr; + record->match = m; + + g_hash_table_insert(match_insn_records, str_hash, record); + + g_string_prepend(ts, "Created record for: "); + g_string_append(ts, "\n"); + qemu_plugin_outs(ts->str); + } + + g_mutex_unlock(&match_hash_lock); + + return record; +} + /* * Initialise a new vcpu with reading the register list */ @@ -131,16 +169,19 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) * 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. + * + * We only want one record for each occurrence of the matched + * instruction. */ if (matches->len) { char *insn_disas = qemu_plugin_insn_disas(insn); for (int 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; + Instruction *rec = get_insn_record(insn_disas, + qemu_plugin_insn_vaddr(insn), + m); + qemu_plugin_register_vcpu_insn_exec_cb( insn, vcpu_insn_matched_exec_before, QEMU_PLUGIN_CB_NO_REGS, rec); @@ -173,13 +214,38 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) qemu_plugin_u64_sum(insn_count)); } qemu_plugin_outs(out->str); - qemu_plugin_scoreboard_free(insn_count.score); + + g_mutex_lock(&match_hash_lock); + for (i = 0; i < matches->len; ++i) { Match *m = &g_array_index(matches, Match, i); + GHashTableIter iter; + Instruction *record; + qemu_plugin_u64 hit_e = qemu_plugin_scoreboard_u64_in_struct(m->counts, MatchCount, hits); + uint64_t hits = qemu_plugin_u64_sum(hit_e); + + g_string_printf(out, "Match: %s, hits %"PRId64"\n", m->match_string, hits); + qemu_plugin_outs(out->str); + + g_hash_table_iter_init(&iter, match_insn_records); + while (g_hash_table_iter_next(&iter, NULL, (void **)&record)) { + if (record->match == m) { + g_string_printf(out, + " %"PRIx64": %s (hits %"PRId64")\n", + record->vaddr, + record->disas, + record->hits); + qemu_plugin_outs(out->str); + } + } + g_free(m->match_string); qemu_plugin_scoreboard_free(m->counts); } + + g_mutex_unlock(&match_hash_lock); + g_array_free(matches, TRUE); g_array_free(sizes, TRUE); }