From patchwork Wed Jun 6 12:49:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10450189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 85B6B60146 for ; Wed, 6 Jun 2018 12:50:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FF2829669 for ; Wed, 6 Jun 2018 12:50:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CC12286A2; Wed, 6 Jun 2018 12:50:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 078F029DD3 for ; Wed, 6 Jun 2018 12:49:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D04B6F014; Wed, 6 Jun 2018 12:49:22 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1447E6F000 for ; Wed, 6 Jun 2018 12:49:19 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id o13-v6so11235348wmf.4 for ; Wed, 06 Jun 2018 05:49:19 -0700 (PDT) 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; bh=nRJOsq3uYf9l+6doFb34v/eok00QMa5oZpx0AXbiC0E=; b=qp79MBxB0v1/UWLuXP5p6A14AvPiFEo4WBEsWyGCsJC2inBxKVkinpiqBqms45anqh c2u0cx829khsCw6S87yxprGDVy9V9IrNjdiz5kO81PvnI9zd4lGLeJsFiFEjvnUGtDgD 3btb5GkR3bU2jjvQiecYfaOcP3GihjSVncgSMcInWWEFcfptmztGHdgqcodC/NUaeTc/ BKpaQFERLiJRAtlXlF5/BcRxR64HZORfNOWIek1GTjXF09Wypenhjvto5KCUD1A/KEJF IQZQmFRz/zsiu9JKBdw+ZGk7JFMmGDMAPxgvb58nAMV9f0lJqJdIOIJPUcX1fuckYHKO PKOg== X-Gm-Message-State: APt69E39ZBq7Y/b5oYG4s4MOiKaKv+5Zcy6lFiE1/9d/JUVjJkjZsFTP XW+7BVxXpJUuPGovOTEe0DGJTPlI X-Google-Smtp-Source: ADUXVKIptSCX70MV/Hqhlxwf9mkMKXhr6wzymA63R75DhrOpgeMxT0oq0FYRchQ7XYVw7+G4xAAV2w== X-Received: by 2002:a1c:6b56:: with SMTP id g83-v6mr1765268wmc.143.1528289357706; Wed, 06 Jun 2018 05:49:17 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id x5-v6sm19616176wrr.3.2018.06.06.05.49.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jun 2018 05:49:17 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Wed, 6 Jun 2018 13:49:04 +0100 Message-Id: <20180606124907.13139-4-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180606124907.13139-1-tvrtko.ursulin@linux.intel.com> References: <20180606124907.13139-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 3/6] intel-gpu-overlay: Show 1s, 30s and 15m GPU load X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Show total GPU loads in the window banner. Engine load is defined as total of runnable and running requests on an engine. Total, non-normalized, load is display. In other words if N engines are busy with exactly one request, the load will be shown as N. v2: * Different flavour of load avg. (Chris Wilson) * Simplify code. (Chris Wilson) Signed-off-by: Tvrtko Ursulin --- overlay/gpu-top.c | 39 ++++++++++++++++++++++++++++++++++++++- overlay/gpu-top.h | 11 ++++++++++- overlay/overlay.c | 28 ++++++++++++++++++++++------ 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/overlay/gpu-top.c b/overlay/gpu-top.c index 22e9badb22c1..501429b86379 100644 --- a/overlay/gpu-top.c +++ b/overlay/gpu-top.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,10 @@ static int perf_init(struct gpu_top *gt) gt->ring[gt->num_rings++].name = d->name; } + gt->have_load_avg = gt->have_queued && + gt->have_runnable && + gt->have_running; + return 0; } @@ -290,17 +295,32 @@ static void mmio_init(struct gpu_top *gt) } } -void gpu_top_init(struct gpu_top *gt) +void gpu_top_init(struct gpu_top *gt, unsigned int period_us) { + const double period = (double)period_us / 1e6; + const double load_period[NUM_LOADS] = { 1.0, 30.0, 900.0 }; + const char *load_names[NUM_LOADS] = { "1s", "30s", "15m" }; + unsigned int i; + memset(gt, 0, sizeof(*gt)); gt->fd = -1; + for (i = 0; i < NUM_LOADS; i++) { + gt->load_name[i] = load_names[i]; + gt->exp[i] = exp(-period / load_period[i]); + } + if (perf_init(gt) == 0) return; mmio_init(gt); } +static double update_load(double load, double exp, double val) +{ + return val + exp * (load - val); +} + int gpu_top_update(struct gpu_top *gt) { uint32_t data[1024]; @@ -313,6 +333,8 @@ int gpu_top_update(struct gpu_top *gt) struct gpu_top_stat *s = >->stat[gt->count++&1]; struct gpu_top_stat *d = >->stat[gt->count&1]; uint64_t *sample, d_time; + double gpu_qd = 0.0; + unsigned int i; int n, m; len = read(gt->fd, data, sizeof(data)); @@ -341,6 +363,8 @@ int gpu_top_update(struct gpu_top *gt) d_time = s->time - d->time; for (n = 0; n < gt->num_rings; n++) { + double qd = 0.0; + gt->ring[n].u.u.busy = (100 * (s->busy[n] - d->busy[n]) + d_time/2) / d_time; if (gt->have_wait) gt->ring[n].u.u.wait = (100 * (s->wait[n] - d->wait[n]) + d_time/2) / d_time; @@ -353,6 +377,14 @@ int gpu_top_update(struct gpu_top *gt) if (gt->have_running) gt->ring[n].running = (double)((s->running[n] - d->running[n])) / I915_SAMPLE_RUNNING_DIVISOR * 1e9 / d_time; + qd = gt->ring[n].runnable + gt->ring[n].running; + gpu_qd += qd; + + for (i = 0; i < NUM_LOADS; i++) + gt->ring[n].load[i] = + update_load(gt->ring[n].load[i], + gt->exp[i], qd); + /* in case of rounding + sampling errors, fudge */ if (gt->ring[n].u.u.busy > 100) gt->ring[n].u.u.busy = 100; @@ -362,6 +394,11 @@ int gpu_top_update(struct gpu_top *gt) gt->ring[n].u.u.sema = 100; } + for (i = 0; i < NUM_LOADS; i++) { + gt->load[i] = update_load(gt->load[i], gt->exp[i], + gpu_qd); + gt->norm_load[i] = gt->load[i] / gt->num_rings; + } update = 1; } else { while ((len = read(gt->fd, data, sizeof(data))) > 0) { diff --git a/overlay/gpu-top.h b/overlay/gpu-top.h index cb4310c82a94..115ce8c482c1 100644 --- a/overlay/gpu-top.h +++ b/overlay/gpu-top.h @@ -26,6 +26,7 @@ #define GPU_TOP_H #define MAX_RINGS 16 +#define NUM_LOADS 3 #include @@ -39,6 +40,12 @@ struct gpu_top { int have_queued; int have_runnable; int have_running; + int have_load_avg; + + double exp[NUM_LOADS]; + double load[NUM_LOADS]; + double norm_load[NUM_LOADS]; + const char *load_name[NUM_LOADS]; struct gpu_top_ring { const char *name; @@ -54,6 +61,8 @@ struct gpu_top { double queued; double runnable; double running; + + double load[NUM_LOADS]; } ring[MAX_RINGS]; struct gpu_top_stat { @@ -69,7 +78,7 @@ struct gpu_top { int count; }; -void gpu_top_init(struct gpu_top *gt); +void gpu_top_init(struct gpu_top *gt, unsigned int period_us); int gpu_top_update(struct gpu_top *gt); #endif /* GPU_TOP_H */ diff --git a/overlay/overlay.c b/overlay/overlay.c index 7087d5e5b24e..1a1d01db082b 100644 --- a/overlay/overlay.c +++ b/overlay/overlay.c @@ -141,7 +141,8 @@ struct overlay_context { }; static void init_gpu_top(struct overlay_context *ctx, - struct overlay_gpu_top *gt) + struct overlay_gpu_top *gt, + unsigned int period_us) { const double rgba[][4] = { { 1, 0.25, 0.25, 1 }, @@ -153,7 +154,7 @@ static void init_gpu_top(struct overlay_context *ctx, int n; cpu_top_init(>->cpu_top); - gpu_top_init(>->gpu_top); + gpu_top_init(>->gpu_top, period_us); chart_init(>->cpu, "CPU", 120); chart_set_position(>->cpu, PAD, PAD); @@ -928,13 +929,13 @@ int main(int argc, char **argv) debugfs_init(); - init_gpu_top(&ctx, &ctx.gpu_top); + sample_period = get_sample_period(&config); + + init_gpu_top(&ctx, &ctx.gpu_top, sample_period); init_gpu_perf(&ctx, &ctx.gpu_perf); init_gpu_freq(&ctx, &ctx.gpu_freq); init_gem_objects(&ctx, &ctx.gem_objects); - sample_period = get_sample_period(&config); - i = 0; while (1) { ctx.time = time(NULL); @@ -950,9 +951,24 @@ int main(int argc, char **argv) show_gem_objects(&ctx, &ctx.gem_objects); { - char buf[80]; + struct gpu_top *gt = &ctx.gpu_top.gpu_top; cairo_text_extents_t extents; + char buf[256]; + gethostname(buf, sizeof(buf)); + + if (gt->have_load_avg) { + int len = strlen(buf); + + snprintf(buf + len, sizeof(buf) - len, + "%s; %u engines; load %s %.2f, %s %.2f, %s %.2f", + buf, + gt->num_rings, + gt->load_name[0], gt->load[0], + gt->load_name[1], gt->load[1], + gt->load_name[2], gt->load[2]); + } + cairo_set_source_rgb(ctx.cr, .5, .5, .5); cairo_set_font_size(ctx.cr, PAD-2); cairo_text_extents(ctx.cr, buf, &extents);