diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-25 15:19:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-10-26 19:03:25 +0100 |
| commit | 6fbb9508c3ce339d36fafa1b8bcdb9ce66905953 (patch) | |
| tree | 2c812ab9e806baccd4fd7700a26c0e49c7731fd8 /tests/i915/gem_ctx_create.c | |
| parent | 69d00d9daf9645cd6cd6751e78a4111646bf1284 (diff) | |
lib/i915: Use explicit iterator names in for_each_engine()
Provide the iterator name as an explicit macro parameter so that it is
known to the caller, and allows for them to properly nest loops over all
engines.
Fixes:
../tests/i915/gem_exec_schedule.c: In function ‘semaphore_noskip’:
../lib/igt_gt.h:84:44: warning: declaration of ‘e__’ shadows a previous local [-Wshadow]
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:653:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, other) {
^~~~~~~~~~~~~~~~~~~~~~~~
../lib/igt_gt.h:84:44: note: shadowed declaration is here
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:652:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, engine) {
^~~~~~~~~~~~~~~~~~~~~~~~
../tests/i915/gem_exec_schedule.c: In function ‘measure_semaphore_power’:
../lib/igt_gt.h:84:44: warning: declaration of ‘e__’ shadows a previous local [-Wshadow]
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:1740:3: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, engine) {
^~~~~~~~~~~~~~~~~~~~~~~~
../lib/igt_gt.h:84:44: note: shadowed declaration is here
for (const struct intel_execution_engine *e__ = intel_execution_engines;\
^~~
../tests/i915/gem_exec_schedule.c:1719:2: note: in expansion of macro ‘for_each_physical_engine’
for_each_physical_engine(i915, signaler) {
^~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Diffstat (limited to 'tests/i915/gem_ctx_create.c')
| -rw-r--r-- | tests/i915/gem_ctx_create.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c index 1e2c40c4..83da0569 100644 --- a/tests/i915/gem_ctx_create.c +++ b/tests/i915/gem_ctx_create.c @@ -527,14 +527,12 @@ igt_main int fd = -1; igt_fixture { - unsigned engine; - fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(fd); gem_require_contexts(fd); - for_each_physical_engine(fd, engine) - all_engines[all_nengine++] = engine; + for_each_physical_engine(e, fd) + all_engines[all_nengine++] = eb_ring(e); igt_require(all_nengine); if (gem_uses_full_ppgtt(fd)) { @@ -582,12 +580,12 @@ igt_main for (const struct intel_execution_engine *e = intel_execution_engines; e->name; e++) { igt_subtest_f("active-%s", e->name) - active(fd, e->exec_id | e->flags, 20, 1); + active(fd, eb_ring(e), 20, 1); igt_subtest_f("forked-active-%s", e->name) - active(fd, e->exec_id | e->flags, 20, ncpus); + active(fd, eb_ring(e), 20, ncpus); if (e->exec_id) { igt_subtest_f("hog-%s", e->name) - active(fd, e->exec_id | e->flags, 20, -1); + active(fd, eb_ring(e), 20, -1); } } |