From nobody Thu May 2 10:45:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622356771; cv=none; d=zohomail.com; s=zohoarc; b=kT0YDMGs5wfGxq7nqnErmlzo5BIWyjaof3k8rvZ1V/BMOyh5pCkOa3qPT/lCdTs8A1W3vhar/4jA50xY7kZPiv9eedJutI6vkgOZd3ZVvu1c4f+mk/0xt6P4l91ECvLID9yilZ/Dc2J8+yDhy9elCOCgsiclzjfhu3gDmVPDLag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622356771; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yvEabpcUTl0Qt5jwQNRyDTBskFSf3o5RtluYMtioCjM=; b=MQJtpA249E40nSCWbnaaXg8SI2W4cxjG8X9UTfp9fwI1ZnZnFxT6dKkKXo3+diWUyYfIuMoIOzb+Sc2BJfoW9BmPlC2qQaxeiPMNLHOWbE3BNoEJaVfY1vBOzriKZF6chHpwDK4m33ZLE9+ARTIhrH9K4tGri3c7STdJXG9pDfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162235677137663.29806744754262; Sat, 29 May 2021 23:39:31 -0700 (PDT) Received: from localhost ([::1]:33918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnF6e-0006B2-Cv for importer2@patchew.org; Sun, 30 May 2021 02:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnF4k-00044G-WD for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnF4h-0003DL-2E for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:30 -0400 Received: by mail-wm1-x32f.google.com with SMTP id f17so2940507wmf.2 for ; Sat, 29 May 2021 23:37:26 -0700 (PDT) Received: from localhost.localdomain ([102.44.10.239]) by smtp.gmail.com with ESMTPSA id 3sm2732431wmi.7.2021.05.29.23.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 23:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yvEabpcUTl0Qt5jwQNRyDTBskFSf3o5RtluYMtioCjM=; b=PgmBQ4TQlZ+czwufAAqDJ8WRzvYrOD68oQRCrLkPKCe4tnX37ZwYKSFTXxEspprr16 1S7ry7qbywcMbf2Z1O1reFH3sbXyLysExhRlJgliNmnGik5A0DdYxMUb6bvt4z4yOGfU vyXJDZzPZ3t+SeZqMcVw4z1Ykv1qc6f7O3B41KDkeqrdywmPwPi9wT3B2+dCxNmvpijN m0tphWkZg+teSXVq68dno37ITWXLfNNPmdMtn6mSIMcfi4FkDLqxLwJTW1nOHae0uqTG 6WJ9Sa+7wRub2rfkvzkH9cbdIDMGB586sFzHZ8GDE6N58zZ1diW0jJP8ppviQcSzZC1K MoLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yvEabpcUTl0Qt5jwQNRyDTBskFSf3o5RtluYMtioCjM=; b=pBfB/FCrejk8ucxa9h16WQbOarT5HOGAiIEsRzTC4/KSeABKmnV9ey7nT862wVQPH+ dn8hOAS5HNNmbj+TzPb5oqyDisZLaELxTUw5ybCjh7/XGr4ihBiqk9e3UdvFwOncewZD hO2ux8JA5oABC1/ipvJDr6gKsGkpRz3/pUkOpZwd6imwSPXqxWuf5hdjwE66KAe+b83F vxvEEDmrQUlbHyjoTkKT0O3zgLj8Rmr6JmbQW+GaKnBaEKI3Z/04kd6rgoPpjQa2qzuN fh7i7Or3FDEj45OFxOu5zkREffICHNr5dzn3Isxyf5fPB/DFIQfOwnXc4XMddGTL5J+E N6Mw== X-Gm-Message-State: AOAM532WuZ85Pvc/4D8G/Amw3SWSYOCFP0hrGaRiioWfeBbIVnZ65x5e isIWufxyOd6vjupu4+BCo5DimzeZ8h4wgA== X-Google-Smtp-Source: ABdhPJyMnvaFZBWssla59P6xN2NDl5i74H2A6MqofKYMrkurwYawqf8NduE2GvlrpSWIvvWTAm7KPQ== X-Received: by 2002:a05:600c:284:: with SMTP id 4mr16566104wmk.124.1622356645406; Sat, 29 May 2021 23:37:25 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 1/3] plugins: Added a new cache modelling plugin Date: Sun, 30 May 2021 08:37:10 +0200 Message-Id: <20210530063712.6832-2-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210530063712.6832-1-ma.mandourr@gmail.com> References: <20210530063712.6832-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x32f.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Added a cache modelling plugin that uses a static configuration used in many of the commercial microprocessors and uses random eviction policy. Signed-off-by: Mahmoud Mandour --- contrib/plugins/Makefile | 1 + contrib/plugins/cache.c | 398 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 399 insertions(+) create mode 100644 contrib/plugins/cache.c diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b9d7935e5e..2237b47f8b 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -18,6 +18,7 @@ NAMES +=3D hotpages NAMES +=3D howvec NAMES +=3D lockstep NAMES +=3D hwprofile +NAMES +=3D cache =20 SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c new file mode 100644 index 0000000000..8c9d1dd538 --- /dev/null +++ b/contrib/plugins/cache.c @@ -0,0 +1,398 @@ +/* + * Copyright (C) 2021, Mahmoud Mandour + * + * License: GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; + +static GRand *rng; +static GHashTable *dmiss_ht; +static GHashTable *imiss_ht; + +static GMutex dmtx, imtx; + +static int limit; +static bool sys; + +static uint64_t dmem_accesses; +static uint64_t dmisses; + +static uint64_t imem_accesses; +static uint64_t imisses; + +static enum qemu_plugin_mem_rw rw =3D QEMU_PLUGIN_MEM_RW; + +enum AccessResult { + HIT =3D 0, + MISS =3D 1 +}; + +struct InsnData { + char *disas_str; + uint64_t addr; + uint64_t misses; +}; + +struct CacheBlock { + uint64_t tag; + bool valid; +}; + +struct CacheSet { + struct CacheBlock *blocks; +}; + +struct Cache { + struct CacheSet *sets; + int num_sets; + + int cachesize; + int blksize; + int assoc; + + uint64_t blk_mask; + uint64_t set_mask; + uint64_t tag_mask; +}; + +struct Cache *dcache, *icache; + +static int pow_of_two(int num) +{ + g_assert((num & (num - 1)) =3D=3D 0); + int ret =3D 0; + while (num /=3D 2) { + ret++; + } + return ret; +} + +static inline uint64_t extract_tag(struct Cache *cache, uint64_t addr) +{ + return (addr & cache->tag_mask) >> + (pow_of_two(cache->num_sets) + pow_of_two(cache->blksize)); +} + +static inline uint64_t extract_set(struct Cache *cache, uint64_t addr) +{ + return (addr & cache->set_mask) >> (pow_of_two(cache->blksize)); +} + +static struct Cache *cache_init(int blksize, int assoc, int cachesize) +{ + struct Cache *cache; + int i; + + cache =3D g_new(struct Cache, 1); + cache->blksize =3D blksize; + cache->assoc =3D assoc; + cache->cachesize =3D cachesize; + cache->num_sets =3D cachesize / (blksize * assoc); + cache->sets =3D g_new(struct CacheSet, cache->num_sets); + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].blocks =3D g_new0(struct CacheBlock, assoc); + } + + cache->blk_mask =3D blksize - 1; + cache->set_mask =3D ((cache->num_sets - 1) << (pow_of_two(cache->blksi= ze))); + cache->tag_mask =3D ~(cache->set_mask | cache->blk_mask); + + return cache; +} + +static int get_invalid_block(struct Cache *cache, uint64_t set) +{ + int i; + + for (i =3D 0; i < cache->assoc; i++) { + if (!cache->sets[set].blocks[i].valid) { + /* conflict miss */ + return i; + } + } + + /* compulsary miss */ + return -1; +} + +static int get_replaced_block(struct Cache *cache) +{ + return g_rand_int_range(rng, 0, cache->assoc); +} + +static bool in_cache(struct Cache *cache, uint64_t addr) +{ + int i; + uint64_t tag, set; + + tag =3D extract_tag(cache, addr); + set =3D extract_set(cache, addr); + + for (i =3D 0; i < cache->assoc; i++) { + if (cache->sets[set].blocks[i].tag =3D=3D tag && + cache->sets[set].blocks[i].valid) { + return true; + } + } + + return false; +} + +static enum AccessResult access_cache(struct Cache *cache, uint64_t addr) +{ + uint64_t tag, set; + int replaced_blk; + + if (in_cache(cache, addr)) { + return HIT; + } + + tag =3D extract_tag(cache, addr); + set =3D extract_set(cache, addr); + + replaced_blk =3D get_invalid_block(cache, set); + + if (replaced_blk =3D=3D -1) { + replaced_blk =3D get_replaced_block(cache); + } + + cache->sets[set].blocks[replaced_blk].tag =3D tag; + cache->sets[set].blocks[replaced_blk].valid =3D true; + + return MISS; +} + +struct InsnData *get_or_create(GHashTable *ht, struct InsnData *insn_data, + uint64_t addr) +{ + struct InsnData *insn =3D g_hash_table_lookup(ht, GUINT_TO_POINTER(add= r)); + if (!insn) { + g_hash_table_insert(ht, GUINT_TO_POINTER(addr), (gpointer) insn_da= ta); + insn =3D insn_data; + } + + return insn; +} + +static void vcpu_mem_access(unsigned int cpu_index, qemu_plugin_meminfo_t = info, + uint64_t vaddr, void *userdata) +{ + uint64_t insn_addr; + uint64_t effective_addr; + struct qemu_plugin_hwaddr *hwaddr; + + g_mutex_lock(&dmtx); + hwaddr =3D qemu_plugin_get_hwaddr(info, vaddr); + if (hwaddr && qemu_plugin_hwaddr_is_io(hwaddr)) { + g_mutex_unlock(&dmtx); + return; + } + + insn_addr =3D ((struct InsnData *) userdata)->addr; + effective_addr =3D hwaddr ? qemu_plugin_hwaddr_phys_addr(hwaddr) : vad= dr; + + if (access_cache(dcache, effective_addr) =3D=3D MISS) { + struct InsnData *insn =3D get_or_create(dmiss_ht, userdata, insn_a= ddr); + insn->misses++; + dmisses++; + } + dmem_accesses++; + g_mutex_unlock(&dmtx); +} + +static void vcpu_insn_exec(unsigned int vcpu_index, void *userdata) +{ + uint64_t addr; + + g_mutex_lock(&imtx); + addr =3D ((struct InsnData *) userdata)->addr; + + if (access_cache(icache, addr) =3D=3D MISS) { + struct InsnData *insn =3D get_or_create(imiss_ht, userdata, addr); + insn->misses++; + imisses++; + } + imem_accesses++; + g_mutex_unlock(&imtx); +} + +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) +{ + size_t n_insns; + size_t i; + + n_insns =3D qemu_plugin_tb_n_insns(tb); + for (i =3D 0; i < n_insns; i++) { + struct qemu_plugin_insn *insn =3D qemu_plugin_tb_get_insn(tb, i); + uint64_t effective_addr; + + if (sys) { + effective_addr =3D (uint64_t) qemu_plugin_insn_haddr(insn); + } else { + effective_addr =3D (uint64_t) qemu_plugin_insn_vaddr(insn); + } + + struct InsnData *ddata =3D g_new(struct InsnData, 1); + struct InsnData *idata =3D g_new(struct InsnData, 1); + + ddata->disas_str =3D qemu_plugin_insn_disas(insn); + ddata->misses =3D 0; + ddata->addr =3D effective_addr; + + idata->disas_str =3D g_strdup(ddata->disas_str); + idata->misses =3D 0; + idata->addr =3D effective_addr; + + qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem_access, + QEMU_PLUGIN_CB_NO_REGS, + rw, ddata); + + qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, + QEMU_PLUGIN_CB_NO_REGS, ida= ta); + } +} + +static void print_entry(gpointer data) +{ + struct InsnData *insn =3D (struct InsnData *) data; + g_autoptr(GString) xx =3D g_string_new(""); + g_string_append_printf(xx, "0x%" PRIx64 ": %s - misses: %lu\n", + insn->addr, insn->disas_str, insn->misses); + qemu_plugin_outs(xx->str); +} + +static void free_insn(gpointer data) +{ + struct InsnData *insn =3D (struct InsnData *) data; + g_free(insn->disas_str); + g_free(insn); +} + +static void free_cache(struct Cache *cache) +{ + for (int i =3D 0; i < cache->num_sets; i++) { + g_free(cache->sets[i].blocks); + } + + g_free(cache->sets); +} + +static int cmp(gconstpointer a, gconstpointer b) +{ + struct InsnData *insn_a =3D (struct InsnData *) a; + struct InsnData *insn_b =3D (struct InsnData *) b; + + return insn_a->misses < insn_b->misses ? 1 : -1; +} + +static void print_stats() +{ + g_autoptr(GString) rep =3D g_string_new(""); + g_string_append_printf(rep, + "Data accesses: %lu, Misses: %lu\nMiss rate: %lf%%\n\n", + dmem_accesses, + dmisses, + ((double)dmisses / dmem_accesses) * 100.0); + + g_string_append_printf(rep, + "Instruction accesses: %lu, Misses: %lu\nMiss rate: %lf%%\n\n", + imem_accesses, + imisses, + ((double)imisses / imem_accesses) * 100.0); + + qemu_plugin_outs(rep->str); +} + +static void plugin_exit() +{ + GList *curr; + int i; + + g_mutex_lock(&imtx); + g_mutex_lock(&dmtx); + GList *dmiss_insns =3D g_hash_table_get_values(dmiss_ht); + GList *imiss_insns =3D g_hash_table_get_values(imiss_ht); + dmiss_insns =3D g_list_sort(dmiss_insns, cmp); + imiss_insns =3D g_list_sort(imiss_insns, cmp); + + print_stats(); + + qemu_plugin_outs("Most data-missing instructions\n"); + for (curr =3D dmiss_insns, i =3D 0; curr && i < limit; i++, curr =3D c= urr->next) { + print_entry(curr->data); + } + + qemu_plugin_outs("\nMost fetch-missing instructions\n"); + for (curr =3D imiss_insns, i =3D 0; curr && i < limit; i++, curr =3D c= urr->next) { + print_entry(curr->data); + } + + free_cache(dcache); + free_cache(icache); + + g_list_free(dmiss_insns); + g_list_free(imiss_insns); + + g_hash_table_destroy(dmiss_ht); + g_hash_table_destroy(imiss_ht); + + g_mutex_unlock(&dmtx); + g_mutex_unlock(&imtx); +} + +QEMU_PLUGIN_EXPORT +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, + int argc, char **argv) +{ + int i; + int iassoc, iblksize, icachesize; + int dassoc, dblksize, dcachesize; + + limit =3D 32; + sys =3D info->system_emulation; + + dassoc =3D 8; + dblksize =3D 64; + dcachesize =3D dblksize * dassoc * 32; + + iassoc =3D 8; + iblksize =3D 64; + icachesize =3D iblksize * iassoc * 32; + + rng =3D g_rand_new(); + + for (i =3D 0; i < argc; i++) { + char *opt =3D argv[i]; + if (g_str_has_prefix(opt, "limit=3D")) { + limit =3D g_ascii_strtoull(opt + 6, NULL, 10); + } else { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + } + + dcache =3D cache_init(dblksize, dassoc, dcachesize); + icache =3D cache_init(iblksize, iassoc, icachesize); + + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); + + dmiss_ht =3D g_hash_table_new_full(NULL, g_direct_equal, NULL, free_in= sn); + imiss_ht =3D g_hash_table_new_full(NULL, g_direct_equal, NULL, free_in= sn); + + return 0; +} --=20 2.25.1 From nobody Thu May 2 10:45:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622356932; cv=none; d=zohomail.com; s=zohoarc; b=M8WiGUwabWOrAvmleOv8aIy/Ne/GidnuVVB9SbpC6LOgRFRJ0iXd6PxgC8viEu3fvFwK20FmFF3tDfUhhKijVO2BIVnKB7oyGs3Qq25k9w/E+zAbkjtMqEQj3+s0hOQwICfDNF4q9SVacsIu5JKV0i2eYrQsw4whkBdNyqI/Qq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622356932; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yJpEnBBLwnL7hxOOCxZgHivdNATscGG91R17yNlKa78=; b=gO9A1O02vI9runLP7vnHZwWvKpgI1Ld4SZwdlkcN1GL6hXjtG6cHbhqhfI6lXvoEUaDnv4BVDn3SiJmk01vZp6cB1duJpXvbkUebpUxyr2KoL7YhRui5d4uJH2ll10l8WDWy61wAzakKyBphr/ZGiDeN/FV6ii+MhiRV9plMqA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622356932883112.15536867551077; Sat, 29 May 2021 23:42:12 -0700 (PDT) Received: from localhost ([::1]:38870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnF9A-0001Jf-7v for importer2@patchew.org; Sun, 30 May 2021 02:42:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnF4l-00044X-8O for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:32 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:52002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnF4i-0003Er-7L for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:31 -0400 Received: by mail-wm1-x333.google.com with SMTP id r13so3879092wmq.1 for ; Sat, 29 May 2021 23:37:27 -0700 (PDT) Received: from localhost.localdomain ([102.44.10.239]) by smtp.gmail.com with ESMTPSA id 3sm2732431wmi.7.2021.05.29.23.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 23:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yJpEnBBLwnL7hxOOCxZgHivdNATscGG91R17yNlKa78=; b=UDmPuqq0dZQV84kkkC1JbsJkiR7rHK0Dvw3yba9mVGJOB9Vid6CqOHm7+nujPvHIOR XEuvmRvol0f6aZBDc3Zg8XnruDpjb2HmVYKab9ZWyzVMwmm/4m2TaqUoEypY2jMpJxKA 3x0nj0nqEc8qxXE751hBKMD/rdjsA/DO7YDiMTQLpSMDaP1fr1PeA0h0N0StwgrCb0sK 4Nu4gAivQVob4K7iS9EShwxJGSPU5LTVuokSWJV4dqYOmF0LC19Syo8t93zLrw7trf/O 9v5wHJEgbIa696S5ZtEMbv0642cYdSugINa2rBqdEEP/7dx9bv4XpxRWQWGWNOdFJVu7 IH5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yJpEnBBLwnL7hxOOCxZgHivdNATscGG91R17yNlKa78=; b=SMHmt9otdRKtcBjzDEc4xgjivHHSNajuQiaPwAMFm6KBLiN4K8Uv1++vmnSua7Eb1Q HnmDhOkslnF9Nh31rPh2bCKtTnTfhDcjA3pmpfUV/YzMtcp5wqtp/Oklpl7caqzecSik bY1IaRJBoWB74CAJ6y6T3wAHj+g13Ef+aVNfafcVcykK4PhjGQgLYtojiTYH6YtGsvK+ RlRCOlmQ0XEOGb2bHcG7dVa4u9A6pB25W6avxxibZZiBPlVNQT0bzQBmmjElGFOwryt8 M7yXzYjrQV99YhhrlOAuhopcLDUJsoPEi1xsi8C8hp6NrKAmREaPiJ4yYuXZww76FH1F Y7KQ== X-Gm-Message-State: AOAM5339tXm39uLYj5DzylAE5oUAS9YcrSMS3XI7hZHSVP7JzP8XE9x5 dUkJKtysTo0EC7cJYrD5AYG6fIN93YaBhA== X-Google-Smtp-Source: ABdhPJyBZAr0qtj2vivIfRPcoEeWbRzGdST+BiuQIdP7ob9c512uyGSRYvBW/mUjqTjtNIdYZHLS/w== X-Received: by 2002:a7b:c207:: with SMTP id x7mr8416712wmi.42.1622356646560; Sat, 29 May 2021 23:37:26 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 2/3] plugins: cache: Enabled parameterization and added trace printing Date: Sun, 30 May 2021 08:37:11 +0200 Message-Id: <20210530063712.6832-3-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210530063712.6832-1-ma.mandourr@gmail.com> References: <20210530063712.6832-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x333.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Made both icache and dcache configurable through plugin arguments and added memory trace printing in a separate file. Signed-off-by: Mahmoud Mandour --- contrib/plugins/cache.c | 68 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index 8c9d1dd538..fa0bf1dd40 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -22,7 +22,7 @@ static GRand *rng; static GHashTable *dmiss_ht; static GHashTable *imiss_ht; =20 -static GMutex dmtx, imtx; +static GMutex dmtx, imtx, fmtx; =20 static int limit; static bool sys; @@ -33,6 +33,8 @@ static uint64_t dmisses; static uint64_t imem_accesses; static uint64_t imisses; =20 +FILE *tracefile; + static enum qemu_plugin_mem_rw rw =3D QEMU_PLUGIN_MEM_RW; =20 enum AccessResult { @@ -205,6 +207,16 @@ static void vcpu_mem_access(unsigned int cpu_index, qe= mu_plugin_meminfo_t info, insn_addr =3D ((struct InsnData *) userdata)->addr; effective_addr =3D hwaddr ? qemu_plugin_hwaddr_phys_addr(hwaddr) : vad= dr; =20 + if (tracefile) { + g_mutex_lock(&fmtx); + g_autoptr(GString) rep =3D g_string_new(""); + bool is_store =3D qemu_plugin_mem_is_store(info); + g_string_append_printf(rep, "%c: 0x%" PRIx64, + is_store ? 'S' : 'L', effective_addr); + fprintf(tracefile, "%s\n", rep->str); + g_mutex_unlock(&fmtx); + } + if (access_cache(dcache, effective_addr) =3D=3D MISS) { struct InsnData *insn =3D get_or_create(dmiss_ht, userdata, insn_a= ddr); insn->misses++; @@ -221,11 +233,20 @@ static void vcpu_insn_exec(unsigned int vcpu_index, v= oid *userdata) g_mutex_lock(&imtx); addr =3D ((struct InsnData *) userdata)->addr; =20 + if (tracefile) { + g_mutex_lock(&fmtx); + g_autoptr(GString) rep =3D g_string_new(""); + g_string_append_printf(rep, "I: 0x%" PRIx64, addr); + fprintf(tracefile, "%s\n", rep->str); + g_mutex_unlock(&fmtx); + } + if (access_cache(icache, addr) =3D=3D MISS) { struct InsnData *insn =3D get_or_create(imiss_ht, userdata, addr); insn->misses++; imisses++; } + imem_accesses++; g_mutex_unlock(&imtx); } @@ -352,6 +373,15 @@ static void plugin_exit() =20 g_mutex_unlock(&dmtx); g_mutex_unlock(&imtx); + + if (tracefile) { + fclose(tracefile); + } +} + +static bool bad_cache_params(int blksize, int assoc, int cachesize) +{ + return (cachesize % blksize) !=3D 0 || (cachesize % (blksize * assoc) = !=3D 0); } =20 QEMU_PLUGIN_EXPORT @@ -377,14 +407,48 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qe= mu_info_t *info, =20 for (i =3D 0; i < argc; i++) { char *opt =3D argv[i]; - if (g_str_has_prefix(opt, "limit=3D")) { + if (g_str_has_prefix(opt, "I=3D")) { + gchar **toks =3D g_strsplit(opt + 2, " ", -1); + if (g_strv_length(toks) !=3D 3) { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + icachesize =3D g_ascii_strtoull(toks[0], NULL, 10); + iassoc =3D g_ascii_strtoull(toks[1], NULL, 10); + iblksize =3D g_ascii_strtoull(toks[2], NULL, 10); + } else if (g_str_has_prefix(opt, "D=3D")) { + gchar **toks =3D g_strsplit(opt + 2, " ", -1); + if (g_strv_length(toks) !=3D 3) { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + dcachesize =3D g_ascii_strtoull(toks[0], NULL, 10); + dassoc =3D g_ascii_strtoull(toks[1], NULL, 10); + dblksize =3D g_ascii_strtoull(toks[2], NULL, 10); + } else if (g_str_has_prefix(opt, "limit=3D")) { limit =3D g_ascii_strtoull(opt + 6, NULL, 10); + } else if (g_str_has_prefix(opt, "tracefile=3D")) { + char *file_name =3D opt + 10; + tracefile =3D fopen(file_name, "w"); + if (!tracefile) { + fprintf(stderr, "could not open: %s for writing\n", file_n= ame); + } } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; } } =20 + if (bad_cache_params(iblksize, iassoc, icachesize)) { + fprintf(stderr, "icache cannot be constructed from given parameter= s\n"); + return -1; + } + + if (bad_cache_params(dblksize, dassoc, dcachesize)) { + fprintf(stderr, "dcache cannot be constructed from given parameter= s\n"); + return -1; + } + dcache =3D cache_init(dblksize, dassoc, dcachesize); icache =3D cache_init(iblksize, iassoc, icachesize); =20 --=20 2.25.1 From nobody Thu May 2 10:45:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1622356926; cv=none; d=zohomail.com; s=zohoarc; b=Ln1D2T+X8wqHNu33AOKdXz0AWtybQtPhrWC+kuOI++6/KrwLl9esniot14Q6KQwB+Cep7ZWLW5v/8g3ZMYT3M6v+VQMT09LDiwakYznn7ErBTjA7UkbAzCEe5T9MyrYlngXm5Oyu/E76Q78tlAPYm/wkkW2FlQgjhEAytMQCNEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622356926; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cVTPwQwflpe4piyEUHshgApfl+04ygAk1IhMHs13rIU=; b=CRn7sCvrCXCxffNoNjPqdX4I2PEdLtwoNjfCzqXrZ2RMq0bqG3YcJMmxOBke8VxXYnRgvq/gdztq4AFpZUD9ToFDB7Fu0aWYZblobzf0tUazOesrlHWeC1f/0WYrQAag3HnOkaCAiQuEM9EGFhJMJY4IjbEuNCBy63N8KRmbtA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162235692659413.355883468721913; Sat, 29 May 2021 23:42:06 -0700 (PDT) Received: from localhost ([::1]:38708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnF97-0001By-Np for importer2@patchew.org; Sun, 30 May 2021 02:42:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnF4n-00044x-Lw for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:34 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:41897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnF4j-0003FD-Qj for qemu-devel@nongnu.org; Sun, 30 May 2021 02:37:33 -0400 Received: by mail-wr1-x434.google.com with SMTP id c3so7440173wrp.8 for ; Sat, 29 May 2021 23:37:29 -0700 (PDT) Received: from localhost.localdomain ([102.44.10.239]) by smtp.gmail.com with ESMTPSA id 3sm2732431wmi.7.2021.05.29.23.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 May 2021 23:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cVTPwQwflpe4piyEUHshgApfl+04ygAk1IhMHs13rIU=; b=lPhMI1kR3p/W5fw01X0H8+voxQELdXAfXjSRS9kaRwIK6BP8A7+vi3BOR2N8iAjSbU MZVkKawIkhY7uNCeIAhtVy0eUykarATpLBwLKKPhCemHqMCJlg6tfPMMUAEcd3XXguPE Vf2utcHuC6E9qS2Tpcv5fl8IWUfajlhM5UMVbQVZarU9gGtk/NTYEixtnVFPV6S+BiqS +tsrEFbWjm5PXDkeCIcz6CDd9f70Of21CrcQbF6jegT/CioOMOD+UpsWvavH7VxBzgwf BleGmGsIL17AFogMxjA8NvUrZ8LVqS1ZHH75azigHhBwtmjQBuyq8o4H42Nlmeup67Pk q36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cVTPwQwflpe4piyEUHshgApfl+04ygAk1IhMHs13rIU=; b=DDmdlS3QJTGDuZupuP9YaiXKn5dbqrNkNRUeOVDGqNOouUgX+fDijFnReFBPpVhvCr oi/Zx90VYPY2j6HyvqRV8vKsGtCkBoI4d+vMHpdBkQnliSea5L3svP9r6HeYgrpx3EYb HZZ42Ceey0OCEWXhKDWnb0mS1nj2VctgNvIRp4K1qqX3fR6cUersNgW5kEbJzvkoQxbK BnKtIbUNDwRt/yQPCEZ6qif+GgLQ0RITQd8NhwcarjMq0G15jAobqZk29nvrolpxm11+ /AG3vRUBksfnNqvPZpNXoG/DfjR/LCnDeX7xit5Ssj2pnuI7Cs1xn3JKW+4if5PZwoqu 8JWg== X-Gm-Message-State: AOAM533nm76w988ktme/0b+xqHy4bc4432ejHok38TRRfoGWw1NS1OV5 a01EdIroAzoPlb8QMIjQtdZ3T/5OxkRAAQ== X-Google-Smtp-Source: ABdhPJwbGU1b7ssjOtznvu/IdYjIUtYoPq+3ed3BQvo3f3P74rm/YwmD4FTwHFm6SuNGpbX6rOQOVw== X-Received: by 2002:adf:ed0d:: with SMTP id a13mr15935570wro.371.1622356647692; Sat, 29 May 2021 23:37:27 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 3/3] plugins: cache: Added FIFO and LRU eviction policies. Date: Sun, 30 May 2021 08:37:12 +0200 Message-Id: <20210530063712.6832-4-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210530063712.6832-1-ma.mandourr@gmail.com> References: <20210530063712.6832-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=ma.mandourr@gmail.com; helo=mail-wr1-x434.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mahmoud Mandour , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Now one of the three eviction policies can be chosen as an argument. On not specifying an argument, LRU is used by default. Signed-off-by: Mahmoud Mandour --- contrib/plugins/cache.c | 159 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 146 insertions(+), 13 deletions(-) diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c index fa0bf1dd40..1e323494bf 100644 --- a/contrib/plugins/cache.c +++ b/contrib/plugins/cache.c @@ -18,6 +18,8 @@ =20 QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUGIN_VERSION; =20 +static bool fifo, lru, rnd; + static GRand *rng; static GHashTable *dmiss_ht; static GHashTable *imiss_ht; @@ -55,6 +57,8 @@ struct CacheBlock { =20 struct CacheSet { struct CacheBlock *blocks; + uint16_t *priorities; + GQueue *evict_queue; }; =20 struct Cache { @@ -93,6 +97,84 @@ static inline uint64_t extract_set(struct Cache *cache, = uint64_t addr) return (addr & cache->set_mask) >> (pow_of_two(cache->blksize)); } =20 +static void lru_priorities_init(struct Cache *cache) +{ + int i, j; + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].priorities =3D g_new(uint16_t, cache->assoc); + for (j =3D 0; j < cache->assoc; j++) { + cache->sets[i].priorities[j] =3D cache->assoc - j - 1; + } + } +} + +static void lru_update_on_miss(struct Cache *cache, + int set_idx, + int blk_idx) +{ + int i; + + for (i =3D 0; i < cache->assoc; i++) { + cache->sets[set_idx].priorities[i]++; + } + + cache->sets[set_idx].priorities[blk_idx] =3D 0; +} + +static void lru_update_on_hit(struct Cache *cache, + int set_idx, + int blk_idx) +{ + uint16_t blk_priority; + int i; + + blk_priority =3D cache->sets[set_idx].priorities[blk_idx]; + for (i =3D 0; i < cache->assoc; i++) { + if (cache->sets[set_idx].priorities[i] < blk_priority) { + cache->sets[set_idx].priorities[i]++; + } + } + cache->sets[set_idx].priorities[blk_idx] =3D 0; +} + +static int lru_get_lru_block(struct Cache *cache, int set_idx) +{ + int i; + + for (i =3D 0; i < cache->assoc; i++) { + if (cache->sets[set_idx].priorities[i] =3D=3D cache->assoc - 1) { + return i; + } + } + + g_assert_not_reached(); +} + +static void fifo_init(struct Cache *cache) +{ + int i; + + for (i =3D 0; i < cache->num_sets; i++) { + cache->sets[i].evict_queue =3D g_queue_new(); + } +} + +static int fifo_get_first_in_block(struct Cache *cache, int set) +{ + GQueue *q =3D cache->sets[set].evict_queue; + return GPOINTER_TO_INT(g_queue_pop_tail(q)); +} + +static void fifo_update_on_miss(struct Cache *cache, + int set, + int blk_idx) +{ + GQueue *q =3D cache->sets[set].evict_queue; + g_queue_push_head(q, GINT_TO_POINTER(blk_idx)); +} + + static struct Cache *cache_init(int blksize, int assoc, int cachesize) { struct Cache *cache; @@ -113,6 +195,12 @@ static struct Cache *cache_init(int blksize, int assoc= , int cachesize) cache->set_mask =3D ((cache->num_sets - 1) << (pow_of_two(cache->blksi= ze))); cache->tag_mask =3D ~(cache->set_mask | cache->blk_mask); =20 + if (lru) { + lru_priorities_init(cache); + } else if (fifo) { + fifo_init(cache); + } + return cache; } =20 @@ -131,12 +219,20 @@ static int get_invalid_block(struct Cache *cache, uin= t64_t set) return -1; } =20 -static int get_replaced_block(struct Cache *cache) +static int get_replaced_block(struct Cache *cache, int set) { - return g_rand_int_range(rng, 0, cache->assoc); + if (rnd) { + return g_rand_int_range(rng, 0, cache->assoc); + } else if (lru) { + return lru_get_lru_block(cache, set); + } else if (fifo) { + return fifo_get_first_in_block(cache, set); + } + + g_assert_not_reached(); } =20 -static bool in_cache(struct Cache *cache, uint64_t addr) +static int in_cache(struct Cache *cache, uint64_t addr) { int i; uint64_t tag, set; @@ -147,29 +243,39 @@ static bool in_cache(struct Cache *cache, uint64_t ad= dr) for (i =3D 0; i < cache->assoc; i++) { if (cache->sets[set].blocks[i].tag =3D=3D tag && cache->sets[set].blocks[i].valid) { - return true; + return i; } } =20 - return false; + return -1; } =20 static enum AccessResult access_cache(struct Cache *cache, uint64_t addr) { uint64_t tag, set; - int replaced_blk; - - if (in_cache(cache, addr)) { - return HIT; - } + int hit_blk, replaced_blk; =20 tag =3D extract_tag(cache, addr); set =3D extract_set(cache, addr); + hit_blk =3D in_cache(cache, addr); + + if (hit_blk !=3D -1) { + if (lru) { + lru_update_on_hit(cache, set, hit_blk); + } + return HIT; + } =20 replaced_blk =3D get_invalid_block(cache, set); =20 if (replaced_blk =3D=3D -1) { - replaced_blk =3D get_replaced_block(cache); + replaced_blk =3D get_replaced_block(cache, set); + } + + if (lru) { + lru_update_on_miss(cache, set, replaced_blk); + } else if (fifo) { + fifo_update_on_miss(cache, set, replaced_blk); } =20 cache->sets[set].blocks[replaced_blk].tag =3D tag; @@ -307,6 +413,11 @@ static void free_cache(struct Cache *cache) { for (int i =3D 0; i < cache->num_sets; i++) { g_free(cache->sets[i].blocks); + if (lru) { + g_free(cache->sets[i].priorities); + } else if (fifo) { + g_queue_free(cache->sets[i].evict_queue); + } } =20 g_free(cache->sets); @@ -403,8 +514,6 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu= _info_t *info, iblksize =3D 64; icachesize =3D iblksize * iassoc * 32; =20 - rng =3D g_rand_new(); - for (i =3D 0; i < argc; i++) { char *opt =3D argv[i]; if (g_str_has_prefix(opt, "I=3D")) { @@ -433,6 +542,22 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qem= u_info_t *info, if (!tracefile) { fprintf(stderr, "could not open: %s for writing\n", file_n= ame); } + } else if (g_str_has_prefix(opt, "evict=3D")) { + if (lru || rnd || fifo) { + fprintf(stderr, "eviction policy specified more than once\= n"); + return -1; + } + gchar *policy =3D opt + 6; + if (g_strcmp0(policy, "rand") =3D=3D 0) { + rnd =3D true; + } else if (g_strcmp0(policy, "lru") =3D=3D 0) { + lru =3D true; + } else if (g_strcmp0(policy, "fifo") =3D=3D 0) { + fifo =3D true; + } else { + fprintf(stderr, "invalid eviction policy: %s\n", opt); + return -1; + } } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1; @@ -449,6 +574,14 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qem= u_info_t *info, return -1; } =20 + if (!rnd && !lru && !fifo) { + lru =3D true; + } + + if (rnd) { + rng =3D g_rand_new(); + } + dcache =3D cache_init(dblksize, dassoc, dcachesize); icache =3D cache_init(iblksize, iassoc, icachesize); =20 --=20 2.25.1