From nobody Sun May 19 14:40:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603218016; cv=none; d=zohomail.com; s=zohoarc; b=Abl4VnTmOhziKtwUluTlLvjM/Ee72mkb62hM4TFId0RbLz25fC3Wiptyhjba08yQLj9WBOj43wXSWuF7iEOzoQPNiI1DQzHcnT71EGlxOiOVRB0QgCGyws6hWcuqyfqsFUPU7MiFT6KGp+GzZA+9qbb1iRW4e8pyPUIxWQs6+6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603218016; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6rbwkEpyi/KBr1JflrTSauoQCOoSH88ZHs4jFJdadLY=; b=hK2WHF3pmvMIrm0RK4QaJFO3NK6V0fh566f3Ikj1KCgERWMgot2dA010pRxFGtY/37UpS+mX8zcPhlpeN7/OcJmWK3Gn6taa4fh/4/csk2sejXq4yJ2usKqdsCOuivz2aSf3JdEjSvTHBQrjQCFF//AJo1ASbppIgv2itgafmfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 16032180166391014.0253294930228; Tue, 20 Oct 2020 11:20:16 -0700 (PDT) Received: by mail-wr1-f66.google.com with SMTP id b8so3374728wrn.0 for ; Tue, 20 Oct 2020 11:20:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id f14sm4254328wrr.80.2020.10.20.11.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 11:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6rbwkEpyi/KBr1JflrTSauoQCOoSH88ZHs4jFJdadLY=; b=n24E9+xhkh9MrByR5MozzwrcTs0OvFhmmKqxdRGH9X2ffwdz+R9EfGxGSYqXiyU7jn vxbMoEJLQHBatb6jS5goc3XWgDibMd5rdlb/vUZuxKcNutZtdn1if9Y3P0HUYK4DsQTs 15MHj3PHlwaP2ZaduFeJIBeam3iXd5mw4ai5oXzs2wjQP4Q4SZovzWVs8fRFEtKomp7P fXq48Z4SRGW5SnUBVKaduriygCItDskxD9xHW6qNmcAxXw8FJ32eFbOYRHZ7lOF48xCn ZBiy3YwINRrPx3nWTDuMAqmkcT2ydCAt+WRPQ3YHGM9grb1e8rqFiMVGXfcf6il16Cw9 dY8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6rbwkEpyi/KBr1JflrTSauoQCOoSH88ZHs4jFJdadLY=; b=OQ23oNNH40OLiG53kQe1tT5DkhQr2q2Y5pL4KQBUQjyOEazcJbroc3+AL1gCAF2GkU E6gHwgct1KizQC5MxUEc7hTDol9cL4QCtOT7Dlh8gT5WfQXA5RjXlozRsDrZ9FnT/cSX amW8RLPJbvthZXyr0KhrNHErfizqed1MijwiEx5kPoqkneFbo3Y1v6PkbN3tHQF+VI8l eFg/XsLDuJdrJHWQj5LKrHr8wIGp2eKkABPSchfpVGM6JNc2l0zXJVUErw1csKwS5YnA OvhdTSXiXHpk5oWhn6VaWz7Iiqyc4gQlSTbHYzNUz2qBEkMpRZt2QbIXcNEENCobYdLy bk0A== X-Gm-Message-State: AOAM533lLzRaDx1OeIJYJQALDoi247nPAw02gkttv0YNc1jQzig10/f6 y78hmPMjG7dly1k3QjCWEGE= X-Google-Smtp-Source: ABdhPJzvwZsia23Py+FB4CSB7KBEzY4PeneAkRECN47o3hJO+3qvV26MpElNdqBbCuWPZ0QFPnWi9g== X-Received: by 2002:adf:ec0e:: with SMTP id x14mr5407603wrn.204.1603218015232; Tue, 20 Oct 2020 11:20:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Luc Michel , Damien Hedde , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel , Alistair Francis Subject: [PATCH 1/4] qdev-monitor: Display frequencies scaled to SI unit Date: Tue, 20 Oct 2020 20:20:05 +0200 Message-Id: <20201020182008.2240590-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020182008.2240590-1-f4bug@amsat.org> References: <20201020182008.2240590-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Since commit 9f2ff99c7f2 ("qdev-monitor: print the device's clock with info qtree") we can display the clock frequencies in the monitor. Use the recently introduced freq_to_str() to display the frequencies using the closest SI unit (human friendlier). Before: (qemu) info qtree [...] dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3D3.333333e+07 mmio 00000000f8000000/0000000000001000 After: dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3D33.3 MHz mmio 00000000f8000000/0000000000001000 Reviewed-by: Luc Michel Reviewed-by: Damien Hedde Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/qdev-monitor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index bcfb90a08f3..1c5b509aea2 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -747,11 +747,13 @@ static void qdev_print(Monitor *mon, DeviceState *dev= , int indent) } } QLIST_FOREACH(ncl, &dev->clocks, node) { - qdev_printf("clock-%s%s \"%s\" freq_hz=3D%e\n", + g_autofree char *freq =3D NULL; + + freq =3D freq_to_str(clock_get_hz(ncl->clock)); + qdev_printf("clock-%s%s \"%s\" freq_hz=3D%s\n", ncl->output ? "out" : "in", ncl->alias ? " (alias)" : "", - ncl->name, - CLOCK_PERIOD_TO_HZ(1.0 * clock_get(ncl->clock))); + ncl->name, freq); } class =3D object_get_class(OBJECT(dev)); do { --=20 2.26.2 From nobody Sun May 19 14:40:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603218021; cv=none; d=zohomail.com; s=zohoarc; b=IMcLrkKghGtoVmh3jlaJrJhvnNcrCjL/4rvMoQdEbECRktra9iJA7OyEN4xe3GtkvQijFwkVyOszVzi0xmzD5bzlK2sKcMFfSJJuJfGIn/qkbL3tsKs5nFZIZFSj2xGEdmm8KMkAscvlWW0AdOyKyupTvy7RXkPr5/VHeGUx5nA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603218021; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BzyypNaASWej9ZmqdqMi6vPl5wcM+vKdt8ggZ4Ao8SM=; b=YSwkobbXsYEp5VOA/sRdTRKNnI8IZ0TyGVaM2cx+jh+2Vnkuwes7s6ot9W/D841zXNqjrgq7CbpKXFcDFp0ul6UpO5OVWVLLkyPaPD55B9LwbLYHTcr0xBI6ywvISxyo7Gx9YJ1/+X0etN23B62cDxQAfyf+Qe2eLNhApPNxulc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1603218021460174.11582944044767; Tue, 20 Oct 2020 11:20:21 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id z22so1686468wmi.0 for ; Tue, 20 Oct 2020 11:20:21 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id r1sm4334870wro.18.2020.10.20.11.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 11:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BzyypNaASWej9ZmqdqMi6vPl5wcM+vKdt8ggZ4Ao8SM=; b=RhJLTZejm2gWA9eGOUcqIM2r/w8aepvah0h9G0w3fJNQYUvFupuSiHZJ4tu8sByrGI CqegSXD5jZ3tjSzXLRnIuc+rIKpldSw1FhweAWbVggoYaUmWpJeSFhEjRfgrBqquZozI Ev1QQe5awJJTEkWIZ3GV0jksGmolBwJnZul17cownl+HDM+K0hKTxWCbdzYwqPnn3d4a 7t5oZeRQwEoOLyyVnGUbH7H9KWzKLeF9cKzSbdAPzhLewYSRuybsSnKOfcIv6P8xCYcC rYta/IvP/nIs+9OB5iBPtmFCUd7dJ5j+mf7JhhO9unvVc3pGDDcNKY+aw4Z5qNAFTgk9 8tmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BzyypNaASWej9ZmqdqMi6vPl5wcM+vKdt8ggZ4Ao8SM=; b=ka6HHI0sFdTsaIpuKTbIBi/Uq3d3Qx0M4y4DC2rCyq8l2ffWaoJjVxHyJkJK9sljUM VllOjK16MLb07VISkqBaTHr9O3bprpxHwNlD7fopLd9j+RQ6bhbMb62S2EphjIYI/7B1 7vUzDgRaCVbNDAKhnYd05Gd0/VTbRJ6bhLVkzuRvcDTh5ThxKoBSY6Ydo4lxEFBjeaxV 2FN/xd3mLw3uUpsI+IsEh2VArWokiUrf+xBJf1zkY6XtbAArFyP3+3qE5r3bLdWlfQIs gedMIdkW92MSx2I0YoYkntrkJmrLdMCu7I8pty1eU0S4U4rv94C13rmhcLPS0gQnYTXi TkbA== X-Gm-Message-State: AOAM531Lm2vPWJG9o0nWB7tbdejNcl9qsT8cO9mJbhkgxDLbmpIQo/yp RaqSFzEhZJ3JqaEwLC0mttA= X-Google-Smtp-Source: ABdhPJyXxKnhC3yc7AHjoNry4FEVDcg/tefmGklGRGk32fXmUDSPwAGNKv4APV2vDLL6mfUaQ4GhmA== X-Received: by 2002:a7b:c350:: with SMTP id l16mr4392111wmj.135.1603218020008; Tue, 20 Oct 2020 11:20:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Luc Michel , Damien Hedde , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Luc Michel , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/core/clock: trace clock values in Hz instead of ns Date: Tue, 20 Oct 2020 20:20:06 +0200 Message-Id: <20201020182008.2240590-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020182008.2240590-1-f4bug@amsat.org> References: <20201020182008.2240590-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Luc Michel The nanosecond unit greatly limits the dynamic range we can display in clock value traces, for values in the order of 1GHz and more. The internal representation can go way beyond this value and it is quite common for today's clocks to be within those ranges. For example, a frequency between 500MHz+ and 1GHz will be displayed as 1ns. Beyond 1GHz, it will show up as 0ns. Replace nanosecond periods traces with frequencies in the Hz unit to have more dynamic range in the trace output. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Damien Hedde Signed-off-by: Luc Michel Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201010135759.437903-3-luc@lmichel.fr> [PMD: Replace CLOCK_PERIOD_TO_HZ() by clock_get_hz()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/clock.c | 8 +++++--- hw/core/trace-events | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/core/clock.c b/hw/core/clock.c index f866717a835..5cc9599ba3a 100644 --- a/hw/core/clock.c +++ b/hw/core/clock.c @@ -51,12 +51,14 @@ void clock_clear_callback(Clock *clk) =20 bool clock_set(Clock *clk, uint64_t period) { + uint64_t old_hz; + if (clk->period =3D=3D period) { return false; } - trace_clock_set(CLOCK_PATH(clk), CLOCK_PERIOD_TO_NS(clk->period), - CLOCK_PERIOD_TO_NS(period)); + old_hz =3D clock_get_hz(clk); clk->period =3D period; + trace_clock_set(CLOCK_PATH(clk), old_hz, clock_get_hz(clk)); =20 return true; } @@ -69,7 +71,7 @@ static void clock_propagate_period(Clock *clk, bool call_= callbacks) if (child->period !=3D clk->period) { child->period =3D clk->period; trace_clock_update(CLOCK_PATH(child), CLOCK_PATH(clk), - CLOCK_PERIOD_TO_NS(clk->period), + clock_get_hz(clk), call_callbacks); if (call_callbacks && child->callback) { child->callback(child->callback_opaque); diff --git a/hw/core/trace-events b/hw/core/trace-events index 1ac60ede6b7..7b2869cbaab 100644 --- a/hw/core/trace-events +++ b/hw/core/trace-events @@ -31,6 +31,6 @@ resettable_transitional_function(void *obj, const char *o= bjtype) "obj=3D%p(%s)" # clock.c clock_set_source(const char *clk, const char *src) "'%s', src=3D'%s'" clock_disconnect(const char *clk) "'%s'" -clock_set(const char *clk, uint64_t old, uint64_t new) "'%s', ns=3D%"PRIu6= 4"->%"PRIu64 +clock_set(const char *clk, uint64_t old, uint64_t new) "'%s', %"PRIu64" Hz= -> %"PRIu64" Hz" clock_propagate(const char *clk) "'%s'" -clock_update(const char *clk, const char *src, uint64_t val, int cb) "'%s'= , src=3D'%s', ns=3D%"PRIu64", cb=3D%d" +clock_update(const char *clk, const char *src, uint64_t hz, int cb) "'%s',= src=3D'%s', val=3D%"PRIu64" Hz cb=3D%d" --=20 2.26.2 From nobody Sun May 19 14:40:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603218026; cv=none; d=zohomail.com; s=zohoarc; b=NV/vohCExn0c5m9ar+I2sES8s/GYDAT911qxGuOyCJccLB0yoWm4dlvK8jQ+cm3H9W0+P+2x0NwHMWps8xvIc/lUuKi9grbc8FuLw/CobniWQ5J3yOEqg1Pzum1R0xamzTkWB/BMsYY4GOYMenlqSgJK3R2SMIQfcqS1hcpe6IY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603218026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LlhPHIkLgnc2X3iIuYASqYyROrzSjxY4qWSO0bD5GDk=; b=bfi4164hJHMyTwZUnbgnN+65OChvtZMSifXFS0eksyF0IBLBYBhUquvn6Ejdtw4A/wk7H6IzoZFaWKHr1vqdbQimhCmZL+dIijM7dSsdlqOYvtfX92jgdGRcvyv99tUEni4N7CHby1dJTio4hIVzSPxfsl36KE361EdQYIwm8H0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1603218026324147.61132168949814; Tue, 20 Oct 2020 11:20:26 -0700 (PDT) Received: by mail-wm1-f65.google.com with SMTP id c16so3064424wmd.2 for ; Tue, 20 Oct 2020 11:20:25 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id n83sm2998389wma.39.2020.10.20.11.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 11:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LlhPHIkLgnc2X3iIuYASqYyROrzSjxY4qWSO0bD5GDk=; b=VY2LTrHRsp+FHTTI6eNiyB9FbHAEvWmbwiG0O+xcNTVL/tK1Xm0925ondCwNBYhKAF 0BBgnnObtpyRicB4W+fRAF7K+GPsN6DEKzatL88y5AYR91Aveacl09lHvuLpmigXd0Lk mMfKBWC+kPa+GZ+rNObWO8jaoI0rGyXNbzvLQyVDs24cNGnXZsS+Fb65MLxykXWwFAvh 2ZAXuAN282Qmi5FVmODzTooqXCVqeDG21gsT1oVa+foMFKseJNzrqFeIZAoM+IyMI8CD asGjNVUpTy91C8R2SG3JQSgpD5mUZqBE6l8OK5LaiHEWlyUzkwNHKwsf+aPbdFXN1R97 5kPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LlhPHIkLgnc2X3iIuYASqYyROrzSjxY4qWSO0bD5GDk=; b=U/aUhfKwGgdF0OxOj2aIST8pG+rLSXPtl8S84KD7iQ3hm06DOsKUBCKyFuOZNFstDg CKJ/4FoV/yquIlZmUERBhpvdccA/xYy0D7l+i4DVMXUZLJjBeWTxLd5KiwThDdkWrVu+ Z1lHHT6AYj/bxUydAuSVAq4tSi+axFA0Lq/ymeI+mprxP7Ae6guHxHJxcA2/xYbPLUyd Uxcndbj4kCJHI0ewRb3VO3XDHomX1KSHCLcmzNdVe3ywyT2ZYPotHjbOL5NoqHFO7LoC kvJm5tXGz/cmDl7TnCP1ClWT9D3bqvHfXD5Se4gLJSMubWsZrQz1b44rYrhhBArduzbS 056A== X-Gm-Message-State: AOAM532HaIblz+oniEyh+9gQLF9em1JmKYgDxicThYNIoWyh8Pyrtzgo 7JG1zDQ1D9zMWgKmK6HFnfM= X-Google-Smtp-Source: ABdhPJxHR+y9WC8u/4TV6Y+y9C6UNcW/vUdA1yMPG6t/VvJZD3YCFgIyrp7ylTJz5cpFUcuXMDjJpw== X-Received: by 2002:a1c:f414:: with SMTP id z20mr4272674wma.110.1603218024717; Tue, 20 Oct 2020 11:20:24 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Luc Michel , Damien Hedde , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/clock: Inline and remove CLOCK_PERIOD_TO_HZ() Date: Tue, 20 Oct 2020 20:20:07 +0200 Message-Id: <20201020182008.2240590-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020182008.2240590-1-f4bug@amsat.org> References: <20201020182008.2240590-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This macro is only used once. Inline and remove it. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/clock.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/hw/clock.h b/include/hw/clock.h index cbc5e6ced1e..b58038f1e7d 100644 --- a/include/hw/clock.h +++ b/include/hw/clock.h @@ -40,7 +40,6 @@ typedef void ClockCallback(void *opaque); #define CLOCK_PERIOD_FROM_NS(ns) ((ns) * (CLOCK_PERIOD_1SEC / 1000000000ll= u)) #define CLOCK_PERIOD_TO_NS(per) ((per) / (CLOCK_PERIOD_1SEC / 1000000000ll= u)) #define CLOCK_PERIOD_FROM_HZ(hz) (((hz) !=3D 0) ? CLOCK_PERIOD_1SEC / (hz)= : 0u) -#define CLOCK_PERIOD_TO_HZ(per) (((per) !=3D 0) ? CLOCK_PERIOD_1SEC / (per= ) : 0u) =20 /** * Clock: @@ -203,9 +202,12 @@ static inline uint64_t clock_get(const Clock *clk) return clk->period; } =20 -static inline unsigned clock_get_hz(Clock *clk) +static inline uint64_t clock_get_hz(Clock *clk) { - return CLOCK_PERIOD_TO_HZ(clock_get(clk)); + if (!clk->period) { + return 0u; + } + return CLOCK_PERIOD_1SEC / clk->period; } =20 static inline unsigned clock_get_ns(Clock *clk) --=20 2.26.2 From nobody Sun May 19 14:40:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603218030; cv=none; d=zohomail.com; s=zohoarc; b=RJUH/6jUydyCoKaA1rat5WWEK6ErcZETRoX0twokbT3KaADX6w5ItHzrYp4kfCTKyCybiyqeDEKBt6p/WGnR4Hlp/IXu8Ym722yBdxukJlUmnm4PtRsvsUROfb0h61d+lro7ZvbsK3v5xedEyiXORwxlFn3L2KmpE64WhvOTWrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603218030; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=AQ55ElHtEdTOYymi1G2THLVhvtL1xtgv0G4cJyUwkculuNg9747ZF/HoF74pd8L3eKAfFiGdN09meIi8s8r9HhjByJmb3JHLCPDeWUYYrhkDcYS4EDBGrl1+Ns320dpRTwDASwdUa7bLmIQUIJb52dY0N6w9Tf2Cy4nOCri4+Yo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1603218030710368.00322199400796; Tue, 20 Oct 2020 11:20:30 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id h7so3357794wre.4 for ; Tue, 20 Oct 2020 11:20:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id p11sm4139024wrm.44.2020.10.20.11.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 11:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=tVXKYBrlySX4y89GL32QgH7h5/3ZT9bsnd/8LCsCuEa8Cb4pPlFcMQJSjmpA/MsNQc wxypXE0dJVIdGSWW53+36BdL8pI661IhgCCJVYkfsOabz8/OMyv+mdo6bKSb7AHyq1I8 VKfP0y+f+mSZLomDqSOaCT+0Ax6EixynAzkbyuQgO2UWNFLqG6QMmPXIA0NxV+Ps0hGF OX2359yqMIhxs3gYfaSRBZz+c1LiD2cYYWKaWXrpdglfIbLYDkNNnp+5uodI9PXVsRHG n7BUOPUkqCDFVXwekyshYr7NzO4Ri+VVpnyNg8eupncxipwkQNZjR+LFLCLkA6ig/4RL v2Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=h7qCj+7outY8JoIgpRYc5O9y6If9m/7VLST2ywQRbSSRXd76IV/8VXTqWgGiHlaUrr +aeu9WuDhij9dmICCPqtlh6kU716NjX+ynZYyc2IDL/FX7a3ZgWQ2B/a6CXyu9Zb2Kxr qUwmJT6YdzbaDS1HpAI4apaVY6U5c4Y97R7EA9jDwpLJoKG2uTnRfAf0xlH92PPw4AA5 Pu3Sp45YNPm8/IEDQb75KczpoytsmyD0aU+VSyfw+0dvh7g9tu/dART69eJw7EEc1Ay+ zbrvqjAXbTmAxTmT3nZ9zvA1xNykgJfYrMIc9rRr8ES3bkx+u260FjOeYuDzpOCCAPpw 18Jg== X-Gm-Message-State: AOAM532RypfAAv0H4//s1z7ZzfH9QCsqEfYLuydDVvwXXAflXhFuqwQZ x/rv75rqWu9ZKXKaqKUUzBQ= X-Google-Smtp-Source: ABdhPJxGeMKf57nyBJuXqB3UpANGvvvS7jEECJvnzXo3B1NVbkxk7AvTodWQv/i/AJo2TU9Jn7dApw== X-Received: by 2002:adf:a553:: with SMTP id j19mr4875776wrb.349.1603218029290; Tue, 20 Oct 2020 11:20:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Luc Michel , Damien Hedde , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 4/4] hw/clock: Inline and remove CLOCK_PERIOD_TO_NS() Date: Tue, 20 Oct 2020 20:20:08 +0200 Message-Id: <20201020182008.2240590-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020182008.2240590-1-f4bug@amsat.org> References: <20201020182008.2240590-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This macro is only used once. Inline caring about 64-bit multiplication, and remove it. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/clock.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/clock.h b/include/hw/clock.h index b58038f1e7d..f329fcf0ea5 100644 --- a/include/hw/clock.h +++ b/include/hw/clock.h @@ -16,6 +16,7 @@ =20 #include "qom/object.h" #include "qemu/queue.h" +#include "qemu/host-utils.h" =20 #define TYPE_CLOCK "clock" OBJECT_DECLARE_SIMPLE_TYPE(Clock, CLOCK) @@ -38,7 +39,6 @@ typedef void ClockCallback(void *opaque); * macro helpers to convert to hertz / nanosecond */ #define CLOCK_PERIOD_FROM_NS(ns) ((ns) * (CLOCK_PERIOD_1SEC / 1000000000ll= u)) -#define CLOCK_PERIOD_TO_NS(per) ((per) / (CLOCK_PERIOD_1SEC / 1000000000ll= u)) #define CLOCK_PERIOD_FROM_HZ(hz) (((hz) !=3D 0) ? CLOCK_PERIOD_1SEC / (hz)= : 0u) =20 /** @@ -210,9 +210,14 @@ static inline uint64_t clock_get_hz(Clock *clk) return CLOCK_PERIOD_1SEC / clk->period; } =20 -static inline unsigned clock_get_ns(Clock *clk) +static inline uint64_t clock_get_ns(Clock *clk) { - return CLOCK_PERIOD_TO_NS(clock_get(clk)); + uint64_t lo, hi; + + mulu64(&lo, &hi, clock_get(clk), 1000000000llu); + divu128(&lo, &hi, CLOCK_PERIOD_1SEC); + + return lo; } =20 /** --=20 2.26.2