From patchwork Fri Jul 11 16:43:59 2014 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: 33505 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F112020672 for ; Fri, 11 Jul 2014 16:43:50 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id l6sf6473268oag.7 for ; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=NL6EK4PMJTLKu+tHgCy7UMBWtRV5WBNsHPiCwghHd/k=; b=UaL1OYaxyxTHwYhl7gRKdjuLxiZ2QCqXhiuV5u1/w5kgV+RAPyd4m+zbsJC5pqPjNu tjip9rMHJh5JGLzIW7QCyyOBiThloiXJR4/A6bn7CeZ9Ndeiq520BJSRyJGHkYQ83E6/ iiOghxoFg/RqOu3dKGVNewpP1+fxNVTZW+M1NAcM0Q8Cf6V2hZogNYX8Zy72Ryj5aitg NxCaJ3Hk7tzVlKL7gKY41LRBzJgme7w2tJOXF3vXYODLqKQSnF8xcRXmT1wy9H5HKv5L ZzV036fRMwU3SD4uInIW53YZy2SoetGib24x3nlPPnIK63uMsOVBA5oKU5v5YUvGqgsR sEdA== X-Gm-Message-State: ALoCoQn0GKBV9lhGggUz8ZXXJ2USFuFT8bkB5J8TEXIYc2Yulb//hZiGwHL29CPH4LpP//XJe9za X-Received: by 10.50.33.18 with SMTP id n18mr1078129igi.8.1405097030448; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.139 with SMTP id f11ls269294qgf.87.gmail; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) X-Received: by 10.220.133.13 with SMTP id d13mr16938vct.66.1405097030342; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id o6si2051468vcr.56.2014.07.11.09.43.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jul 2014 09:43:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hu12so2575748vcb.12 for ; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr2093192vcf.71.1405097030190; Fri, 11 Jul 2014 09:43:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp50247vcb; Fri, 11 Jul 2014 09:43:49 -0700 (PDT) X-Received: by 10.224.167.70 with SMTP id p6mr94816500qay.79.1405097029535; Fri, 11 Jul 2014 09:43:49 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f62si4256345qgf.30.2014.07.11.09.43.49 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 11 Jul 2014 09:43:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:45888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5dvI-0006Y0-VO for patch@linaro.org; Fri, 11 Jul 2014 12:43:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5duo-0006Gt-7u for qemu-devel@nongnu.org; Fri, 11 Jul 2014 12:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5dui-0000Pk-1y for qemu-devel@nongnu.org; Fri, 11 Jul 2014 12:43:18 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:41910 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5duh-0000Oz-Sp for qemu-devel@nongnu.org; Fri, 11 Jul 2014 12:43:12 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1X5dzl-0000fW-OV; Fri, 11 Jul 2014 18:48:25 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 11 Jul 2014 17:43:59 +0100 Message-Id: <1405097039-9524-1-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.0.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: batuzovk@ispras.ru, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Anthony Liguori , rth@twiddle.net Subject: [Qemu-devel] [PATCH] tcg: add ability to dump /tmp/perf-.map files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This allows the perf tool to map samples to each individual translation block. This could be expanded for user space but currently it gives enough information to find any hotblocks by other means. Signed-off-by: Alex Bennée --- v2: - hoist up into translate-all.c - don't use pointless glib wrappers - use proper format types for portability - mark prologue/epilog area - rebase --- qemu-options.hx | 10 ++++++++++ translate-all.c | 27 +++++++++++++++++++++++++++ vl.c | 6 ++++++ 3 files changed, 43 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index c2c0823..b8c81e3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3220,6 +3220,16 @@ STEXI prepend a timestamp to each log message.(default:on) ETEXI +DEF("perfmap", 0, QEMU_OPTION_PERFMAP, \ + "-perfmap generate a /tmp/perf-${pid}.map file for perf\n", + QEMU_ARCH_ALL) +STEXI +@item -perfmap +@findex -perfmap +This will cause QEMU to generate a map file for Linux perf tools that will allow +basic profiling information to be broken down into basic blocks. +ETEXI + HXCOMM This is the last statement. Insert new options before this line! STEXI @end table diff --git a/translate-all.c b/translate-all.c index 5549a85..0c7cbbe 100644 --- a/translate-all.c +++ b/translate-all.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "config.h" @@ -129,6 +130,25 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb_page_addr_t phys_page2); static TranslationBlock *tb_find_pc(uintptr_t tc_ptr); +static FILE *tb_perfmap = NULL; +/* if I could put this in a header easily.... */ +void tb_enable_perfmap(void); + +void tb_enable_perfmap(void) { + gchar * map_file = g_strdup_printf("/tmp/perf-%d.map", getpid()); + tb_perfmap = fopen(map_file, "w"); + g_free(map_file); +} + +static void tb_write_perfmap(tcg_insn_unit *start, int size, target_ulong pc) +{ + if (tb_perfmap) { + fprintf(tb_perfmap, + "%"PRIxPTR" %x subject-"TARGET_FMT_lx"\n", + (uintptr_t) start, size, pc); + } +} + void cpu_gen_init(void) { tcg_context_init(&tcg_ctx); @@ -184,6 +204,7 @@ int cpu_gen_code(CPUArchState *env, TranslationBlock *tb, int *gen_code_size_ptr s->code_out_len += gen_code_size; #endif + tb_write_perfmap(gen_code_buf, gen_code_size, tb->pc); #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { qemu_log("OUT: [size=%d]\n", gen_code_size); @@ -584,6 +605,12 @@ static inline void code_gen_alloc(size_t tb_size) tcg_ctx.code_gen_buffer_size - 1024; tcg_ctx.code_gen_buffer_size -= 1024; + if (tb_perfmap) { + fprintf(tb_perfmap, + "%"PRIxPTR" %x tcg-prologue-buffer\n", + (uintptr_t) tcg_ctx.code_gen_prologue, 1024); + } + tcg_ctx.code_gen_buffer_max_size = tcg_ctx.code_gen_buffer_size - (TCG_MAX_OP_SIZE * OPC_BUF_SIZE); tcg_ctx.code_gen_max_blocks = tcg_ctx.code_gen_buffer_size / diff --git a/vl.c b/vl.c index d8c1572..7650ec8 100644 --- a/vl.c +++ b/vl.c @@ -118,6 +118,9 @@ int main(int argc, char **argv) #include "qapi/string-input-visitor.h" #include "qom/object_interfaces.h" +/* Not sure where the best place for this is? */ +extern void tb_enable_perfmap(void); + #define DEFAULT_RAM_SIZE 128 #define MAX_VIRTIO_CONSOLES 1 @@ -3387,6 +3390,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_D: log_file = optarg; break; + case QEMU_OPTION_PERFMAP: + tb_enable_perfmap(); + break; case QEMU_OPTION_s: add_device_config(DEV_GDB, "tcp::" DEFAULT_GDBSTUB_PORT); break;