From patchwork Mon Apr 28 12:59:13 2025 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: 885474 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp5164724wrs; Mon, 28 Apr 2025 06:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUyBTiCKnUPULR0oFwV86/OrGbmfHPJiJB8oZIOMwzxrn52CX64gr7DiXUPRukInTJDWDkkag==@linaro.org X-Google-Smtp-Source: AGHT+IFpNF+xRM+R3NZPWx1Wfy9zEqLN4tFb0XxJxblN87wt/pswRf2ncseHjd3ni948S/j0cHH8 X-Received: by 2002:a05:6214:2486:b0:6e8:f8ef:d659 with SMTP id 6a1803df08f44-6f4cb9d30e7mr199088146d6.10.1745845292491; Mon, 28 Apr 2025 06:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745845292; cv=none; d=google.com; s=arc-20240605; b=OCWnDrdiKFz8yoj2ANoPJuGuaTlIIOAsW7Q7MZZg/nA7jLyfOx162uKzbmBDv2bX+U tOAhfgM2ra9W4fhgX4v57KlOzg5tbIVxX7eeK43rs0O7fLSz9RFePp5lyXnhzQCwCwIG Z68BYXKz8aUU38z1TAXo0rYcfGNMKQnAmlgHfCOB6Wf6gzu/ZtqHTXve6U+aB1P5M0Ms Eh4fc16PaaNWpX9onbs5PhnGoeu2epBKl8w4y/G62PcNCSutksP3pC0nRqI6/eJtjnaq lK6KJp+NhXpqm27a+ElVw1Ib1oA23OncZahPm/eEX0rZdvdE2CD+z4XkL0ZxVgknqTOZ ZGWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=OpcnbbS7NZaVAROUGSORdG952tVH4km68aGL3qTrH6E=; fh=CRxZ/er3+VXA5mJQYxYBLkuBdEcLSBKdQEqlxuayHY4=; b=d1Ybyx36pDFQ0/OBlZlBU4OqHetaBNkAO+tEox1Hgz0qH9f9CLaribSLiiHeOZjCRq 9+puz4NCP/gL6WNlp2dBSEEKMpTB9+DK/NcF+YRV4eWbeRCZJYGuQgwu2vzZ1MMkRV0l p6wmSfvPkRULKulN8QAiekwGLX5/ZnpD5Evpo6qJhp126+jmT6EdZjmmqsHCGVIVvKxY bhjLvtET77SR+IBwhjtBFud0TDwuOZ857lYs2cxxxvEmk0cKdeAYPH5OpcEvIGljejtv 726IOybD9lcNoOo8gKJUYHfRPyAHTJ74dbN1tPEUqQnDFykIj4ftyTYw4C7vZOi9pGi/ fl2g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b08SX4nx; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9f2ca778si105795721cf.94.2025.04.28.06.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Apr 2025 06:01:32 -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=b08SX4nx; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9O59-00080w-6q; Mon, 28 Apr 2025 08:59:35 -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 1u9O52-0007tc-AX for qemu-devel@nongnu.org; Mon, 28 Apr 2025 08:59:30 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9O4y-00036q-28 for qemu-devel@nongnu.org; Mon, 28 Apr 2025 08:59:27 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ac2aeada833so927775566b.0 for ; Mon, 28 Apr 2025 05:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745845162; x=1746449962; 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=OpcnbbS7NZaVAROUGSORdG952tVH4km68aGL3qTrH6E=; b=b08SX4nxgTdy0psISi+SAexoeWfKko/2u93q4wCGJqfMJXUERMF4PYZ60pH5LhjrC+ gybFPF9H3BVGQwp3Qo08g4u1d0SBdHx7u0okknKLNwkzRy+sb/0pCsJUjNmPgQL8hxVY KDzKcSXeLSaNWO5o2I0gxH3TXOJn+RRkJIvHhA5zkpkMj38Bc3JZzQG9aPs+hNaxVoNt TWfOknUKs7/aDVR/DI2R9pZKlpQGbzrILUk8o+CGdbvNxpM0pmdJrv0NJpqVn50cILlr /N9QlrwYGAKVU6qpD9TrM2cIx7POFCvvE3UhMh7FVsa5eWlUCu7HgT3h6OQ5irSoTJ8P a75w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745845162; x=1746449962; 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=OpcnbbS7NZaVAROUGSORdG952tVH4km68aGL3qTrH6E=; b=i9EoQfIPKDvqcpZWdmDY3FxBRdxRiArLJ4h4Ih/JHS7TIspg0oRzepArAkRm76edq0 auYPRq9+BSl4J4cI1lZSNvggXbnLB3YKCKNAW1rua+6awajW96jXMfX/IXMDJZTnVDP2 dJ5HCgsJ/FRcAeQNvhQrkyQiahtdtidyY7qFEib2EmKWXLS5UNwqJlKRbDj+Xyl6P++3 WoysLN27YTb8T6Lp6RgSAkFG/ze/CcVqpvU9zW1DY7w+Wd6mE1bjHmHFh7u/7+qNODzX ffDbzIYexF87LowxB5F1wE0dwAQDvswgMnn4YnyvgruW2sewWV0T9W2wsSvaDgBAylkW 5HOg== X-Gm-Message-State: AOJu0YzVLXbiEaxvizpNcdiL19OJj9JJJgEim93mH6NSDg8vODNSt41Z skkYqqZgwFCHIu2+DZcxe6PHly8C3ec2/ZpxBNpy7edjY1uaSIxvo6Y37wYQtU0= X-Gm-Gg: ASbGncvHodIvLfi2cPGXxYIlXrUkxk+6rAgOeL/PSbB2E8ifFkxdejn5syOwriN8wG4 BpUT3LxJEFsc0UmiBPXL1eWBMv4adOpaia32OCxsGuxUyOi1TAT5cidDKuVgwvjQiwx5pepX7ue rU8AIIC+ox4/U3dsarnC4uRxjNze6Yee9helq6mLxBNp6nAFLKby7sFASXDkL9ICB7+DO5nr+qQ 7HP/AK+esECLxD4XE4Y0OjCA4Whorr2QZ/iDYRT9jrELzdx/tBhBbth3BzkR0gGmsQBlxT1bjZ6 JUrsxnz1vmvlmTv4b6GQ3ybfmhnMUI52fdpFVBVsGec= X-Received: by 2002:a17:907:9804:b0:aca:d276:fa5 with SMTP id a640c23a62f3a-ace73167e83mr1087497466b.0.1745845162449; Mon, 28 Apr 2025 05:59:22 -0700 (PDT) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ace6ed70611sm627048766b.143.2025.04.28.05.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 05:59:20 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9B2F45FAEC; Mon, 28 Apr 2025 13:59:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Alexandre Iooss , "Michael S. Tsirkin" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , David Hildenbrand , Pierrick Bouvier , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , Peter Maydell , Mahmoud Mandour Subject: [PATCH 4/9] contrib/plugins: add a scaling factor to the ips arg Date: Mon, 28 Apr 2025 13:59:13 +0100 Message-Id: <20250428125918.449346-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250428125918.449346-1-alex.bennee@linaro.org> References: <20250428125918.449346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 It's easy to get lost in zeros while setting the numbers of instructions per second. Add a scaling suffix to make things simpler. Signed-off-by: Alex Bennée Reviewed-by: Pierrick Bouvier --- contrib/plugins/ips.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/contrib/plugins/ips.c b/contrib/plugins/ips.c index e5297dbb01..1952e0866d 100644 --- a/contrib/plugins/ips.c +++ b/contrib/plugins/ips.c @@ -20,6 +20,8 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + /* how many times do we update time per sec */ #define NUM_TIME_UPDATE_PER_SEC 10 #define NSEC_IN_ONE_SEC (1000 * 1000 * 1000) @@ -129,6 +131,18 @@ static void plugin_exit(qemu_plugin_id_t id, void *udata) qemu_plugin_scoreboard_free(vcpus); } +typedef struct { + const char* suffix; + unsigned long multipler; +} scale_entry; + +/* a bit like units.h but not binary */ +static scale_entry scales[] = { + { "khz", 1000 }, + { "mhz", 1000 * 1000 }, + { "ghz", 1000 * 1000 * 1000 }, +}; + QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info, int argc, char **argv) @@ -137,12 +151,19 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, char *opt = argv[i]; g_auto(GStrv) tokens = g_strsplit(opt, "=", 2); if (g_strcmp0(tokens[0], "ips") == 0) { - max_insn_per_second = g_ascii_strtoull(tokens[1], NULL, 10); + char *endptr = NULL; + max_insn_per_second = g_ascii_strtoull(tokens[1], &endptr, 10); if (!max_insn_per_second && errno) { fprintf(stderr, "%s: couldn't parse %s (%s)\n", __func__, tokens[1], g_strerror(errno)); return -1; } + for (int j = 0; j < ARRAY_SIZE(scales); j++) { + if (g_str_has_suffix(endptr, scales[j].suffix)) { + max_insn_per_second *= scales[j].multipler; + break; + } + } } else { fprintf(stderr, "option parsing failed: %s\n", opt); return -1;