* [PATCH bpf-next 0/4] selftests/bpf: improve test_progs
@ 2021-11-12 19:25 Yucong Sun
2021-11-12 19:25 ` [PATCH bpf-next 1/4] selftests/bpf: Move summary line after the error logs Yucong Sun
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Yucong Sun @ 2021-11-12 19:25 UTC (permalink / raw)
To: bpf; +Cc: andrii, fallentree
various improvement to test_progs, including new '--timing' feature.
Yucong Sun (4):
selftests/bpf: Move summary line after the error logs
selftests/bpf: variable naming fix
selftests/bpf: mark variable as static
selftests/bpf: Add timing to tests_progs
tools/testing/selftests/bpf/test_progs.c | 153 +++++++++++++++++++----
tools/testing/selftests/bpf/test_progs.h | 2 +
2 files changed, 134 insertions(+), 21 deletions(-)
--
2.30.2
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH bpf-next 1/4] selftests/bpf: Move summary line after the error logs 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun @ 2021-11-12 19:25 ` Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 2/4] selftests/bpf: variable naming fix Yucong Sun ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Yucong Sun @ 2021-11-12 19:25 UTC (permalink / raw) To: bpf; +Cc: andrii, fallentree, Yucong Sun From: Yucong Sun <sunyucong@gmail.com> Makes it easier to find the summary line when there is a lot of logs to scroll back. Signed-off-by: Yucong Sun <sunyucong@gmail.com> --- tools/testing/selftests/bpf/test_progs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index c65986bd9d07..d129ea5c9a48 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -1198,11 +1198,11 @@ static int server_main(void) env.sub_succ_cnt += result->sub_succ_cnt; } + print_all_error_logs(); + fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); - print_all_error_logs(); - /* reap all workers */ for (i = 0; i < env.workers; i++) { int wstatus, pid; @@ -1484,11 +1484,11 @@ int main(int argc, char **argv) if (env.list_test_names) goto out; + print_all_error_logs(); + fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); - print_all_error_logs(); - close(env.saved_netns_fd); out: if (!env.list_test_names && env.has_testmod) -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH bpf-next 2/4] selftests/bpf: variable naming fix 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 1/4] selftests/bpf: Move summary line after the error logs Yucong Sun @ 2021-11-12 19:25 ` Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 3/4] selftests/bpf: mark variable as static Yucong Sun ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Yucong Sun @ 2021-11-12 19:25 UTC (permalink / raw) To: bpf; +Cc: andrii, fallentree, Yucong Sun From: Yucong Sun <sunyucong@gmail.com> Change log_fd to log_fp to reflect its type correctly. Signed-off-by: Yucong Sun <sunyucong@gmail.com> --- tools/testing/selftests/bpf/test_progs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index d129ea5c9a48..926475aa10bb 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -939,7 +939,7 @@ static void *dispatch_thread(void *ctx) { struct dispatch_data *data = ctx; int sock_fd; - FILE *log_fd = NULL; + FILE *log_fp = NULL; sock_fd = data->sock_fd; @@ -1002,8 +1002,8 @@ static void *dispatch_thread(void *ctx) /* collect all logs */ if (msg_test_done.test_done.have_log) { - log_fd = open_memstream(&result->log_buf, &result->log_cnt); - if (!log_fd) + log_fp = open_memstream(&result->log_buf, &result->log_cnt); + if (!log_fp) goto error; while (true) { @@ -1014,12 +1014,12 @@ static void *dispatch_thread(void *ctx) if (msg_log.type != MSG_TEST_LOG) goto error; - fprintf(log_fd, "%s", msg_log.test_log.log_buf); + fprintf(log_fp, "%s", msg_log.test_log.log_buf); if (msg_log.test_log.is_last) break; } - fclose(log_fd); - log_fd = NULL; + fclose(log_fp); + log_fp = NULL; } /* output log */ { @@ -1045,8 +1045,8 @@ static void *dispatch_thread(void *ctx) if (env.debug) fprintf(stderr, "[%d]: Protocol/IO error: %s.\n", data->worker_id, strerror(errno)); - if (log_fd) - fclose(log_fd); + if (log_fp) + fclose(log_fp); done: { struct msg msg_exit; -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH bpf-next 3/4] selftests/bpf: mark variable as static 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 1/4] selftests/bpf: Move summary line after the error logs Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 2/4] selftests/bpf: variable naming fix Yucong Sun @ 2021-11-12 19:25 ` Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs Yucong Sun 2021-11-17 5:11 ` [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Andrii Nakryiko 4 siblings, 0 replies; 7+ messages in thread From: Yucong Sun @ 2021-11-12 19:25 UTC (permalink / raw) To: bpf; +Cc: andrii, fallentree, Yucong Sun From: Yucong Sun <sunyucong@gmail.com> Fix warnings from checkstyle.pl Signed-off-by: Yucong Sun <sunyucong@gmail.com> --- tools/testing/selftests/bpf/test_progs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 926475aa10bb..296928948bb9 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -473,11 +473,11 @@ static struct prog_test_def prog_test_defs[] = { #include <prog_tests/tests.h> #undef DEFINE_TEST }; -const int prog_test_cnt = ARRAY_SIZE(prog_test_defs); +static const int prog_test_cnt = ARRAY_SIZE(prog_test_defs); const char *argp_program_version = "test_progs 0.1"; const char *argp_program_bug_address = "<bpf@vger.kernel.org>"; -const char argp_program_doc[] = "BPF selftests test runner"; +static const char argp_program_doc[] = "BPF selftests test runner"; enum ARG_KEYS { ARG_TEST_NUM = 'n', -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun ` (2 preceding siblings ...) 2021-11-12 19:25 ` [PATCH bpf-next 3/4] selftests/bpf: mark variable as static Yucong Sun @ 2021-11-12 19:25 ` Yucong Sun 2021-11-17 5:06 ` Andrii Nakryiko 2021-11-17 5:11 ` [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Andrii Nakryiko 4 siblings, 1 reply; 7+ messages in thread From: Yucong Sun @ 2021-11-12 19:25 UTC (permalink / raw) To: bpf; +Cc: andrii, fallentree, Yucong Sun From: Yucong Sun <sunyucong@gmail.com> This patch adds '--timing' to test_progs. It tracks and print timing information for each tests, it also prints top 10 slowest tests in the summary. Example output: $./test_progs --timing -j #1 align:OK (16 ms) ... #203 xdp_bonding:OK (2019 ms) #206 xdp_cpumap_attach:OK (3 ms) #207 xdp_devmap_attach:OK (4 ms) #208 xdp_info:OK (4 ms) #209 xdp_link:OK (4 ms) Top 10 Slowest tests: #48 fexit_stress: 34356 ms #160 test_lsm: 29602 ms #161 test_overhead: 29190 ms #159 test_local_storage: 28959 ms #158 test_ima: 28521 ms #185 verif_scale_pyperf600: 19524 ms #199 vmlinux: 17310 ms #154 tc_redirect: 11491 ms (serial) #147 task_local_storage: 7612 ms #183 verif_scale_pyperf180: 7186 ms Summary: 212/973 PASSED, 3 SKIPPED, 0 FAILED Signed-off-by: Yucong Sun <sunyucong@gmail.com> --- tools/testing/selftests/bpf/test_progs.c | 125 +++++++++++++++++++++-- tools/testing/selftests/bpf/test_progs.h | 2 + 2 files changed, 120 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 296928948bb9..d4786e1a540f 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -491,6 +491,7 @@ enum ARG_KEYS { ARG_TEST_NAME_GLOB_DENYLIST = 'd', ARG_NUM_WORKERS = 'j', ARG_DEBUG = -1, + ARG_TIMING = -2, }; static const struct argp_option opts[] = { @@ -516,6 +517,8 @@ static const struct argp_option opts[] = { "Number of workers to run in parallel, default to number of cpus." }, { "debug", ARG_DEBUG, NULL, 0, "print extra debug information for test_progs." }, + { "timing", ARG_TIMING, NULL, 0, + "track and print timing information for each test." }, {}, }; @@ -696,6 +699,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) case ARG_DEBUG: env->debug = true; break; + case ARG_TIMING: + env->timing = true; + break; case ARGP_KEY_ARG: argp_usage(state); break; @@ -848,6 +854,7 @@ struct test_result { int error_cnt; int skip_cnt; int sub_succ_cnt; + __u32 duration_ms; size_t log_cnt; char *log_buf; @@ -905,9 +912,29 @@ static int recv_message(int sock, struct msg *msg) return ret; } -static void run_one_test(int test_num) +static __u32 timespec_diff_ms(struct timespec start, struct timespec end) +{ + struct timespec temp; + + if ((end.tv_nsec - start.tv_nsec) < 0) { + temp.tv_sec = end.tv_sec - start.tv_sec - 1; + temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec; + } else { + temp.tv_sec = end.tv_sec - start.tv_sec; + temp.tv_nsec = end.tv_nsec - start.tv_nsec; + } + return (temp.tv_sec * 1000) + (temp.tv_nsec / 1000000); +} + + +static double run_one_test(int test_num) { struct prog_test_def *test = &prog_test_defs[test_num]; + struct timespec start = {}, end = {}; + __u32 duration_ms = 0; + + if (env.timing) + clock_gettime(CLOCK_MONOTONIC, &start); env.test = test; @@ -928,6 +955,13 @@ static void run_one_test(int test_num) restore_netns(); if (test->need_cgroup_cleanup) cleanup_cgroup_environment(); + + if (env.timing) { + clock_gettime(CLOCK_MONOTONIC, &end); + duration_ms = timespec_diff_ms(start, end); + } + + return duration_ms; } struct dispatch_data { @@ -999,6 +1033,7 @@ static void *dispatch_thread(void *ctx) result->error_cnt = msg_test_done.test_done.error_cnt; result->skip_cnt = msg_test_done.test_done.skip_cnt; result->sub_succ_cnt = msg_test_done.test_done.sub_succ_cnt; + result->duration_ms = msg_test_done.test_done.duration_ms; /* collect all logs */ if (msg_test_done.test_done.have_log) { @@ -1023,6 +1058,8 @@ static void *dispatch_thread(void *ctx) } /* output log */ { + char buf[255] = {}; + pthread_mutex_lock(&stdout_output_lock); if (result->log_cnt) { @@ -1032,9 +1069,15 @@ static void *dispatch_thread(void *ctx) fprintf(stdout, "\n"); } - fprintf(stdout, "#%d %s:%s\n", + if (env.timing) { + snprintf(buf, sizeof(buf), " (%u ms)", result->duration_ms); + buf[sizeof(buf) - 1] = '\0'; + } + + fprintf(stdout, "#%d %s:%s%s\n", test->test_num, test->test_name, - result->error_cnt ? "FAIL" : (result->skip_cnt ? "SKIP" : "OK")); + result->error_cnt ? "FAIL" : (result->skip_cnt ? "SKIP" : "OK"), + buf); pthread_mutex_unlock(&stdout_output_lock); } @@ -1092,6 +1135,57 @@ static void print_all_error_logs(void) } } +struct item { + int id; + __u32 duration_ms; +}; + +static int rcompitem(const void *a, const void *b) +{ + __u32 val_a = ((struct item *)a)->duration_ms; + __u32 val_b = ((struct item *)b)->duration_ms; + + if (val_a > val_b) + return -1; + if (val_a < val_b) + return 1; + return 0; +} + +static void print_slow_tests(void) +{ + int i; + struct item items[ARRAY_SIZE(prog_test_defs)] = {}; + + for (i = 0; i < prog_test_cnt; i++) { + struct prog_test_def *test = &prog_test_defs[i]; + struct test_result *result = &test_results[i]; + + if (!test->tested || !result->duration_ms) + continue; + + items[i].id = i; + items[i].duration_ms = result->duration_ms; + } + qsort(&items[0], ARRAY_SIZE(items), sizeof(items[0]), rcompitem); + + fprintf(stdout, "\nTop 10 Slowest tests:\n"); + + for (i = 0; i < 10; i++) { + struct item *v = &items[i]; + struct prog_test_def *test; + + if (!v->duration_ms) + break; + + test = &prog_test_defs[v->id]; + fprintf(stdout, "#%d %s: %u ms%s\n", + test->test_num, test->test_name, v->duration_ms, + test->run_serial_test != NULL ? " (serial)" : ""); + } +} + + static int server_main(void) { pthread_t *dispatcher_threads; @@ -1149,13 +1243,15 @@ static int server_main(void) for (int i = 0; i < prog_test_cnt; i++) { struct prog_test_def *test = &prog_test_defs[i]; struct test_result *result = &test_results[i]; + char buf[255] = {}; + __u32 duration_ms = 0; if (!test->should_run || !test->run_serial_test) continue; stdio_hijack(); - run_one_test(i); + duration_ms = run_one_test(i); stdio_restore(); if (env.log_buf) { @@ -1168,13 +1264,20 @@ static int server_main(void) } restore_netns(); - fprintf(stdout, "#%d %s:%s\n", + if (env.timing) { + snprintf(buf, sizeof(buf), " (%u ms)", duration_ms); + buf[sizeof(buf) - 1] = '\0'; + } + + fprintf(stdout, "#%d %s:%s%s\n", test->test_num, test->test_name, - test->error_cnt ? "FAIL" : (test->skip_cnt ? "SKIP" : "OK")); + test->error_cnt ? "FAIL" : (test->skip_cnt ? "SKIP" : "OK"), + buf); result->error_cnt = test->error_cnt; result->skip_cnt = test->skip_cnt; result->sub_succ_cnt = test->sub_succ_cnt; + result->duration_ms = duration_ms; } /* generate summary */ @@ -1200,6 +1303,9 @@ static int server_main(void) print_all_error_logs(); + if (env.timing) + print_slow_tests(); + fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); @@ -1236,6 +1342,7 @@ static int worker_main(int sock) int test_to_run; struct prog_test_def *test; struct msg msg_done; + __u32 duration_ms = 0; test_to_run = msg.do_test.test_num; test = &prog_test_defs[test_to_run]; @@ -1248,7 +1355,7 @@ static int worker_main(int sock) stdio_hijack(); - run_one_test(test_to_run); + duration_ms = run_one_test(test_to_run); stdio_restore(); @@ -1258,6 +1365,7 @@ static int worker_main(int sock) msg_done.test_done.error_cnt = test->error_cnt; msg_done.test_done.skip_cnt = test->skip_cnt; msg_done.test_done.sub_succ_cnt = test->sub_succ_cnt; + msg_done.test_done.duration_ms = duration_ms; msg_done.test_done.have_log = false; if (env.verbosity > VERBOSE_NONE || test->force_log || test->error_cnt) { @@ -1486,6 +1594,9 @@ int main(int argc, char **argv) print_all_error_logs(); + if (env.timing) + print_slow_tests(); + fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index 93c1ff705533..16b8c0a9ba5f 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -64,6 +64,7 @@ struct test_env { bool verifier_stats; bool debug; enum verbosity verbosity; + bool timing; bool jit_enabled; bool has_testmod; @@ -109,6 +110,7 @@ struct msg { int sub_succ_cnt; int error_cnt; int skip_cnt; + __u32 duration_ms; bool have_log; } test_done; struct { -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs 2021-11-12 19:25 ` [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs Yucong Sun @ 2021-11-17 5:06 ` Andrii Nakryiko 0 siblings, 0 replies; 7+ messages in thread From: Andrii Nakryiko @ 2021-11-17 5:06 UTC (permalink / raw) To: Yucong Sun; +Cc: bpf, Andrii Nakryiko, Yucong Sun On Fri, Nov 12, 2021 at 11:29 AM Yucong Sun <fallentree@fb.com> wrote: > > From: Yucong Sun <sunyucong@gmail.com> > > This patch adds '--timing' to test_progs. It tracks and print timing > information for each tests, it also prints top 10 slowest tests in the > summary. The timing doesn't work in serial mode, is that intended? > > Example output: > $./test_progs --timing -j > #1 align:OK (16 ms) > ... > #203 xdp_bonding:OK (2019 ms) > #206 xdp_cpumap_attach:OK (3 ms) > #207 xdp_devmap_attach:OK (4 ms) > #208 xdp_info:OK (4 ms) > #209 xdp_link:OK (4 ms) See below, I wonder if we should just always output duration. Except outputting it at the end obscures OK or FAIL verdict, so maybe right after the test number (and make sure that we don't break naming alignment by using %5d for milliseconds. Something like: #203 [ 2019ms] xdp_bonding:OK #206 [ 3ms] xdp_cpumap_attach:OK See also below, this should be also nicely sortable by sort command. > > Top 10 Slowest tests: > #48 fexit_stress: 34356 ms > #160 test_lsm: 29602 ms > #161 test_overhead: 29190 ms > #159 test_local_storage: 28959 ms > #158 test_ima: 28521 ms > #185 verif_scale_pyperf600: 19524 ms > #199 vmlinux: 17310 ms > #154 tc_redirect: 11491 ms (serial) > #147 task_local_storage: 7612 ms > #183 verif_scale_pyperf180: 7186 ms > Summary: 212/973 PASSED, 3 SKIPPED, 0 FAILED > > Signed-off-by: Yucong Sun <sunyucong@gmail.com> > --- > tools/testing/selftests/bpf/test_progs.c | 125 +++++++++++++++++++++-- > tools/testing/selftests/bpf/test_progs.h | 2 + > 2 files changed, 120 insertions(+), 7 deletions(-) > > diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c > index 296928948bb9..d4786e1a540f 100644 > --- a/tools/testing/selftests/bpf/test_progs.c > +++ b/tools/testing/selftests/bpf/test_progs.c > @@ -491,6 +491,7 @@ enum ARG_KEYS { > ARG_TEST_NAME_GLOB_DENYLIST = 'd', > ARG_NUM_WORKERS = 'j', > ARG_DEBUG = -1, > + ARG_TIMING = -2, > }; > > static const struct argp_option opts[] = { > @@ -516,6 +517,8 @@ static const struct argp_option opts[] = { > "Number of workers to run in parallel, default to number of cpus." }, > { "debug", ARG_DEBUG, NULL, 0, > "print extra debug information for test_progs." }, > + { "timing", ARG_TIMING, NULL, 0, > + "track and print timing information for each test." }, nit: all the description (except for debug and timing) start with a capital letter, let's fix both to keep everything consistent > {}, > }; > > @@ -696,6 +699,9 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) > case ARG_DEBUG: > env->debug = true; > break; > + case ARG_TIMING: > + env->timing = true; > + break; > case ARGP_KEY_ARG: > argp_usage(state); > break; > @@ -848,6 +854,7 @@ struct test_result { > int error_cnt; > int skip_cnt; > int sub_succ_cnt; > + __u32 duration_ms; > > size_t log_cnt; > char *log_buf; > @@ -905,9 +912,29 @@ static int recv_message(int sock, struct msg *msg) > return ret; > } > > -static void run_one_test(int test_num) > +static __u32 timespec_diff_ms(struct timespec start, struct timespec end) > +{ > + struct timespec temp; > + > + if ((end.tv_nsec - start.tv_nsec) < 0) { > + temp.tv_sec = end.tv_sec - start.tv_sec - 1; > + temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec; > + } else { > + temp.tv_sec = end.tv_sec - start.tv_sec; > + temp.tv_nsec = end.tv_nsec - start.tv_nsec; > + } > + return (temp.tv_sec * 1000) + (temp.tv_nsec / 1000000); > +} > + > + > +static double run_one_test(int test_num) > { > struct prog_test_def *test = &prog_test_defs[test_num]; > + struct timespec start = {}, end = {}; instead of dealing with timespec, why not add a helper function that will do clock_gettime(CLOCK_MONOTONIC) internally and convert timespace to single nanosecond timestamp. We can put it into testing_helpers.c and reuse it for other purposes. Actually, we have such function in bench.h already (get_time_ns()), let's copy/paste it into test_progs.h, it's useful (there are a bunch of existing selftests that could use it instead of explicit clock_gettime() calls. You won't need timespec_diff_ms() then, it will be just (end - start ) / 1000000 for millisecond duration. > + __u32 duration_ms = 0; > + > + if (env.timing) > + clock_gettime(CLOCK_MONOTONIC, &start); it's cheap to measure this, we can always capture the duration, don't even need to check env.timing > > env.test = test; > > @@ -928,6 +955,13 @@ static void run_one_test(int test_num) > restore_netns(); > if (test->need_cgroup_cleanup) > cleanup_cgroup_environment(); > + > + if (env.timing) { > + clock_gettime(CLOCK_MONOTONIC, &end); > + duration_ms = timespec_diff_ms(start, end); > + } > + > + return duration_ms; > } > > struct dispatch_data { > @@ -999,6 +1033,7 @@ static void *dispatch_thread(void *ctx) > result->error_cnt = msg_test_done.test_done.error_cnt; > result->skip_cnt = msg_test_done.test_done.skip_cnt; > result->sub_succ_cnt = msg_test_done.test_done.sub_succ_cnt; > + result->duration_ms = msg_test_done.test_done.duration_ms; > > /* collect all logs */ > if (msg_test_done.test_done.have_log) { > @@ -1023,6 +1058,8 @@ static void *dispatch_thread(void *ctx) > } > /* output log */ > { > + char buf[255] = {}; > + > pthread_mutex_lock(&stdout_output_lock); > > if (result->log_cnt) { > @@ -1032,9 +1069,15 @@ static void *dispatch_thread(void *ctx) > fprintf(stdout, "\n"); > } > > - fprintf(stdout, "#%d %s:%s\n", > + if (env.timing) { > + snprintf(buf, sizeof(buf), " (%u ms)", result->duration_ms); > + buf[sizeof(buf) - 1] = '\0'; > + } you don't really need a separate buf, you can split below fprintf to move out \n into a separate fprintf, and then have optional extra fprintf for timing > + > + fprintf(stdout, "#%d %s:%s%s\n", > test->test_num, test->test_name, > - result->error_cnt ? "FAIL" : (result->skip_cnt ? "SKIP" : "OK")); > + result->error_cnt ? "FAIL" : (result->skip_cnt ? "SKIP" : "OK"), > + buf); > > pthread_mutex_unlock(&stdout_output_lock); > } > @@ -1092,6 +1135,57 @@ static void print_all_error_logs(void) > } > } > > +struct item { > + int id; > + __u32 duration_ms; > +}; > + > +static int rcompitem(const void *a, const void *b) > +{ > + __u32 val_a = ((struct item *)a)->duration_ms; > + __u32 val_b = ((struct item *)b)->duration_ms; > + > + if (val_a > val_b) > + return -1; > + if (val_a < val_b) > + return 1; > + return 0; > +} > + > +static void print_slow_tests(void) I'm a bit on the fence about test_progs needing to do such "timing summary", tbh. If we just output timing information (and we probably can do it always, no need for --timing), then with a simple `sort -rn -k <timing_column>` command. And it will be up to user to determine how many top N items they want with extra head. > +{ > + int i; [...] > @@ -1200,6 +1303,9 @@ static int server_main(void) > > print_all_error_logs(); > > + if (env.timing) > + print_slow_tests(); > + > fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", > env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); > > @@ -1236,6 +1342,7 @@ static int worker_main(int sock) > int test_to_run; > struct prog_test_def *test; > struct msg msg_done; > + __u32 duration_ms = 0; > > test_to_run = msg.do_test.test_num; > test = &prog_test_defs[test_to_run]; > @@ -1248,7 +1355,7 @@ static int worker_main(int sock) > > stdio_hijack(); > > - run_one_test(test_to_run); > + duration_ms = run_one_test(test_to_run); why not just add duration_ms to prog_test_def, just like error_cnt, skip_cnt, etc? > > stdio_restore(); > > @@ -1258,6 +1365,7 @@ static int worker_main(int sock) > msg_done.test_done.error_cnt = test->error_cnt; > msg_done.test_done.skip_cnt = test->skip_cnt; > msg_done.test_done.sub_succ_cnt = test->sub_succ_cnt; > + msg_done.test_done.duration_ms = duration_ms; > msg_done.test_done.have_log = false; > > if (env.verbosity > VERBOSE_NONE || test->force_log || test->error_cnt) { > @@ -1486,6 +1594,9 @@ int main(int argc, char **argv) > > print_all_error_logs(); > > + if (env.timing) > + print_slow_tests(); > + > fprintf(stdout, "Summary: %d/%d PASSED, %d SKIPPED, %d FAILED\n", > env.succ_cnt, env.sub_succ_cnt, env.skip_cnt, env.fail_cnt); > > diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h > index 93c1ff705533..16b8c0a9ba5f 100644 > --- a/tools/testing/selftests/bpf/test_progs.h > +++ b/tools/testing/selftests/bpf/test_progs.h > @@ -64,6 +64,7 @@ struct test_env { > bool verifier_stats; > bool debug; > enum verbosity verbosity; > + bool timing; > > bool jit_enabled; > bool has_testmod; > @@ -109,6 +110,7 @@ struct msg { > int sub_succ_cnt; > int error_cnt; > int skip_cnt; > + __u32 duration_ms; > bool have_log; > } test_done; > struct { > -- > 2.30.2 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH bpf-next 0/4] selftests/bpf: improve test_progs 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun ` (3 preceding siblings ...) 2021-11-12 19:25 ` [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs Yucong Sun @ 2021-11-17 5:11 ` Andrii Nakryiko 4 siblings, 0 replies; 7+ messages in thread From: Andrii Nakryiko @ 2021-11-17 5:11 UTC (permalink / raw) To: Yucong Sun; +Cc: bpf, Andrii Nakryiko On Fri, Nov 12, 2021 at 11:29 AM Yucong Sun <fallentree@fb.com> wrote: > > various improvement to test_progs, including new '--timing' feature. > > Yucong Sun (4): > selftests/bpf: Move summary line after the error logs > selftests/bpf: variable naming fix > selftests/bpf: mark variable as static > selftests/bpf: Add timing to tests_progs I've applied the first three fixes as they are completely independent from the timing feature. Let's continue discussion on timing separately. > > tools/testing/selftests/bpf/test_progs.c | 153 +++++++++++++++++++---- > tools/testing/selftests/bpf/test_progs.h | 2 + > 2 files changed, 134 insertions(+), 21 deletions(-) > > -- > 2.30.2 > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-17 5:11 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-11-12 19:25 [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 1/4] selftests/bpf: Move summary line after the error logs Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 2/4] selftests/bpf: variable naming fix Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 3/4] selftests/bpf: mark variable as static Yucong Sun 2021-11-12 19:25 ` [PATCH bpf-next 4/4] selftests/bpf: Add timing to tests_progs Yucong Sun 2021-11-17 5:06 ` Andrii Nakryiko 2021-11-17 5:11 ` [PATCH bpf-next 0/4] selftests/bpf: improve test_progs Andrii Nakryiko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.