From acea682efdceaebb393efaca486c9c4b0b3cd922 Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Wed, 27 May 2020 12:49:44 +0100 Subject: gem_wsim: Support scaling workload batch durations -f on the command line can be used to scale batch buffer durations in all parsed workloads. Equally -F for delay steps. Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson --- benchmarks/gem_wsim.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index a387e180..2d6d0a6a 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "intel_chipset.h" #include "intel_reg.h" @@ -875,6 +876,11 @@ static uint64_t engine_list_mask(const char *_str) static void allocate_working_set(struct workload *wrk, struct working_set *set); +static long __duration(long dur, double scale) +{ + return round(scale * dur); +} + #define int_field(_STEP_, _FIELD_, _COND_, _ERR_) \ if ((field = strtok_r(fstart, ".", &fctx))) { \ tmp = atoi(field); \ @@ -885,7 +891,8 @@ static void allocate_working_set(struct workload *wrk, struct working_set *set); } \ static struct workload * -parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) +parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur, + double scale_time, struct workload *app_w) { struct workload *wrk; unsigned int nr_steps = 0; @@ -1151,7 +1158,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) tmpl == LONG_MAX, "Invalid duration at step %u!\n", nr_steps); - step.duration.min = tmpl; + step.duration.min = __duration(tmpl, scale_dur); if (sep && *sep == '-') { tmpl = strtol(sep + 1, NULL, 10); @@ -1161,7 +1168,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) tmpl == LONG_MAX, "Invalid duration range at step %u!\n", nr_steps); - step.duration.max = tmpl; + step.duration.max = __duration(tmpl, + scale_dur); } else { step.duration.max = step.duration.min; } @@ -1197,6 +1205,9 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) step.type = BATCH; add_step: + if (step.type == DELAY) + step.delay = __duration(step.delay, scale_time); + step.idx = nr_steps++; step.request = -1; steps = realloc(steps, sizeof(step) * nr_steps); @@ -2508,7 +2519,9 @@ static void print_help(void) " command line. Subsequent -s switches it off.\n" " -S Synchronize the sequence of random batch durations between\n" " clients.\n" -" -d Sync between data dependencies in userspace." +" -d Sync between data dependencies in userspace.\n" +" -f Scale factor for batch durations.\n" +" -F Scale factor for delays." ); } @@ -2570,6 +2583,8 @@ int main(int argc, char **argv) struct w_arg *w_args = NULL; unsigned int tolerance_pct = 1; int exitcode = EXIT_FAILURE; + double scale_time = 1.0f; + double scale_dur = 1.0f; int prio = 0; double t; int i, c; @@ -2590,7 +2605,7 @@ int main(int argc, char **argv) master_prng = time(NULL); while ((c = getopt(argc, argv, - "ThqvsSdc:n:r:w:W:a:t:p:I:")) != -1) { + "ThqvsSdc:n:r:w:W:a:t:p:I:f:F:")) != -1) { switch (c) { case 'W': if (master_workload >= 0) { @@ -2701,6 +2716,12 @@ int main(int argc, char **argv) case 'I': master_prng = strtol(optarg, NULL, 0); break; + case 'f': + scale_dur = atof(optarg); + break; + case 'F': + scale_time = atof(optarg); + break; case 'h': print_help(); goto out; @@ -2758,7 +2779,8 @@ int main(int argc, char **argv) if (append_workload_arg) { struct w_arg arg = { NULL, append_workload_arg, 0 }; - app_w = parse_workload(&arg, flags, NULL); + app_w = parse_workload(&arg, flags, scale_dur, scale_time, + NULL); if (!app_w) { wsim_err("Failed to parse append workload!\n"); goto err; @@ -2776,7 +2798,8 @@ int main(int argc, char **argv) goto err; } - wrk[i] = parse_workload(&w_args[i], flags, app_w); + wrk[i] = parse_workload(&w_args[i], flags, scale_dur, + scale_time, app_w); if (!wrk[i]) { wsim_err("Failed to parse workload %u!\n", i); goto err; -- cgit v1.2.3