From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753653AbbJTHr2 (ORCPT ); Tue, 20 Oct 2015 03:47:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48265 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753000AbbJTHrZ (ORCPT ); Tue, 20 Oct 2015 03:47:25 -0400 Date: Tue, 20 Oct 2015 00:46:50 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, jolsa@redhat.com, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, mitake@dcl.info.waseda.ac.jp Reply-To: namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, mitake@dcl.info.waseda.ac.jp, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, jolsa@redhat.com, mingo@kernel.org In-Reply-To: <1445241870-24854-12-git-send-email-mingo@kernel.org> References: <1445241870-24854-12-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bench mem: Reorganize the code a bit Git-Commit-ID: 5dd93304a5d386c73c0a59117752acdca67f857d 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: 5dd93304a5d386c73c0a59117752acdca67f857d Gitweb: http://git.kernel.org/tip/5dd93304a5d386c73c0a59117752acdca67f857d Author: Ingo Molnar AuthorDate: Mon, 19 Oct 2015 10:04:27 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 19 Oct 2015 16:07:19 -0300 perf bench mem: Reorganize the code a bit Reorder functions a bit, so that we synchronize the layout of the memcpy() and memset() portions of the code. This improves the code, especially after we'll add an strlcpy() variant as well. Signed-off-by: Ingo Molnar Cc: David Ahern Cc: Hitoshi Mitake Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1445241870-24854-12-git-send-email-mingo@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/bench/mem-functions.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c index 318da34..8d980d4 100644 --- a/tools/perf/bench/mem-functions.c +++ b/tools/perf/bench/mem-functions.c @@ -58,25 +58,6 @@ struct routine { } fn; }; -struct routine memcpy_routines[] = { - { .name = "default", - .desc = "Default memcpy() provided by glibc", - .fn.memcpy = memcpy }, - -#ifdef HAVE_ARCH_X86_64_SUPPORT -# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn}, -# include "mem-memcpy-x86-64-asm-def.h" -# undef MEMCPY_FN -#endif - - { NULL, } -}; - -static const char * const bench_mem_memcpy_usage[] = { - "perf bench mem memcpy ", - NULL -}; - static struct perf_event_attr cycle_attr = { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES @@ -278,6 +259,25 @@ static double do_memcpy_gettimeofday(const struct routine *r, size_t size) return (double)(((double)size * iterations) / timeval2double(&tv_diff)); } +struct routine memcpy_routines[] = { + { .name = "default", + .desc = "Default memcpy() provided by glibc", + .fn.memcpy = memcpy }, + +#ifdef HAVE_ARCH_X86_64_SUPPORT +# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn}, +# include "mem-memcpy-x86-64-asm-def.h" +# undef MEMCPY_FN +#endif + + { NULL, } +}; + +static const char * const bench_mem_memcpy_usage[] = { + "perf bench mem memcpy ", + NULL +}; + int bench_mem_memcpy(int argc, const char **argv, const char *prefix __maybe_unused) { struct bench_mem_info info = {