From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933536AbcKYRoG (ORCPT ); Fri, 25 Nov 2016 12:44:06 -0500 Received: from terminus.zytor.com ([198.137.202.10]:50600 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933468AbcKYRnv (ORCPT ); Fri, 25 Nov 2016 12:43:51 -0500 Date: Fri, 25 Nov 2016 09:16:44 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: kim.phillips@arm.com, pawel.moll@arm.com, markus@trippelsdorf.de, tglx@linutronix.de, jolsa@kernel.org, dsahern@gmail.com, ravi.bangoria@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, treeze.taeung@gmail.com, acme@redhat.com, mhiramat@kernel.org, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, mingo@kernel.org, rmk+kernel@arm.linux.org.uk, hpa@zytor.com, wangnan0@huawei.com, peterz@infradead.org, chris.ryder@arm.com, naveen.n.rao@linux.vnet.ibm.com, namhyung@kernel.org Reply-To: rmk+kernel@arm.linux.org.uk, hpa@zytor.com, mingo@kernel.org, adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, chris.ryder@arm.com, naveen.n.rao@linux.vnet.ibm.com, peterz@infradead.org, wangnan0@huawei.com, dsahern@gmail.com, jolsa@kernel.org, ravi.bangoria@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, markus@trippelsdorf.de, kim.phillips@arm.com, pawel.moll@arm.com, mhiramat@kernel.org, acme@redhat.com, treeze.taeung@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Introduce alternative method of keeping instructions table Git-Commit-ID: 2a1ff812c40be982e4dd7a44159462fb25bebdf3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2a1ff812c40be982e4dd7a44159462fb25bebdf3 Gitweb: http://git.kernel.org/tip/2a1ff812c40be982e4dd7a44159462fb25bebdf3 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 24 Nov 2016 11:37:08 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 25 Nov 2016 10:38:44 -0300 perf annotate: Introduce alternative method of keeping instructions table Some arches may want to dynamically populate the table using regular expressions on the instruction names to associate them with a set of parsing/formatting/etc functions (struct ins_ops), so provide a fallback for when the ins__find() method fails. That fall back will be able to resize the arch->instructions, setting arch->nr_instructions appropriately, helper functions to associate an ins_ops to an instruction name, growing the arch->instructions if needed and resorting it are provided, all the arch specific callback needs to do is to decide if the missing instruction should be added to arch->instructions with a ins_ops association. Reviewed-by: Ravi Bangoria Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Chris Riyder Cc: David Ahern Cc: Jiri Olsa Cc: Kim Phillips Cc: Markus Trippelsdorf Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Naveen N. Rao Cc: Pawel Moll Cc: Peter Zijlstra Cc: Russell King Cc: Taeung Song Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-auu13yradxf7g5dgtpnzt97a@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index b48a39b..026915a 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -29,12 +29,15 @@ const char *objdump_path; static regex_t file_lineno; static struct ins_ops *ins__find(struct arch *arch, const char *name); +static void ins__sort(struct arch *arch); static int disasm_line__parse(char *line, const char **namep, char **rawp); struct arch { const char *name; struct ins *instructions; size_t nr_instructions; + size_t nr_instructions_allocated; + struct ins_ops *(*associate_instruction_ops)(struct arch *arch, const char *name); bool sorted_instructions; struct { char comment_char; @@ -50,6 +53,54 @@ static struct ins_ops nop_ops; static struct ins_ops lock_ops; static struct ins_ops ret_ops; +static int arch__grow_instructions(struct arch *arch) +{ + struct ins *new_instructions; + size_t new_nr_allocated; + + if (arch->nr_instructions_allocated == 0 && arch->instructions) + goto grow_from_non_allocated_table; + + new_nr_allocated = arch->nr_instructions_allocated + 128; + new_instructions = realloc(arch->instructions, new_nr_allocated * sizeof(struct ins)); + if (new_instructions == NULL) + return -1; + +out_update_instructions: + arch->instructions = new_instructions; + arch->nr_instructions_allocated = new_nr_allocated; + return 0; + +grow_from_non_allocated_table: + new_nr_allocated = arch->nr_instructions + 128; + new_instructions = calloc(new_nr_allocated, sizeof(struct ins)); + if (new_instructions == NULL) + return -1; + + memcpy(new_instructions, arch->instructions, arch->nr_instructions); + goto out_update_instructions; +} + +static __maybe_unused int arch__associate_ins_ops(struct arch* arch, const char *name, struct ins_ops *ops) +{ + struct ins *ins; + + if (arch->nr_instructions == arch->nr_instructions_allocated && + arch__grow_instructions(arch)) + return -1; + + ins = &arch->instructions[arch->nr_instructions]; + ins->name = strdup(name); + if (!ins->name) + return -1; + + ins->ops = ops; + arch->nr_instructions++; + + ins__sort(arch); + return 0; +} + #include "arch/arm/annotate/instructions.c" #include "arch/x86/annotate/instructions.c" @@ -419,7 +470,7 @@ static void ins__sort(struct arch *arch) qsort(arch->instructions, nmemb, sizeof(struct ins), ins__cmp); } -static struct ins_ops *ins__find(struct arch *arch, const char *name) +static struct ins_ops *__ins__find(struct arch *arch, const char *name) { struct ins *ins; const int nmemb = arch->nr_instructions; @@ -433,6 +484,16 @@ static struct ins_ops *ins__find(struct arch *arch, const char *name) return ins ? ins->ops : NULL; } +static struct ins_ops *ins__find(struct arch *arch, const char *name) +{ + struct ins_ops *ops = __ins__find(arch, name); + + if (!ops && arch->associate_instruction_ops) + ops = arch->associate_instruction_ops(arch, name); + + return ops; +} + static int arch__key_cmp(const void *name, const void *archp) { const struct arch *arch = archp;