Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754660AbZITQOu (ORCPT ); Sun, 20 Sep 2009 12:14:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753616AbZITQOi (ORCPT ); Sun, 20 Sep 2009 12:14:38 -0400 Received: from casper.infradead.org ([85.118.1.10]:50848 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753464AbZITQOf convert rfc822-to-8bit (ORCPT ); Sun, 20 Sep 2009 12:14:35 -0400 Date: Sun, 20 Sep 2009 18:14:38 +0200 From: Arjan van de Ven To: linux-kernel@vger.kernel.org Cc: Arjan van de Ven , paulus@samba.org, ahpa@zytor.com, mingo@redhat.com, tglx@linutronix.de, mingo@elte.hu Subject: [PATCH] perf util: SVG performance improvements Message-ID: <20090920181438.3a49cb93@linux.intel.com> In-Reply-To: <20090920181248.464c9193@infradead.org> References: <20090920181248.464c9193@infradead.org> Organization: Intel X-Mailer: Claws Mail 3.7.2 (GTK+ 2.14.7; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9750 Lines: 217 >From dc31cd02966e59f1db4266e2c25a8bbf6f6e4f5f Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 20 Sep 2009 11:35:53 +0200 Subject: [PATCH] perf util: SVG performance improvements Tweak the output SVG to increase performance in SVG viewers by limiting the different types of font sizes and by smarter transformations on the text. At least with Inkscape this gives a notable performance improvement during zoom and scrolling. Signed-off-by: Arjan van de Ven --- tools/perf/util/svghelper.c | 78 ++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 23 deletions(-) diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c index be1555e..a778fd0 100644 --- a/tools/perf/util/svghelper.c +++ b/tools/perf/util/svghelper.c @@ -51,6 +51,25 @@ static double time2pixels(u64 time) return X; } +/* + * Round text sizes so that the svg viewer only needs a discrete + * number of renderings of the font + */ +static double round_text_size(double size) +{ + int loop = 100; + double target = 10.0; + + if (size >= 10.0) + return size; + while (loop--) { + if (size >= target) + return target; + target = target / 2.0; + } + return size; +} + void open_svg(const char *filename, int cpus, int rows, u64 start, u64 end) { int new_width; @@ -122,8 +141,10 @@ void svg_sample(int Yslot, int cpu, u64 start, u64 end) text_size = text_size/2; if (text_size > 1.25) text_size = 1.25; + text_size = round_text_size(text_size); + if (text_size > MIN_TEXT_SIZE) - fprintf(svgfile, "%i\n", + fprintf(svgfile, "%i\n", time2pixels(start), Yslot * SLOT_MULT + SLOT_HEIGHT - 1, text_size, cpu + 1); } @@ -162,17 +183,20 @@ void svg_waiting(int Yslot, u64 start, u64 end) text = time_to_string(end-start); - font_size = 1.0 * (time2pixels(end)-time2pixels(start)) / strlen(text); + font_size = 1.0 * (time2pixels(end)-time2pixels(start)); - if (font_size > 0.2) - font_size = 0.2; + if (font_size > 3) + font_size = 3; + font_size = round_text_size(font_size); - fprintf(svgfile, "\n", - time2pixels(start), time2pixels(end)-time2pixels(start), Yslot * SLOT_MULT, SLOT_HEIGHT, style); + fprintf(svgfile, "\n", time2pixels(start), Yslot * SLOT_MULT); + fprintf(svgfile, "\n", + time2pixels(end)-time2pixels(start), SLOT_HEIGHT, style); if (font_size > MIN_TEXT_SIZE) - fprintf(svgfile, "%s\n", - time2pixels(start), Yslot * SLOT_MULT + 2, font_size, text); + fprintf(svgfile, " %s\n", + font_size, text); + fprintf(svgfile, "\n"); } static char *cpu_model(void) @@ -211,7 +235,7 @@ void svg_cpu_box(int cpu, u64 __max_freq, u64 __turbo_freq) cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT); sprintf(cpu_string, "CPU %i", (int)cpu+1); - fprintf(svgfile, "%s\n", + fprintf(svgfile, "%s\n", 10+time2pixels(first_time), cpu2y(cpu) + SLOT_HEIGHT/2, cpu_string); fprintf(svgfile, "%s\n", @@ -225,15 +249,21 @@ void svg_process(int cpu, u64 start, u64 end, const char *type, const char *name if (!svgfile) return; - fprintf(svgfile, "\n", - time2pixels(start), time2pixels(end)-time2pixels(start), cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT, type); + + fprintf(svgfile, "\n", time2pixels(start), cpu2y(cpu)); + fprintf(svgfile, "\n", + time2pixels(end)-time2pixels(start), SLOT_MULT+SLOT_HEIGHT, type); width = time2pixels(end)-time2pixels(start); if (width > 6) width = 6; + width = round_text_size(width); + if (width > MIN_TEXT_SIZE) - fprintf(svgfile, "%s\n", - time2pixels(start), cpu2y(cpu), width, name); + fprintf(svgfile, "%s\n", + width, name); + + fprintf(svgfile, "\n"); } void svg_cstate(int cpu, u64 start, u64 end, int type) @@ -254,13 +284,15 @@ void svg_cstate(int cpu, u64 start, u64 end, int type) time2pixels(start), time2pixels(end)-time2pixels(start), cpu2y(cpu), SLOT_MULT+SLOT_HEIGHT); - width = time2pixels(end)-time2pixels(start); + width = (time2pixels(end)-time2pixels(start))/2.0; if (width > 6) width = 6; + width = round_text_size(width); + if (width > MIN_TEXT_SIZE) - fprintf(svgfile, "C%i\n", - time2pixels(start), cpu2y(cpu), width, type); + fprintf(svgfile, "C%i\n", + time2pixels(start), cpu2y(cpu)+width, width, type); } static char *HzToHuman(unsigned long hz) @@ -299,7 +331,7 @@ void svg_pstate(int cpu, u64 start, u64 end, u64 freq) height = 1 + cpu2y(cpu) + SLOT_MULT + SLOT_HEIGHT - height; fprintf(svgfile, "\n", time2pixels(start), time2pixels(end), height, height); - fprintf(svgfile, "%s\n", + fprintf(svgfile, "%s\n", time2pixels(start), height+0.9, HzToHuman(freq)); } @@ -318,14 +350,14 @@ void svg_partial_wakeline(u64 start, int row1, char *desc1, int row2, char *desc fprintf(svgfile, "\n", time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT, time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/32); if (desc2) - fprintf(svgfile, "%s >\n", + fprintf(svgfile, "%s >\n", time2pixels(start), row1 * SLOT_MULT + SLOT_HEIGHT + SLOT_HEIGHT/48, desc2); } if (row2) { fprintf(svgfile, "\n", time2pixels(start), row2 * SLOT_MULT - SLOT_MULT/32, time2pixels(start), row2 * SLOT_MULT); if (desc1) - fprintf(svgfile, "%s >\n", + fprintf(svgfile, "%s >\n", time2pixels(start), row2 * SLOT_MULT - SLOT_MULT/32, desc1); } } else { @@ -333,14 +365,14 @@ void svg_partial_wakeline(u64 start, int row1, char *desc1, int row2, char *desc fprintf(svgfile, "\n", time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT, time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/32); if (desc1) - fprintf(svgfile, "%s <\n", + fprintf(svgfile, "%s <\n", time2pixels(start), row2 * SLOT_MULT + SLOT_HEIGHT + SLOT_MULT/48, desc1); } if (row1) { fprintf(svgfile, "\n", time2pixels(start), row1 * SLOT_MULT - SLOT_MULT/32, time2pixels(start), row1 * SLOT_MULT); if (desc2) - fprintf(svgfile, "%s <\n", + fprintf(svgfile, "%s <\n", time2pixels(start), row1 * SLOT_MULT - SLOT_HEIGHT/32, desc2); } } @@ -390,7 +422,7 @@ void svg_text(int Yslot, u64 start, const char *text) if (!svgfile) return; - fprintf(svgfile, "%s\n", + fprintf(svgfile, "%s\n", time2pixels(start), Yslot * SLOT_MULT+SLOT_HEIGHT/2, text); } @@ -401,7 +433,7 @@ static void svg_legenda_box(int X, const char *text, const char *style) fprintf(svgfile, "\n", X, boxsize, boxsize, style); - fprintf(svgfile, "%s\n", + fprintf(svgfile, "%s\n", X + boxsize + 5, boxsize, 0.8 * boxsize, text); } -- 1.6.0.6 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/