Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580Ab1DPGkt (ORCPT ); Sat, 16 Apr 2011 02:40:49 -0400 Received: from ozlabs.org ([203.10.76.45]:54167 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751360Ab1DPGks (ORCPT ); Sat, 16 Apr 2011 02:40:48 -0400 Date: Sat, 16 Apr 2011 16:40:22 +1000 From: Anton Blanchard To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org Subject: [PATCH] perf annotate: Add config option for additional objdump arguments Message-ID: <20110416164022.4ee0f8aa@kryten> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2470 Lines: 82 We sometimes need to pass arguments to objdump, for example to specify a particular machine type. In the case below I am profiling on POWER7 and perf annotate is unable to decode a POWER7 specific instruction: c000000000008ff0: 7f 45 26 98 .long 0x7f452698 With the patch below and the following in ~/.perfconfig: [objdump] options = -Mpower7 perf annotate successfully decodes the instruction: c000000000008ff0: 7f 45 26 98 lxvd2x vs26,r5,r4 Signed-off-by: Anton Blanchard --- What do people think of objdump.options? Would annotate.objdump_options be better? Also we only look at the first occurance of the option, do we want to parse everything found and concatenate them together? Index: linux.trees.git/tools/perf/util/annotate.c =================================================================== --- linux.trees.git.orig/tools/perf/util/annotate.c 2011-04-16 16:00:31.000000000 +1000 +++ linux.trees.git/tools/perf/util/annotate.c 2011-04-16 16:26:46.000000000 +1000 @@ -16,10 +16,33 @@ #include "annotate.h" #include +static char *objdump_options; + +static int perf_objdump_config(const char *var, const char *value, void *cb) +{ + if (objdump_options == NULL && !strcmp(var, "objdump.options")) { + size_t len = strlen(value); + + objdump_options = zalloc(len + 1); + strncpy(objdump_options, value, len); + + return 0; + } + + return perf_default_config(var, value, cb); +} + int symbol__annotate_init(struct map *map __used, struct symbol *sym) { struct annotation *notes = symbol__annotation(sym); pthread_mutex_init(¬es->lock, NULL); + + if (objdump_options == NULL) { + perf_config(perf_objdump_config, NULL); + if (objdump_options == NULL) + objdump_options = zalloc(1); + } + return 0; } @@ -324,9 +347,11 @@ fallback: snprintf(command, sizeof(command), "objdump --start-address=0x%016" PRIx64 - " --stop-address=0x%016" PRIx64 " -dS -C %s|grep -v %s|expand", + " --stop-address=0x%016" PRIx64 " %s -dS -C %s|" + "grep -v %s|expand", map__rip_2objdump(map, sym->start), map__rip_2objdump(map, sym->end), + objdump_options, symfs_filename, filename); pr_debug("Executing: %s\n", command); -- 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/