Em Mon, Aug 10, 2020 at 08:22:00AM +0200, Alexander Gordeev escreveu: > Standard benchmark names let users know the tests specifics. > For example "2x1-bw-process" name tells that two processes > one thread each are run and the RAM bandwidth is measured. > > Several benchmarks names do not correspond to their actual > running configuration. Fix that and also some whitespace > and comment inconsistencies.
Looks, ok, applied. - Arnaldo > Cc: Peter Zijlstra <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Arnaldo Carvalho de Melo <[email protected]> > Cc: Mark Rutland <[email protected]> > Cc: Alexander Shishkin <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Signed-off-by: Alexander Gordeev <[email protected]> > --- > tools/perf/bench/numa.c | 35 +++++++++++++++++------------------ > 1 file changed, 17 insertions(+), 18 deletions(-) > > diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c > index 90639c9..3b4b63f 100644 > --- a/tools/perf/bench/numa.c > +++ b/tools/perf/bench/numa.c > @@ -812,12 +812,12 @@ static u64 do_work(u8 *__data, long bytes, int nr, int > nr_max, int loop, u64 val > } > } > } else if (!g->p.data_backwards || (nr + loop) & 1) { > + /* Process data forwards: */ > > d0 = data + off; > d = data + off + 1; > d1 = data + words; > > - /* Process data forwards: */ > for (;;) { > if (unlikely(d >= d1)) > d = data; > @@ -835,7 +835,6 @@ static u64 do_work(u8 *__data, long bytes, int nr, int > nr_max, int loop, u64 val > d = data + off - 1; > d1 = data + words; > > - /* Process data forwards: */ > for (;;) { > if (unlikely(d < data)) > d = data + words-1; > @@ -1732,12 +1731,12 @@ static int run_bench_numa(const char *name, const > char **argv) > */ > static const char *tests[][MAX_ARGS] = { > /* Basic single-stream NUMA bandwidth measurements: */ > - { "RAM-bw-local,", "mem", "-p", "1", "-t", "1", "-P", "1024", > + { "RAM-bw-local,", "mem", "-p", "1", "-t", "1", "-P", "1024", > "-C" , "0", "-M", "0", OPT_BW_RAM }, > { "RAM-bw-local-NOTHP,", > "mem", "-p", "1", "-t", "1", "-P", "1024", > "-C" , "0", "-M", "0", OPT_BW_RAM_NOTHP }, > - { "RAM-bw-remote,", "mem", "-p", "1", "-t", "1", "-P", "1024", > + { "RAM-bw-remote,", "mem", "-p", "1", "-t", "1", "-P", "1024", > "-C" , "0", "-M", "1", OPT_BW_RAM }, > > /* 2-stream NUMA bandwidth measurements: */ > @@ -1779,24 +1778,24 @@ static int run_bench_numa(const char *name, const > char **argv) > "mem", "-p", "8", "-t", "1", "-P", " 512", > OPT_BW_NOTHP }, > { "16x1-bw-process,", "mem", "-p", "16", "-t", "1", "-P", "256", > OPT_BW }, > > - { " 4x1-bw-thread,", "mem", "-p", "1", "-t", "4", "-T", "256", > OPT_BW }, > - { " 8x1-bw-thread,", "mem", "-p", "1", "-t", "8", "-T", "256", > OPT_BW }, > - { "16x1-bw-thread,", "mem", "-p", "1", "-t", "16", "-T", "128", > OPT_BW }, > - { "32x1-bw-thread,", "mem", "-p", "1", "-t", "32", "-T", "64", > OPT_BW }, > + { " 1x4-bw-thread,", "mem", "-p", "1", "-t", "4", "-T", "256", > OPT_BW }, > + { " 1x8-bw-thread,", "mem", "-p", "1", "-t", "8", "-T", "256", > OPT_BW }, > + { "1x16-bw-thread,", "mem", "-p", "1", "-t", "16", "-T", "128", > OPT_BW }, > + { "1x32-bw-thread,", "mem", "-p", "1", "-t", "32", "-T", "64", > OPT_BW }, > > - { " 2x3-bw-thread,", "mem", "-p", "2", "-t", "3", "-P", "512", > OPT_BW }, > - { " 4x4-bw-thread,", "mem", "-p", "4", "-t", "4", "-P", "512", > OPT_BW }, > - { " 4x6-bw-thread,", "mem", "-p", "4", "-t", "6", "-P", "512", > OPT_BW }, > - { " 4x8-bw-thread,", "mem", "-p", "4", "-t", "8", "-P", "512", > OPT_BW }, > - { " 4x8-bw-thread-NOTHP,", > + { " 2x3-bw-process,", "mem", "-p", "2", "-t", "3", "-P", "512", > OPT_BW }, > + { " 4x4-bw-process,", "mem", "-p", "4", "-t", "4", "-P", "512", > OPT_BW }, > + { " 4x6-bw-process,", "mem", "-p", "4", "-t", "6", "-P", "512", > OPT_BW }, > + { " 4x8-bw-process,", "mem", "-p", "4", "-t", "8", "-P", "512", > OPT_BW }, > + { " 4x8-bw-process-NOTHP,", > "mem", "-p", "4", "-t", "8", "-P", "512", > OPT_BW_NOTHP }, > - { " 3x3-bw-thread,", "mem", "-p", "3", "-t", "3", "-P", "512", > OPT_BW }, > - { " 5x5-bw-thread,", "mem", "-p", "5", "-t", "5", "-P", "512", > OPT_BW }, > + { " 3x3-bw-process,", "mem", "-p", "3", "-t", "3", "-P", "512", > OPT_BW }, > + { " 5x5-bw-process,", "mem", "-p", "5", "-t", "5", "-P", "512", > OPT_BW }, > > - { "2x16-bw-thread,", "mem", "-p", "2", "-t", "16", "-P", "512", > OPT_BW }, > - { "1x32-bw-thread,", "mem", "-p", "1", "-t", "32", "-P", "2048", > OPT_BW }, > + { "2x16-bw-process,", "mem", "-p", "2", "-t", "16", "-P", "512", > OPT_BW }, > + { "1x32-bw-process,", "mem", "-p", "1", "-t", "32", "-P", "2048", > OPT_BW }, > > - { "numa02-bw,", "mem", "-p", "1", "-t", "32", "-T", "32", OPT_BW > }, > + { "numa02-bw,", "mem", "-p", "1", "-t", "32", "-T", "32", > OPT_BW }, > { "numa02-bw-NOTHP,", "mem", "-p", "1", "-t", "32", "-T", "32", > OPT_BW_NOTHP }, > { "numa01-bw-thread,", "mem", "-p", "2", "-t", "16", "-T", "192", > OPT_BW }, > { "numa01-bw-thread-NOTHP,", > -- > 1.8.3.1 > -- - Arnaldo
