From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, minyihh@uci.edu, berrange@redhat.com,
kuhn.chenqun@huawei.com, f4bug@amsat.org, robhenry@microsoft.com,
mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com,
cota@braap.org, stefanha@redhat.com, crosa@redhat.com,
pbonzini@redhat.com, ma.mandourr@gmail.com,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
aurelien@aurel32.net
Subject: [PATCH v2 36/39] plugins/cache: Enable cache parameterization
Date: Thu, 8 Jul 2021 20:09:38 +0100 [thread overview]
Message-ID: <20210708190941.16980-37-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org>
From: Mahmoud Mandour <ma.mandourr@gmail.com>
Enabled configuring both icache and dcache parameters using plugin
parameters.
Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623125458.450462-3-ma.mandourr@gmail.com>
---
contrib/plugins/cache.c | 47 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/contrib/plugins/cache.c b/contrib/plugins/cache.c
index e9955cdc3a..b550ef31b0 100644
--- a/contrib/plugins/cache.c
+++ b/contrib/plugins/cache.c
@@ -99,8 +99,28 @@ static inline uint64_t extract_set(Cache *cache, uint64_t addr)
return (addr & cache->set_mask) >> cache->blksize_shift;
}
+static const char *cache_config_error(int blksize, int assoc, int cachesize)
+{
+ if (cachesize % blksize != 0) {
+ return "cache size must be divisible by block size";
+ } else if (cachesize % (blksize * assoc) != 0) {
+ return "cache size must be divisible by set size (assoc * block size)";
+ } else {
+ return NULL;
+ }
+}
+
+static bool bad_cache_params(int blksize, int assoc, int cachesize)
+{
+ return (cachesize % blksize) != 0 || (cachesize % (blksize * assoc) != 0);
+}
+
static Cache *cache_init(int blksize, int assoc, int cachesize)
{
+ if (bad_cache_params(blksize, assoc, cachesize)) {
+ return NULL;
+ }
+
Cache *cache;
int i;
uint64_t blk_mask;
@@ -397,7 +417,19 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
for (i = 0; i < argc; i++) {
char *opt = argv[i];
- if (g_str_has_prefix(opt, "limit=")) {
+ if (g_str_has_prefix(opt, "iblksize=")) {
+ iblksize = g_ascii_strtoll(opt + 9, NULL, 10);
+ } else if (g_str_has_prefix(opt, "iassoc=")) {
+ iassoc = g_ascii_strtoll(opt + 7, NULL, 10);
+ } else if (g_str_has_prefix(opt, "icachesize=")) {
+ icachesize = g_ascii_strtoll(opt + 11, NULL, 10);
+ } else if (g_str_has_prefix(opt, "dblksize=")) {
+ dblksize = g_ascii_strtoll(opt + 9, NULL, 10);
+ } else if (g_str_has_prefix(opt, "dassoc=")) {
+ dassoc = g_ascii_strtoll(opt + 7, NULL, 10);
+ } else if (g_str_has_prefix(opt, "dcachesize=")) {
+ dcachesize = g_ascii_strtoll(opt + 11, NULL, 10);
+ } else if (g_str_has_prefix(opt, "limit=")) {
limit = g_ascii_strtoll(opt + 6, NULL, 10);
} else {
fprintf(stderr, "option parsing failed: %s\n", opt);
@@ -406,7 +438,20 @@ int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
}
dcache = cache_init(dblksize, dassoc, dcachesize);
+ if (!dcache) {
+ const char *err = cache_config_error(dblksize, dassoc, dcachesize);
+ fprintf(stderr, "dcache cannot be constructed from given parameters\n");
+ fprintf(stderr, "%s\n", err);
+ return -1;
+ }
+
icache = cache_init(iblksize, iassoc, icachesize);
+ if (!icache) {
+ const char *err = cache_config_error(iblksize, iassoc, icachesize);
+ fprintf(stderr, "icache cannot be constructed from given parameters\n");
+ fprintf(stderr, "%s\n", err);
+ return -1;
+ }
rng = g_rand_new();
--
2.20.1
next prev parent reply other threads:[~2021-07-08 19:51 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 19:09 [PATCH v2 for 6.1 00/39] testing and plugins pre-PR series Alex Bennée
2021-07-08 19:09 ` [PATCH v2 01/39] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-08 19:09 ` [PATCH v2 02/39] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-08 19:09 ` [PATCH v2 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-08 19:09 ` [PATCH v2 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-08 19:09 ` [PATCH v2 05/39] tests/tcg: also disable the signals test for plugins Alex Bennée
2021-07-08 20:12 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 06/39] build: validate that system capstone works before using it Alex Bennée
2021-07-08 20:14 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-08 19:09 ` [PATCH v2 08/39] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-08 19:09 ` [PATCH v2 09/39] hw/usb/ccid: remove references to NSS Alex Bennée
2021-07-08 19:09 ` [PATCH v2 10/39] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-08 19:09 ` [PATCH v2 11/39] tests/docker: use project specific container registries Alex Bennée
2021-07-08 19:09 ` [PATCH v2 12/39] tests/docker: use explicit docker.io registry Alex Bennée
2021-07-08 19:09 ` [PATCH v2 13/39] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-08 19:09 ` [PATCH v2 14/39] tests/docker: fix sorting in package lists Alex Bennée
2021-07-08 19:09 ` [PATCH v2 15/39] tests/docker: fix mistakes in centos " Alex Bennée
2021-07-08 19:09 ` [PATCH v2 16/39] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-08 19:09 ` [PATCH v2 17/39] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-08 19:09 ` [PATCH v2 18/39] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-08 19:09 ` [PATCH v2 19/39] tests/docker: expand centos8 package list Alex Bennée
2021-07-08 19:09 ` [PATCH v2 20/39] tests/docker: expand fedora " Alex Bennée
2021-07-08 19:09 ` [PATCH v2 21/39] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-08 19:09 ` [PATCH v2 22/39] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-08 19:09 ` [PATCH v2 23/39] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-08 19:09 ` [PATCH v2 24/39] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-08 19:09 ` [PATCH v2 25/39] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-08 19:09 ` [PATCH v2 26/39] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-08 20:29 ` Richard Henderson
2021-07-09 10:51 ` Alex Bennée
2021-07-09 7:15 ` Thomas Huth
2021-07-08 19:09 ` [PATCH v2 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-08 20:31 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 28/39] meson.build: move TCG plugin summary output Alex Bennée
2021-07-08 19:39 ` Philippe Mathieu-Daudé
2021-07-08 20:31 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 29/39] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-08 20:32 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 30/39] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-08 20:33 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 31/39] tcg/plugins: enable by default for TCG builds Alex Bennée
2021-07-08 20:41 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 32/39] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-08 20:44 ` Richard Henderson
2021-07-08 19:09 ` [PATCH v2 33/39] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-08 19:09 ` [PATCH v2 34/39] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-08 19:09 ` [PATCH v2 35/39] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-08 19:09 ` Alex Bennée [this message]
2021-07-08 19:09 ` [PATCH v2 37/39] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-08 19:09 ` [PATCH v2 38/39] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-08 19:09 ` [PATCH v2 39/39] MAINTAINERS: Added myself as a reviewer for TCG Plugins Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210708190941.16980-37-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aaron@os.amperecomputing.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=crosa@redhat.com \
--cc=erdnaxe@crans.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kuhn.chenqun@huawei.com \
--cc=ma.mandourr@gmail.com \
--cc=mahmoudabdalghany@outlook.com \
--cc=minyihh@uci.edu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=robhenry@microsoft.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).