perf bench mem: Pull out init/fini logic

No functional change.

Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Raghavendra K T <raghavendra.kt@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/bench/mem-functions.c b/tools/perf/bench/mem-functions.c
index 4d723774c1b3ec61572f09c9bdb36577384420dc..60ea202775073aedfac51e73c0cf32ef1c24b0a3 100644 (file)
--- a/tools/perf/bench/mem-functions.c
+++ b/tools/perf/bench/mem-functions.c
@@ -62,15 +62,31 @@ struct bench_params {
        unsigned int    nr_loops;
 };
 
+struct bench_mem_info {
+       const struct function *functions;
+       int (*do_op)(const struct function *r, struct bench_params *p,
+                    void *src, void *dst, union bench_clock *rt);
+       const char *const *usage;
+       bool alloc_src;
+};
+
+typedef bool (*mem_init_t)(struct bench_mem_info *, struct bench_params *,
+                          void **, void **);
+typedef void (*mem_fini_t)(struct bench_mem_info *, struct bench_params *,
+                          void **, void **);
 typedef void *(*memcpy_t)(void *, const void *, size_t);
 typedef void *(*memset_t)(void *, int, size_t);
 
 struct function {
        const char *name;
        const char *desc;
-       union {
-               memcpy_t memcpy;
-               memset_t memset;
+       struct {
+               mem_init_t init;
+               mem_fini_t fini;
+               union {
+                       memcpy_t memcpy;
+                       memset_t memset;
+               };
        } fn;
 };
 
@@ -138,37 +154,24 @@ static double timeval2double(struct timeval *ts)
                        printf(" %14lf GB/sec\n", x / K / K / K);       \
        } while (0)
 
-struct bench_mem_info {
-       const struct function *functions;
-       union bench_clock (*do_op)(const struct function *r, struct bench_params *p,
-                                  void *src, void *dst);
-       const char *const *usage;
-       bool alloc_src;
-};
-
 static void __bench_mem_function(struct bench_mem_info *info, struct bench_params *p,
                                 int r_idx)
 {
        const struct function *r = &info->functions[r_idx];
        double result_bps = 0.0;
        union bench_clock rt = { 0 };
-       void *src = NULL, *dst = zalloc(p->size);
+       void *src = NULL, *dst = NULL;
 
        printf("# function '%s' (%s)\n", r->name, r->desc);
 
-       if (dst == NULL)
-               goto out_alloc_failed;
-
-       if (info->alloc_src) {
-               src = zalloc(p->size);
-               if (src == NULL)
-                       goto out_alloc_failed;
-       }
+       if (r->fn.init && r->fn.init(info, p, &src, &dst))
+               goto out_init_failed;
 
        if (bench_format == BENCH_FORMAT_DEFAULT)
                printf("# Copying %s bytes ...\n\n", size_str);
 
-       rt = info->do_op(r, p, src, dst);
+       if (info->do_op(r, p, src, dst, &rt))
+               goto out_test_failed;
 
        switch (bench_format) {
        case BENCH_FORMAT_DEFAULT:
@@ -194,11 +197,11 @@ static void __bench_mem_function(struct bench_mem_info *info, struct bench_param
                break;
        }
 
+out_test_failed:
 out_free:
-       free(src);
-       free(dst);
+       if (r->fn.fini) r->fn.fini(info, p, &src, &dst);
        return;
-out_alloc_failed:
+out_init_failed:
        printf("# Memory allocation failed - maybe size (%s) is too large?\n", size_str);
        goto out_free;
 }
@@ -265,8 +268,8 @@ static void memcpy_prefault(memcpy_t fn, size_t size, void *src, void *dst)
        fn(dst, src, size);
 }
 
-static union bench_clock do_memcpy(const struct function *r, struct bench_params *p,
-                                  void *src, void *dst)
+static int do_memcpy(const struct function *r, struct bench_params *p,
+                    void *src, void *dst, union bench_clock *rt)
 {
        union bench_clock start, end;
        memcpy_t fn = r->fn.memcpy;
@@ -278,16 +281,47 @@ static union bench_clock do_memcpy(const struct function *r, struct bench_params
                fn(dst, src, p->size);
        clock_get(&end);
 
-       return clock_diff(&start, &end);
+       *rt = clock_diff(&start, &end);
+
+       return 0;
+}
+
+static bool mem_alloc(struct bench_mem_info *info, struct bench_params *p,
+                     void **src, void **dst)
+{
+       bool failed;
+
+       *dst = zalloc(p->size);
+       failed = *dst == NULL;
+
+       if (info->alloc_src) {
+               *src = zalloc(p->size);
+               failed = failed || *src == NULL;
+       }
+
+       return failed;
+}
+
+static void mem_free(struct bench_mem_info *info __maybe_unused,
+                    struct bench_params *p __maybe_unused,
+                    void **src, void **dst)
+{
+       free(*dst);
+       free(*src);
+
+       *dst = *src = NULL;
 }
 
 struct function memcpy_functions[] = {
        { .name         = "default",
          .desc         = "Default memcpy() provided by glibc",
+         .fn.init      = mem_alloc,
+         .fn.fini      = mem_free,
          .fn.memcpy    = memcpy },
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
-# define MEMCPY_FN(_fn, _name, _desc) {.name = _name, .desc = _desc, .fn.memcpy = _fn},
+# define MEMCPY_FN(_fn, _init, _fini, _name, _desc)    \
+       {.name = _name, .desc = _desc, .fn.memcpy = _fn, .fn.init = _init, .fn.fini = _fini },
 # include "mem-memcpy-x86-64-asm-def.h"
 # undef MEMCPY_FN
 #endif
@@ -312,8 +346,8 @@ int bench_mem_memcpy(int argc, const char **argv)
        return bench_mem_common(argc, argv, &info);
 }
 
-static union bench_clock do_memset(const struct function *r, struct bench_params *p,
-                                  void *src __maybe_unused, void *dst)
+static int do_memset(const struct function *r, struct bench_params *p,
+                    void *src __maybe_unused, void *dst, union bench_clock *rt)
 {
        union bench_clock start, end;
        memset_t fn = r->fn.memset;
@@ -329,7 +363,9 @@ static union bench_clock do_memset(const struct function *r, struct bench_params
                fn(dst, i, p->size);
        clock_get(&end);
 
-       return clock_diff(&start, &end);
+       *rt = clock_diff(&start, &end);
+
+       return 0;
 }
 
 static const char * const bench_mem_memset_usage[] = {
@@ -340,10 +376,13 @@ static const char * const bench_mem_memset_usage[] = {
 static const struct function memset_functions[] = {
        { .name         = "default",
          .desc         = "Default memset() provided by glibc",
+         .fn.init      = mem_alloc,
+         .fn.fini      = mem_free,
          .fn.memset    = memset },
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
-# define MEMSET_FN(_fn, _name, _desc) { .name = _name, .desc = _desc, .fn.memset = _fn },
+# define MEMSET_FN(_fn, _init, _fini, _name, _desc) \
+       {.name = _name, .desc = _desc, .fn.memset = _fn, .fn.init = _init, .fn.fini = _fini },
 # include "mem-memset-x86-64-asm-def.h"
 # undef MEMSET_FN
 #endif

diff --git a/tools/perf/bench/mem-memcpy-arch.h b/tools/perf/bench/mem-memcpy-arch.h
index 5bcaec5601a81b851343b43328201dbed3e2f1bd..852e48cfd8feaaa84d2816a64a6364374ca2cf66 100644 (file)
--- a/tools/perf/bench/mem-memcpy-arch.h
+++ b/tools/perf/bench/mem-memcpy-arch.h
@@ -2,7 +2,7 @@
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
 
-#define MEMCPY_FN(fn, name, desc)              \
+#define MEMCPY_FN(fn, init, fini, name, desc)          \
        void *fn(void *, const void *, size_t);
 
 #include "mem-memcpy-x86-64-asm-def.h"

diff --git a/tools/perf/bench/mem-memcpy-x86-64-asm-def.h b/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
index 6188e19d312967d426ffd59cc9f9e4939c7db557..f43038f4448bc4bbebc07d8a22af54a15a52296e 100644 (file)
--- a/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
+++ b/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
 MEMCPY_FN(memcpy_orig,
+       mem_alloc,
+       mem_free,
        "x86-64-unrolled",
        "unrolled memcpy() in arch/x86/lib/memcpy_64.S")
 
 MEMCPY_FN(__memcpy,
+       mem_alloc,
+       mem_free,
        "x86-64-movsq",
        "movsq-based memcpy() in arch/x86/lib/memcpy_64.S")

diff --git a/tools/perf/bench/mem-memset-arch.h b/tools/perf/bench/mem-memset-arch.h
index 53f45482663fe3acc7e204c8d627462dd3b86933..278c5da12d6354232ee9b0b25691efcd945ea96f 100644 (file)
--- a/tools/perf/bench/mem-memset-arch.h
+++ b/tools/perf/bench/mem-memset-arch.h
@@ -2,7 +2,7 @@
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
 
-#define MEMSET_FN(fn, name, desc)              \
+#define MEMSET_FN(fn, init, fini, name, desc)  \
        void *fn(void *, int, size_t);
 
 #include "mem-memset-x86-64-asm-def.h"

diff --git a/tools/perf/bench/mem-memset-x86-64-asm-def.h b/tools/perf/bench/mem-memset-x86-64-asm-def.h
index 247c72fdfb9d4083834177ab7c39ab36ae8900e6..80ad1b7ea7709b65b440bf108d7d20748c407ca3 100644 (file)
--- a/tools/perf/bench/mem-memset-x86-64-asm-def.h
+++ b/tools/perf/bench/mem-memset-x86-64-asm-def.h
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
 MEMSET_FN(memset_orig,
+       mem_alloc,
+       mem_free,
        "x86-64-unrolled",
        "unrolled memset() in arch/x86/lib/memset_64.S")
 
 MEMSET_FN(__memset,
+       mem_alloc,
+       mem_free,
        "x86-64-stosq",
        "movsq-based memset() in arch/x86/lib/memset_64.S")