diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-13 16:10:23 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-14 12:55:13 +0100 |
commit | 13632f2414fc911a0e983bb5d5eb644a7c11a1fe (patch) | |
tree | e5ca6b2a86f2786f8d5c688291a702ef39cb9483 | |
parent | 19dcce36a1c31394bc73cf728f50dbbdc6d01704 (diff) |
benchmarks/gem_wsim: Perturb static_vcs selection across clients
Use the client id to alternate the static_vcs balancer (-b context)
across clients with the round robin flag (-R) - otherwise all clients
end up on vcs0 and do not match the context balancing employed by
media-driver.
v2: Put it behind the -R flag.
v3: Don't skip -R flag for -b context in scripts/media-bench.pl
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
-rw-r--r-- | benchmarks/gem_wsim.c | 6 | ||||
-rwxr-xr-x | scripts/media-bench.pl | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index afb9644d..48568ce4 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -939,7 +939,7 @@ alloc_step_batch(struct workload *wrk, struct w_step *w, unsigned int flags) static void prepare_workload(unsigned int id, struct workload *wrk, unsigned int flags) { - unsigned int ctx_vcs = 0; + unsigned int ctx_vcs; int max_ctx = -1; struct w_step *w; int i; @@ -948,8 +948,10 @@ prepare_workload(unsigned int id, struct workload *wrk, unsigned int flags) wrk->prng = rand(); wrk->run = true; + ctx_vcs = 0; if (flags & INITVCSRR) - wrk->vcs_rr = id & 1; + ctx_vcs = id & 1; + wrk->vcs_rr = ctx_vcs; if (flags & GLOBAL_BALANCE) { int ret = pthread_mutex_init(&wrk->mutex, NULL); diff --git a/scripts/media-bench.pl b/scripts/media-bench.pl index 066b542f..f1cd59a2 100755 --- a/scripts/media-bench.pl +++ b/scripts/media-bench.pl @@ -52,7 +52,7 @@ my @balancers = ( 'rr', 'rand', 'qd', 'qdr', 'qdavg', 'rt', 'rtr', 'rtavg', 'context', 'busy', 'busy-avg' ); my %bal_skip_H = ( 'rr' => 1, 'rand' => 1, 'context' => 1, , 'busy' => 1, 'busy-avg' => 1 ); -my %bal_skip_R = ( 'context' => 1 ); +my %bal_skip_R = (); my @workloads = ( 'media_load_balance_17i7.wsim', |