[igt-dev] [RFC v2 43/43] lib/gem_engine_topology: rename the macros

Ramalingam C
2019-06-21T10:02:22Z

%s/__for_each_physical_engine/for_each_physical_engine
%s/__for_each_static_engine/for_each_static_engine

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
lib/i915/gem_engine_topology.c | 6 ++---
lib/i915/gem_engine_topology.h | 4 ++--
lib/i915/gem_submission.c | 2 +-
tests/amdgpu/amd_prime.c | 2 +-
tests/i915/gem_bad_reloc.c | 2 +-
tests/i915/gem_busy.c | 20 ++++++++---------
tests/i915/gem_concurrent_all.c | 2 +-
tests/i915/gem_cs_prefetch.c | 2 +-
tests/i915/gem_cs_tlb.c | 2 +-
tests/i915/gem_ctx_create.c | 4 ++--
tests/i915/gem_ctx_engines.c | 10 ++++-----
tests/i915/gem_ctx_exec.c | 2 +-
tests/i915/gem_ctx_shared.c | 8 +++----
tests/i915/gem_ctx_switch.c | 4 ++--
tests/i915/gem_ctx_thrash.c | 4 ++--
tests/i915/gem_eio.c | 12 +++++-----
tests/i915/gem_exec_async.c | 4 ++--
tests/i915/gem_exec_await.c | 2 +-
tests/i915/gem_exec_basic.c | 8 +++----
tests/i915/gem_exec_capture.c | 2 +-
tests/i915/gem_exec_create.c | 2 +-
tests/i915/gem_exec_fence.c | 12 +++++-----
tests/i915/gem_exec_flush.c | 2 +-
tests/i915/gem_exec_gttfill.c | 4 ++--
tests/i915/gem_exec_latency.c | 6 ++---
tests/i915/gem_exec_nop.c | 16 ++++++-------
tests/i915/gem_exec_parallel.c | 4 ++--
tests/i915/gem_exec_params.c | 4 ++--
tests/i915/gem_exec_reloc.c | 4 ++--
tests/i915/gem_exec_reuse.c | 2 +-
tests/i915/gem_exec_schedule.c | 40 ++++++++++++++++-----------------
tests/i915/gem_exec_store.c | 4 ++--
tests/i915/gem_exec_suspend.c | 6 ++---
tests/i915/gem_exec_whisper.c | 4 ++--
tests/i915/gem_mocs_settings.c | 2 +-
tests/i915/gem_reset_stats.c | 6 ++---
tests/i915/gem_ring_sync_loop.c | 2 +-
tests/i915/gem_ringfill.c | 2 +-
tests/i915/gem_shrink.c | 4 ++--
tests/i915/gem_spin_batch.c | 6 ++---
tests/i915/gem_storedw_loop.c | 2 +-
tests/i915/gem_sync.c | 24 ++++++++++----------
tests/i915/gem_userptr_blits.c | 2 +-
tests/i915/gem_wait.c | 4 ++--
tests/i915/i915_hangman.c | 2 +-
tests/i915/i915_module_load.c | 4 ++--
tests/perf_pmu.c | 12 +++++-----
tests/prime_busy.c | 2 +-
tests/prime_vgem.c | 4 ++--
49 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
index c64f7a4d05bb..4dd84c9cf4f7 100644
--- a/lib/i915/gem_engine_topology.c
+++ b/lib/i915/gem_engine_topology.c
@@ -116,7 +116,7 @@ static void init_engine(struct intel_execution_engine2 *e2,
return;
}

- __for_each_static_engine(__e2)
+ for_each_static_engine(__e2)
if (__e2->class == class && __e2->instance == instance)
break;

@@ -219,7 +219,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id)

igt_debug("using pre-allocated engine list\n");

- __for_each_static_engine(e2) {
+ for_each_static_engine(e2) {
struct intel_execution_engine2 *__e2 =
&engine_data.engines[engine_data.nengines];

@@ -298,7 +298,7 @@ int gem_engine_class_to_execbuf_flags(int fd, uint32_t ctx_id, int class)
int i;

if (gem_topology_get_param(fd, &param)) {
- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
if (e->class == class)
return e->flags;
}
diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h
index aa934622cab0..f11e4b96a6bc 100644
--- a/lib/i915/gem_engine_topology.h
+++ b/lib/i915/gem_engine_topology.h
@@ -55,7 +55,7 @@ void gem_context_set_all_engines(int fd, uint32_t ctx);

int gem_engine_class_to_execbuf_flags(int fd, uint32_t ctx_id, int class);

-#define __for_each_static_engine(e__) \
+#define for_each_static_engine(e__) \
for ((e__) = intel_execution_engines2; (e__)->name; (e__)++)

#define for_each_context_engine(fd__, ctx__, e__) \
@@ -64,7 +64,7 @@ int gem_engine_class_to_execbuf_flags(int fd, uint32_t ctx_id, int class);
intel_next_engine(&i__))

/* needs to replace "for_each_physical_engine" when conflicts are fixed */
-#define __for_each_physical_engine(fd__, e__) \
+#define for_each_physical_engine(fd__, e__) \
for (struct intel_engine_data i__ = intel_init_engine_list(fd__, 0); \
((e__) = intel_get_current_physical_engine(&i__)); \
intel_next_engine(&i__))
diff --git a/lib/i915/gem_submission.c b/lib/i915/gem_submission.c
index 9bfb91b89f80..0185dbbddb68 100644
--- a/lib/i915/gem_submission.c
+++ b/lib/i915/gem_submission.c
@@ -217,7 +217,7 @@ void gem_test_engine(int i915, unsigned int engine)
gem_write(i915, obj.handle, 0, &bbe, sizeof(bbe));

if (engine == ALL_ENGINES) {
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
execbuf.flags = e->flags;
gem_execbuf(i915, &execbuf);
}
diff --git a/tests/amdgpu/amd_prime.c b/tests/amdgpu/amd_prime.c
index cd2367ffd53e..dfbc9b3720e1 100644
--- a/tests/amdgpu/amd_prime.c
+++ b/tests/amdgpu/amd_prime.c
@@ -180,7 +180,7 @@ static void i915_to_amd(int i915, int amd, amdgpu_device_handle device)
struct cork c;

nengine = 0;
- __for_each_physical_engine(i915, engine)
+ for_each_physical_engine(i915, engine)
engines[nengine++] = engine->flags;
igt_require(nengine);

diff --git a/tests/i915/gem_bad_reloc.c b/tests/i915/gem_bad_reloc.c
index 26a932a3a933..8737391b009d 100644
--- a/tests/i915/gem_bad_reloc.c
+++ b/tests/i915/gem_bad_reloc.c
@@ -193,7 +193,7 @@ igt_main
igt_require_gem(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("negative-reloc-%s", e->name)
negative_reloc(fd, e, 0);

diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c
index f66134802137..68f4be977c61 100644
--- a/tests/i915/gem_busy.c
+++ b/tests/i915/gem_busy.c
@@ -134,7 +134,7 @@ static void semaphore(int fd, const struct intel_execution_engine2 *e)

/* Now queue it for a read across all available rings */
active = 0;
- __for_each_physical_engine(fd, __e) {
+ for_each_physical_engine(fd, __e) {
if (exec_noop(fd, handle, __e->flags, false))
active |= 1 << __e->class;
}
@@ -251,7 +251,7 @@ static void one(int fd, const struct intel_execution_engine2 *e, unsigned test_f
if (test_flags & PARALLEL) {
struct intel_execution_engine2 *e2;

- __for_each_physical_engine(fd, e2) {
+ for_each_physical_engine(fd, e2) {
if (e2->class == e->class &&
e2->instance == e->instance)
continue;
@@ -320,7 +320,7 @@ static void close_race(int fd)
*/

nengine = 0;
- __for_each_static_engine(e)
+ for_each_static_engine(e)
engines[nengine++] = e->flags;
igt_require(nengine);

@@ -465,7 +465,7 @@ static void all(int i915)
{
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(i915, e)
+ for_each_physical_engine(i915, e)
basic(i915, e, 0);
}

@@ -491,7 +491,7 @@ igt_main
all(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_group {
igt_subtest_f("busy-%s", e->name) {
gem_quiescent_gpu(fd);
@@ -506,7 +506,7 @@ igt_main
gem_require_mmap_wc(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("extended-%s", e->name) {
igt_require(gem_class_can_store_dword(fd,
e->class));
@@ -516,7 +516,7 @@ igt_main
}
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("extended-parallel-%s", e->name) {
igt_require(gem_class_can_store_dword(fd, e->class));

@@ -533,7 +533,7 @@ igt_main
igt_require(has_semaphores(fd));
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("extended-semaphore-%s", e->name)
semaphore(fd, e);
}
@@ -554,7 +554,7 @@ igt_main
hang = igt_allow_hang(fd, 0, 0);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("%shang-%s",
e->class == I915_ENGINE_CLASS_RENDER
? "basic-" : "", e->name) {
@@ -570,7 +570,7 @@ igt_main
gem_require_mmap_wc(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("extended-hang-%s", e->name) {
igt_skip_on_simulation();
igt_require(gem_class_can_store_dword(fd, e->class));
diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 8a97564063e1..da8a7008c01b 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -951,7 +951,7 @@ static igt_hang_t all_hang(void)
igt_hang_t hang = igt_hang_ring(fd, I915_EXEC_RENDER);
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
struct drm_i915_gem_execbuffer2 eb = hang.spin->execbuf;

if (e->class == I915_ENGINE_CLASS_RENDER)
diff --git a/tests/i915/gem_cs_prefetch.c b/tests/i915/gem_cs_prefetch.c
index 939d6455613e..2b925f53b8c5 100644
--- a/tests/i915/gem_cs_prefetch.c
+++ b/tests/i915/gem_cs_prefetch.c
@@ -143,7 +143,7 @@ igt_main

igt_skip_on_simulation();

- __for_each_static_engine(e)
+ for_each_static_engine(e)
igt_subtest_f("%s", e->name)
test_ring(e);
}
diff --git a/tests/i915/gem_cs_tlb.c b/tests/i915/gem_cs_tlb.c
index 13de5499f1c7..3bbfa729ecdf 100644
--- a/tests/i915/gem_cs_tlb.c
+++ b/tests/i915/gem_cs_tlb.c
@@ -150,7 +150,7 @@ igt_main
igt_require_gem(fd);
}

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
igt_subtest_f("%s", e->name)
run_on_ring(fd, e->flags, e->name);

diff --git a/tests/i915/gem_ctx_create.c b/tests/i915/gem_ctx_create.c
index 0bf5adb336dc..2e28c1e04136 100644
--- a/tests/i915/gem_ctx_create.c
+++ b/tests/i915/gem_ctx_create.c
@@ -532,7 +532,7 @@ igt_main
igt_require_gem(fd);
gem_require_contexts(fd);

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
all_engines[all_nengine++] = e->flags;
igt_require(all_nengine);

@@ -578,7 +578,7 @@ igt_main
igt_subtest("forked-active-all")
active(fd, NULL, 120, ncpus);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("active-%s", e->name)
active(fd, e, 20, 1);
igt_subtest_f("forked-active-%s", e->name)
diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
index 8c66fb26114c..19ddf93e6ed9 100644
--- a/tests/i915/gem_ctx_engines.c
+++ b/tests/i915/gem_ctx_engines.c
@@ -193,7 +193,7 @@ static void idempotent(int i915)

idx = 0;
memset(&engines, 0, sizeof(engines));
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
engines.engines[idx].engine_class = e->class;
engines.engines[idx].engine_instance = e->instance;
idx++;
@@ -269,7 +269,7 @@ static void execute_one(int i915)
gem_execbuf(i915, &execbuf);
gem_sync(i915, obj.handle);

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
struct drm_i915_gem_busy busy = { .handle = obj.handle };

for (int i = -1; i <= I915_EXEC_RING_MASK; i++) {
@@ -338,7 +338,7 @@ static void execute_oneforall(int i915)
};
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
memset(&engines, 0, sizeof(engines));
for (int i = 0; i <= I915_EXEC_RING_MASK; i++) {
engine_class(&engines, i) = e->class;
@@ -378,7 +378,7 @@ static void execute_allforone(int i915)

i = 0;
memset(&engines, 0, sizeof(engines));
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
engine_class(&engines, i) = e->class;
engine_instance(&engines, i) = e->instance;
i++;
@@ -387,7 +387,7 @@ static void execute_allforone(int i915)
gem_context_set_param(i915, &param);

i = 0;
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
struct drm_i915_gem_busy busy = {};
igt_spin_t *spin;

diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index 614a9f401931..a4adf77a9582 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -229,7 +229,7 @@ igt_main
gem_sync(fd, handle);
}

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
igt_subtest_f("basic-invalid-context-%s", e->name)
invalid_context(fd, e, handle);

diff --git a/tests/i915/gem_ctx_shared.c b/tests/i915/gem_ctx_shared.c
index 324959939fd4..38ec118aa916 100644
--- a/tests/i915/gem_ctx_shared.c
+++ b/tests/i915/gem_ctx_shared.c
@@ -365,7 +365,7 @@ static void exec_single_timeline(int i915,
*/
ctx = 0;
spin = NULL;
- __for_each_physical_engine(i915, other) {
+ for_each_physical_engine(i915, other) {
if (other == engine)
continue;

@@ -393,7 +393,7 @@ static void exec_single_timeline(int i915,
ctx = gem_context_clone(i915, 0, 0,
I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE);
spin = NULL;
- __for_each_physical_engine(i915, other) {
+ for_each_physical_engine(i915, other) {
if (other == engine)
continue;

@@ -728,7 +728,7 @@ static void smoketest(int i915, unsigned timeout)
uint32_t *ptr;

nengine = 0;
- __for_each_physical_engine(i915, engine)
+ for_each_physical_engine(i915, engine)
engines[nengine++] = engine->flags;
igt_require(nengine);

@@ -812,7 +812,7 @@ igt_main
igt_subtest("exhaust-shared-gtt-lrc")
exhaust_shared_gtt(i915, EXHAUST_LRC);

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
igt_subtest_f("exec-shared-gtt-%s", e->name)
exec_shared_gtt(i915, e);

diff --git a/tests/i915/gem_ctx_switch.c b/tests/i915/gem_ctx_switch.c
index 8d6740148b22..613603dc8260 100644
--- a/tests/i915/gem_ctx_switch.c
+++ b/tests/i915/gem_ctx_switch.c
@@ -229,7 +229,7 @@ static void all(int fd, uint32_t handle, unsigned flags, int timeout)
int n, qlen;

nengine = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
engine[nengine] = e->flags;
name[nengine] = e->name;
nengine++;
@@ -337,7 +337,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
for (typeof(*phases) *p = phases; p->name; p++) {
igt_subtest_group {
igt_fixture {
diff --git a/tests/i915/gem_ctx_thrash.c b/tests/i915/gem_ctx_thrash.c
index d9201c3dd327..f9f03218d477 100644
--- a/tests/i915/gem_ctx_thrash.c
+++ b/tests/i915/gem_ctx_thrash.c
@@ -105,7 +105,7 @@ static void single(const char *name, bool all_engines)
if (all_engines) {
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -231,7 +231,7 @@ static void processes(void)
fd = drm_open_driver(DRIVER_INTEL);

num_engines = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
engines[num_engines++] = e->flags;
if (num_engines == ARRAY_SIZE(engines))
break;
diff --git a/tests/i915/gem_eio.c b/tests/i915/gem_eio.c
index b8cd46c2b62d..c4cf6721be23 100644
--- a/tests/i915/gem_eio.c
+++ b/tests/i915/gem_eio.c
@@ -345,7 +345,7 @@ static void __test_banned(int fd)
}

/* Trigger a reset, making sure we are detected as guilty */
- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
if (e->class == I915_ENGINE_CLASS_RENDER) {
hang = spin_sync(fd, 0, e);
break;
@@ -389,7 +389,7 @@ static void test_wait(int fd, unsigned int flags, unsigned int wait)
else
igt_require(i915_reset_control(true));

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
if (e->class == I915_ENGINE_CLASS_RENDER){
hang = spin_sync(fd, 0, e);
break;
@@ -438,7 +438,7 @@ static void test_inflight(int fd, unsigned int wait)
igt_require(max > 1);
max = min(max - 1, ARRAY_SIZE(fence));

- __for_each_physical_engine(parent_fd, engine) {
+ for_each_physical_engine(parent_fd, engine) {
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -566,7 +566,7 @@ static void test_inflight_contexts(int fd, unsigned int wait)
igt_require(gem_has_exec_fence(fd));
gem_require_contexts(fd);

- __for_each_physical_engine(parent_fd, engine) {
+ for_each_physical_engine(parent_fd, engine) {
const uint32_t bbe = MI_BATCH_BUFFER_END;
struct drm_i915_gem_exec_object2 obj[2];
struct drm_i915_gem_execbuffer2 execbuf;
@@ -706,7 +706,7 @@ static void test_inflight_internal(int fd, unsigned int wait)
memset(&execbuf, 0, sizeof(execbuf));
execbuf.buffers_ptr = to_user_pointer(obj);
execbuf.buffer_count = 2;
- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
execbuf.flags = engine->flags | I915_EXEC_FENCE_OUT;

gem_execbuf_wr(fd, &execbuf);
@@ -811,7 +811,7 @@ static void test_reset_stress(int fd, unsigned int flags)
uint32_t ctx0 = context_create_safe(fd);
const struct intel_execution_engine2 *engine;

- __for_each_physical_engine(fd, engine)
+ for_each_physical_engine(fd, engine)
reset_stress(fd, ctx0, engine, flags);

gem_context_destroy(fd, ctx0);
diff --git a/tests/i915/gem_exec_async.c b/tests/i915/gem_exec_async.c
index 0da97f1f0506..b48d63a56d26 100644
--- a/tests/i915/gem_exec_async.c
+++ b/tests/i915/gem_exec_async.c
@@ -144,7 +144,7 @@ static void one(int fd, const struct intel_execution_engine2 *e)

i = 0;

- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
if (engine->class == e->class &&
engine->instance == e->instance)
continue;
@@ -201,7 +201,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
igt_subtest_f("concurrent-writes-%s", e->name) {
igt_require(gem_class_can_store_dword(fd, e->class));
one(fd, e);
diff --git a/tests/i915/gem_exec_await.c b/tests/i915/gem_exec_await.c
index 5a3224159948..7e49fd84b17d 100644
--- a/tests/i915/gem_exec_await.c
+++ b/tests/i915/gem_exec_await.c
@@ -80,7 +80,7 @@ static void wide(int fd, int ring_size, int timeout, unsigned int flags)
double time;

nengine = 0;
- __for_each_physical_engine(fd, engine)
+ for_each_physical_engine(fd, engine)
engines[nengine++] = engine->flags;
igt_require(nengine);

diff --git a/tests/i915/gem_exec_basic.c b/tests/i915/gem_exec_basic.c
index 1287860be3b1..3d586a7061b4 100644
--- a/tests/i915/gem_exec_basic.c
+++ b/tests/i915/gem_exec_basic.c
@@ -118,7 +118,7 @@ static void all(int i915)
{
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(i915, e)
+ for_each_physical_engine(i915, e)
noop(i915, e->flags);
}

@@ -126,7 +126,7 @@ static void readonly_all(int i915)
{
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(i915, e)
+ for_each_physical_engine(i915, e)
readonly(i915, e->flags);
}

@@ -134,7 +134,7 @@ static void gtt_all(int i915)
{
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(i915, e)
+ for_each_physical_engine(i915, e)
gtt(i915, e->flags);
}

@@ -159,7 +159,7 @@ igt_main
igt_subtest("gtt-all")
gtt_all(fd);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("basic-%s", e->name)
noop(fd, e->flags);
igt_subtest_f("readonly-%s", e->name)
diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c
index c0c3b88d5fa7..59c830f6f31c 100644
--- a/tests/i915/gem_exec_capture.c
+++ b/tests/i915/gem_exec_capture.c
@@ -553,7 +553,7 @@ igt_main
igt_require(safer_strlen(igt_sysfs_get(dir, "error")) > 0);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("capture-%s", e->name) {
igt_require(gem_class_can_store_dword(fd, e->class));
capture(fd, dir, e);
diff --git a/tests/i915/gem_exec_create.c b/tests/i915/gem_exec_create.c
index 9e21320d0221..c8c7918a683e 100644
--- a/tests/i915/gem_exec_create.c
+++ b/tests/i915/gem_exec_create.c
@@ -66,7 +66,7 @@ static void all(int fd, unsigned flags, int timeout, int ncpus)
const struct intel_execution_engine2 *e;

nengine = 0;
- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
engines[nengine++] = e->flags;
igt_require(nengine);

diff --git a/tests/i915/gem_exec_fence.c b/tests/i915/gem_exec_fence.c
index 1f4f3bd91142..ab519258dd5d 100644
--- a/tests/i915/gem_exec_fence.c
+++ b/tests/i915/gem_exec_fence.c
@@ -265,7 +265,7 @@ static void test_fence_busy_all(int fd, unsigned flags)
i++;

all = -1;
- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
int fence, new;

execbuf.flags = e->flags | LOCAL_EXEC_FENCE_OUT;
@@ -338,7 +338,7 @@ static void test_fence_await(int fd, const struct intel_execution_engine2 *e,
igt_assert(spin->out_fence != -1);

i = 0;
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (!gem_class_can_store_dword(fd, other->class))
continue;

@@ -501,7 +501,7 @@ static void test_parallel(int fd, const struct intel_execution_engine2 *e)
obj[BATCH].relocation_count = 1;

/* Queue all secondaries */
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (other == e)
continue;

@@ -679,7 +679,7 @@ static void test_long_history(int fd, long ring_size, unsigned flags)
limit = ring_size / 3;

nengine = 0;
- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
engines[nengine++] = e->flags;
igt_require(nengine);

@@ -1194,7 +1194,7 @@ static void test_syncobj_wait(int fd)
gem_write(fd, obj.handle, 0, &bbe, sizeof(bbe));

n = 0;
- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
obj.handle = gem_create(fd, 4096);
gem_write(fd, obj.handle, 0, &bbe, sizeof(bbe));

@@ -1551,7 +1551,7 @@ igt_main
test_fence_busy_all(i915, WAIT | HANG);
}

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
igt_subtest_group {
igt_fixture {
igt_require(gem_class_can_store_dword(i915, e->class));
diff --git a/tests/i915/gem_exec_flush.c b/tests/i915/gem_exec_flush.c
index 2f041863e238..9dfb23e817c6 100644
--- a/tests/i915/gem_exec_flush.c
+++ b/tests/i915/gem_exec_flush.c
@@ -600,7 +600,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e) igt_subtest_group {
+ for_each_physical_engine(fd, e) igt_subtest_group {
unsigned timeout = 5 + 120;

igt_fixture {
diff --git a/tests/i915/gem_exec_gttfill.c b/tests/i915/gem_exec_gttfill.c
index 6140d36260f7..d67fc8e40aec 100644
--- a/tests/i915/gem_exec_gttfill.c
+++ b/tests/i915/gem_exec_gttfill.c
@@ -122,7 +122,7 @@ static void fillgtt(int fd, const struct intel_execution_engine2 *e,

nengine = 0;
if (!e) {
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (!gem_class_can_store_dword(fd, other->class))
continue;

@@ -222,7 +222,7 @@ igt_main
igt_subtest("basic")
fillgtt(device, 0, 1); /* just enough to run a single pass */

- __for_each_physical_engine(device, e)
+ for_each_physical_engine(device, e)
igt_subtest_f("%s", e->name)
fillgtt(device, e, 20);

diff --git a/tests/i915/gem_exec_latency.c b/tests/i915/gem_exec_latency.c
index 0a95c491eb56..d31dcdb1ac16 100644
--- a/tests/i915/gem_exec_latency.c
+++ b/tests/i915/gem_exec_latency.c
@@ -311,7 +311,7 @@ static void latency_from_ring(int fd,
reloc.presumed_offset = obj[1].offset;
reloc.target_handle = flags & CORK ? 1 : 0;

- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
igt_spin_t *spin = NULL;
IGT_CORK_HANDLE(c);

@@ -474,7 +474,7 @@ rthog_latency_on_ring(int fd, const struct intel_execution_engine2 *e,

nengine = 0;
if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -684,7 +684,7 @@ igt_main
igt_fixture
igt_require(intel_gen(intel_get_drm_devid(device)) >= 7);

- __for_each_physical_engine(device, e) {
+ for_each_physical_engine(device, e) {
igt_subtest_group {
igt_subtest_f("%s-dispatch", e->name)
latency_on_ring(device,
diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
index 937ec01433b4..4cebce457b95 100644
--- a/tests/i915/gem_exec_nop.c
+++ b/tests/i915/gem_exec_nop.c
@@ -236,7 +236,7 @@ static void poll_sequential(int fd, const char *name, int timeout)
flags |= I915_EXEC_SECURE;

nengine = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -443,7 +443,7 @@ static void parallel(int fd, uint32_t handle, int timeout)

sum = 0;
nengine = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
engines[nengine] = e->flags;
names[nengine] = e->name;
nengine++;
@@ -505,7 +505,7 @@ static void series(int fd, uint32_t handle, int timeout)
const char *name;

nengine = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
time = nop_on_ring(fd, handle, e, 1, &count) / count;
if (time > max) {
name = e->name;
@@ -601,7 +601,7 @@ static void sequential(int fd, uint32_t handle, unsigned flags, int timeout)

nengine = 0;
sum = 0;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
unsigned long count;

time = nop_on_ring(fd, handle, e, 1, &count) / count;
@@ -733,7 +733,7 @@ static void fence_signal(int fd, uint32_t handle,

nengine = 0;
if (!e) {
- __for_each_physical_engine(fd, other)
+ for_each_physical_engine(fd, other)
engines[nengine++] = other->flags;
} else {
gem_require_ring(fd, e->flags);
@@ -881,7 +881,7 @@ igt_main
igt_subtest("basic-sequential")
sequential(device, handle, 0, 5);

- __for_each_physical_engine(device, e) {
+ for_each_physical_engine(device, e) {
igt_subtest_f("%s", e->name)
single(device, handle, e, e->name);
igt_subtest_f("signal-%s", e->name)
@@ -916,7 +916,7 @@ igt_main
igt_require(gem_scheduler_has_preemption(device));
}

- __for_each_physical_engine(device, e) {
+ for_each_physical_engine(device, e) {
igt_subtest_f("preempt-%s", e->name)
preempt(device, handle, e, e->name);
}
@@ -927,7 +927,7 @@ igt_main
igt_device_set_master(device);
}

- __for_each_physical_engine(device, e) {
+ for_each_physical_engine(device, e) {
/* Requires master for STORE_DWORD on gen4/5 */
igt_subtest_f("poll-%s", e->name)
poll_ring(device, e, e->name, 20);
diff --git a/tests/i915/gem_exec_parallel.c b/tests/i915/gem_exec_parallel.c
index 8a4482e52a6e..3ba067d0c8fb 100644
--- a/tests/i915/gem_exec_parallel.c
+++ b/tests/i915/gem_exec_parallel.c
@@ -172,7 +172,7 @@ static void all(int fd, struct intel_execution_engine2 *engine, unsigned flags)
nengine = 0;
if (!engine) {
struct intel_execution_engine2 *e;
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (gem_class_can_store_dword(fd, e->class))
engines[nengine++] = e->flags;
}
@@ -254,7 +254,7 @@ igt_main
/* NULL value means all engines */
all(fd, NULL, m->flags);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
for (const struct mode *m = modes; m->name; m++)
igt_subtest_f("%s%s%s",
e->name,
diff --git a/tests/i915/gem_exec_params.c b/tests/i915/gem_exec_params.c
index 3bc5b0a9d531..7659af432287 100644
--- a/tests/i915/gem_exec_params.c
+++ b/tests/i915/gem_exec_params.c
@@ -211,7 +211,7 @@ igt_main
}

igt_subtest("control") {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
execbuf.flags = e->flags;
gem_execbuf(fd, &execbuf);
}
@@ -362,7 +362,7 @@ igt_main
igt_subtest("rs-invalid") {
bool has_rs = has_resource_streamer(fd);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
int expect = -EINVAL;
if (has_rs && (e->class == I915_ENGINE_CLASS_RENDER))
expect = 0;
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 541279ef5243..7983bd86e39d 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c
@@ -258,7 +258,7 @@ static void active(int fd, const struct intel_execution_engine2 *e)

nengine = 0;
if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (gem_class_can_store_dword(fd, e->class))
engines[nengine++] = e->flags;
}
@@ -753,7 +753,7 @@ igt_main
igt_subtest("active")
active(fd, NULL);

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
igt_subtest_f("active-%s", e->name)
active(fd, e);

diff --git a/tests/i915/gem_exec_reuse.c b/tests/i915/gem_exec_reuse.c
index 55e49d644013..1f2d315474ac 100644
--- a/tests/i915/gem_exec_reuse.c
+++ b/tests/i915/gem_exec_reuse.c
@@ -118,7 +118,7 @@ igt_main
no.obj = malloc(sizeof(struct drm_i915_gem_exec_object2) * (no.max_age + 1));

nengine = 0;
- __for_each_static_engine(e)
+ for_each_static_engine(e)
if (e)
engines[nengine++] = e->flags;
igt_require(nengine);
diff --git a/tests/i915/gem_exec_schedule.c b/tests/i915/gem_exec_schedule.c
index 21b0d93559e0..e0e29ac2e2cf 100644
--- a/tests/i915/gem_exec_schedule.c
+++ b/tests/i915/gem_exec_schedule.c
@@ -225,7 +225,7 @@ static void independent(int fd, const struct intel_execution_engine2 *e)
plug = igt_cork_plug(&cork, fd);

/* Check that we can submit to engine while all others are blocked */
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (other == e)
continue;

@@ -285,7 +285,7 @@ static void smoketest(int fd, const struct intel_execution_engine2 *e,

nengine = 0;
if (!e) {
- __for_each_physical_engine(fd, other)
+ for_each_physical_engine(fd, other)
engines[nengine++] = other;
} else {
engines[nengine++] = e;
@@ -369,7 +369,7 @@ static void semaphore_userlock(int i915)
*/

scratch = gem_create(i915, 4096);
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
if (!spin) {
spin = igt_spin_new(i915,
.dependency = scratch,
@@ -394,7 +394,7 @@ static void semaphore_userlock(int i915)
* taking precedence.
*/
scratch = gem_context_create(i915);
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
struct drm_i915_gem_execbuffer2 execbuf = {
.buffers_ptr = to_user_pointer(&obj),
.buffer_count = 1,
@@ -433,7 +433,7 @@ static void semaphore_codependency(int i915)
*/

i = 0;
- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
uint32_t ctx;

if (e->class == I915_ENGINE_CLASS_RENDER)
@@ -451,7 +451,7 @@ static void semaphore_codependency(int i915)
.flags = IGT_SPIN_POLL_RUN);
igt_spin_busywait_until_started(task[i].xcs);

- __for_each_physical_engine(i915, other) {
+ for_each_physical_engine(i915, other) {
if (other->class == I915_ENGINE_CLASS_RENDER)
/* Common rcs tasks will be queued in FIFO */
task[i].rcs =
@@ -508,7 +508,7 @@ static void semaphore_resolve(int i915)
semaphore = gem_create(i915, 4096);
sema = gem_mmap__wc(i915, semaphore, 0, 4096, PROT_WRITE);

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_execbuffer2 eb;
uint32_t handle, cancel;
@@ -623,8 +623,8 @@ static void semaphore_noskip(int i915)

ctx = gem_context_create(i915);

- __for_each_physical_engine(i915, engine) {
- __for_each_physical_engine(i915, other) {
+ for_each_physical_engine(i915, engine) {
+ for_each_physical_engine(i915, other) {
struct drm_i915_gem_exec_object2 obj[3];
struct drm_i915_gem_execbuffer2 eb;
uint32_t handle, *cs, *map;
@@ -846,7 +846,7 @@ static igt_spin_t *__noise(int fd, uint32_t ctx, int prio, igt_spin_t *spin)

gem_context_set_priority(fd, ctx, prio);

- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (spin == NULL) {
spin = __igt_spin_new(fd,
.ctx = ctx,
@@ -883,7 +883,7 @@ static void __preempt_other(int fd,
n++;

if (flags & CHAIN) {
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
store_dword(fd, ctx[LO], other,
result, (n + 1)*sizeof(uint32_t), n + 1,
0, I915_GEM_DOMAIN_RENDER);
@@ -933,7 +933,7 @@ static void preempt_other(int fd, const struct intel_execution_engine2 *e,
ctx[HI] = gem_context_create(fd);
gem_context_set_priority(fd, ctx[HI], MAX_PRIO);

- __for_each_physical_engine(fd, primary) {
+ for_each_physical_engine(fd, primary) {
igt_debug("Primary engine: %s\n", e->name);
__preempt_other(fd, ctx, e, primary, flags);
}
@@ -990,7 +990,7 @@ static void __preempt_queue(int fd,
n++;

if (flags & CHAIN) {
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
store_dword(fd, ctx[LO], other,
result, (n + 1)*sizeof(uint32_t), n + 1,
0, I915_GEM_DOMAIN_RENDER);
@@ -1034,7 +1034,7 @@ static void preempt_queue(int fd, const struct intel_execution_engine2 *e,
{
const struct intel_execution_engine2 *other;

- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
for (unsigned depth = 0; depth <= MAX_ELSP_QLEN; depth++)
__preempt_queue(fd, e, other, depth, flags);
}
@@ -1063,7 +1063,7 @@ static void preempt_self(int fd, const struct intel_execution_engine2 *e)

n = 0;
gem_context_set_priority(fd, ctx[HI], MIN_PRIO);
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
spin[n] = __igt_spin_new(fd,
.ctx = ctx[NOISE],
.engine = other->flags);
@@ -1589,7 +1589,7 @@ static void measure_semaphore_power(int i915)

igt_require(gpu_power_open(&power) == 0);

- __for_each_physical_engine(i915, signaler) {
+ for_each_physical_engine(i915, signaler) {
struct gpu_power_sample s_spin[2];
struct gpu_power_sample s_sema[2];
double baseline, total;
@@ -1607,7 +1607,7 @@ static void measure_semaphore_power(int i915)
gpu_power_read(&power, &s_spin[1]);

/* Add a waiter to each engine */
- __for_each_physical_engine(i915, engine) {
+ for_each_physical_engine(i915, engine) {
igt_spin_t *sema;

if (engine == signaler)
@@ -1660,7 +1660,7 @@ igt_main
}

igt_subtest_group {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("fifo-%s", e->name) {
igt_require(gem_class_can_store_dword(fd, e->class));
fifo(fd, e);
@@ -1691,7 +1691,7 @@ igt_main
igt_subtest("smoketest-all")
smoketest(fd, NULL, 30);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_group {
igt_fixture {
igt_require(gem_class_can_store_dword(fd, e->class));
@@ -1783,7 +1783,7 @@ igt_main
igt_require(gem_has_execlists(fd));
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_group {
igt_fixture {
igt_require(gem_scheduler_has_preemption(fd));
diff --git a/tests/i915/gem_exec_store.c b/tests/i915/gem_exec_store.c
index b74c3d84bcc2..dba71b389c76 100644
--- a/tests/i915/gem_exec_store.c
+++ b/tests/i915/gem_exec_store.c
@@ -220,7 +220,7 @@ static void store_all(int fd)

nengine = 0;
intel_detect_and_clear_missed_interrupts(fd);
- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
if (!gem_class_can_store_dword(fd, engine->class))
continue;

@@ -329,7 +329,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("basic-%s", e->name)
store_dword(fd, e);

diff --git a/tests/i915/gem_exec_suspend.c b/tests/i915/gem_exec_suspend.c
index 3238e307e217..1ac7a1041dc9 100644
--- a/tests/i915/gem_exec_suspend.c
+++ b/tests/i915/gem_exec_suspend.c
@@ -67,7 +67,7 @@ static void test_all(int fd, unsigned flags)
{
const struct intel_execution_engine2 *engine;

- __for_each_physical_engine(fd, engine)
+ for_each_physical_engine(fd, engine)
if (gem_class_can_store_dword(fd, engine->class))
run_test(fd, engine, flags & ~0xff);
}
@@ -108,7 +108,7 @@ static void run_test(int fd, const struct intel_execution_engine2 *e,
* GPU is then unlikely to be active!)
*/
if (has_semaphores(fd)) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (gem_class_can_store_dword(fd, e->class))
engines[nengine++] = e->flags;
}
@@ -266,7 +266,7 @@ igt_main
igt_subtest("basic-S4")
run_test(fd, NULL, HIBERNATE);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
for (m = modes; m->suffix; m++) {
igt_subtest_f("%s-uncached%s", e->name, m->suffix)
run_test(fd, e, m->mode | UNCACHED);
diff --git a/tests/i915/gem_exec_whisper.c b/tests/i915/gem_exec_whisper.c
index 43998b49b773..28ac86b6b3fa 100644
--- a/tests/i915/gem_exec_whisper.c
+++ b/tests/i915/gem_exec_whisper.c
@@ -204,7 +204,7 @@ static void whisper(int fd, const struct intel_execution_engine2 *engine,

nengine = 0;
if (!engine) {
- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
if (gem_class_can_store_dword(fd, engine->class))
engines[nengine++] = engine->flags;
}
@@ -572,7 +572,7 @@ igt_main
whisper(fd, NULL, m->flags | ALL);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
for (const struct mode *m = modes; m->name; m++) {
if (m->flags & CHAIN)
continue;
diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
index d5cedfc478c1..540d640edc82 100644
--- a/tests/i915/gem_mocs_settings.c
+++ b/tests/i915/gem_mocs_settings.c
@@ -516,7 +516,7 @@ igt_main
igt_require(get_mocs_settings(fd, &table, false));
}

- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
for (unsigned mode = NONE; mode < MAX_MOCS_TEST_MODES; mode++) {
igt_subtest_group {
igt_hang_t hang = {};
diff --git a/tests/i915/gem_reset_stats.c b/tests/i915/gem_reset_stats.c
index dd0ba821f7d8..6a9159a81621 100644
--- a/tests/i915/gem_reset_stats.c
+++ b/tests/i915/gem_reset_stats.c
@@ -520,14 +520,14 @@ static void noop_on_each_ring(int fd, const bool reverse)
eb.buffer_count = 1;

if (reverse) {
- __for_each_static_engine(e)
+ for_each_static_engine(e)
;
while (--e >= intel_execution_engines2) {
eb.flags = e->flags;
__gem_execbuf(fd, &eb);
}
} else {
- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
eb.flags = e->flags;
__gem_execbuf(fd, &eb);
}
@@ -803,7 +803,7 @@ igt_main
igt_subtest_f("params-ctx")
RUN_TEST(test_params_ctx());

- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
igt_subtest_f("reset-stats-%s", e->name)
RUN_TEST(test_rs(e, 4, 1, 0));

diff --git a/tests/i915/gem_ring_sync_loop.c b/tests/i915/gem_ring_sync_loop.c
index 3982cf9b9319..63ee3f2d7095 100644
--- a/tests/i915/gem_ring_sync_loop.c
+++ b/tests/i915/gem_ring_sync_loop.c
@@ -48,7 +48,7 @@ sync_loop(int fd)
int i;

nengine = 0;
- __for_each_physical_engine(fd, engine)
+ for_each_physical_engine(fd, engine)
engines[nengine++] = engine->flags;
igt_require(nengine);

diff --git a/tests/i915/gem_ringfill.c b/tests/i915/gem_ringfill.c
index a02c7e76ecd9..8b3895bc9e32 100644
--- a/tests/i915/gem_ringfill.c
+++ b/tests/i915/gem_ringfill.c
@@ -280,7 +280,7 @@ igt_main
for (m = modes; m->suffix; m++) {
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("%s%s", e->name, m->suffix) {
igt_skip_on(m->flags & NEWFD && master);
if (m->flags & (HANG|SUSPEND|HIBERNATE))
diff --git a/tests/i915/gem_shrink.c b/tests/i915/gem_shrink.c
index bca6fb88c6da..2cbd2372a324 100644
--- a/tests/i915/gem_shrink.c
+++ b/tests/i915/gem_shrink.c
@@ -423,7 +423,7 @@ igt_main
CHECK_SWAP | CHECK_RAM);

nengine = 0;
- __for_each_static_engine(engine)
+ for_each_static_engine(engine)
engines[nengine++] = engine->flags;
igt_require(nengine);

@@ -431,7 +431,7 @@ igt_main
}

igt_subtest("reclaim") {
- __for_each_static_engine(engine) {
+ for_each_static_engine(engine) {
if (engine->class == I915_ENGINE_CLASS_RENDER)
break;
}
diff --git a/tests/i915/gem_spin_batch.c b/tests/i915/gem_spin_batch.c
index 717751bddc1f..85b4e9ac857a 100644
--- a/tests/i915/gem_spin_batch.c
+++ b/tests/i915/gem_spin_batch.c
@@ -86,7 +86,7 @@ static void spin_resubmit(int fd, const struct intel_execution_engine2 *e,
};

if (flags & RESUBMIT_ALL_ENGINES) {
- __for_each_physical_engine(fd, other) {
+ for_each_physical_engine(fd, other) {
if (other == e)
continue;

@@ -119,7 +119,7 @@ static void spin_on_all_engines(int fd, unsigned int timeout_sec)
{
const struct intel_execution_engine2 *engine;

- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
igt_fork(child, 1) {
igt_install_exit_handler(spin_exit_handler);
spin(fd, engine, timeout_sec);
@@ -142,7 +142,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("basic-%s", e->name)
spin(fd, e, 3);

diff --git a/tests/i915/gem_storedw_loop.c b/tests/i915/gem_storedw_loop.c
index f7eb5a64169f..57b4182d5273 100644
--- a/tests/i915/gem_storedw_loop.c
+++ b/tests/i915/gem_storedw_loop.c
@@ -182,7 +182,7 @@ igt_main
igt_require(gem_uses_ppgtt(fd));
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("store-%s", e->name) {
check_test_requirements(fd, e);
store_test(fd, e);
diff --git a/tests/i915/gem_sync.c b/tests/i915/gem_sync.c
index 629decfcfe18..4861b1d29714 100644
--- a/tests/i915/gem_sync.c
+++ b/tests/i915/gem_sync.c
@@ -87,7 +87,7 @@ sync_ring(int fd, const struct intel_execution_engine2 *e, int num_children,
int num_engines = 0;

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
names[num_engines] = e->name;
engines[num_engines++] = e->flags;
if (num_engines == ARRAY_SIZE(engines))
@@ -187,7 +187,7 @@ wakeup_ring(int fd, const struct intel_execution_engine2 *e, int timeout,
int num_engines = 0;

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -299,7 +299,7 @@ static void active_ring(int fd, const struct intel_execution_engine2 *e, int tim
int num_engines = 0;

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -367,7 +367,7 @@ active_wakeup_ring(int fd, const struct intel_execution_engine2 *e, int timeout,
int num_engines = 0;

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -502,7 +502,7 @@ store_ring(int fd, const struct intel_execution_engine2 *e, int num_children, in
int num_engines = 0;

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -619,7 +619,7 @@ switch_ring(int fd, const struct intel_execution_engine2 *e, int num_children, i
gem_require_contexts(fd);

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -946,7 +946,7 @@ store_many(int fd, const struct intel_execution_engine2 *e, int timeout)
intel_detect_and_clear_missed_interrupts(fd);

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -979,7 +979,7 @@ sync_all(int fd, int num_children, int timeout)
const struct intel_execution_engine2 *engine;
int num_engines = 0;

- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
engines[num_engines++] = engine->flags;
if (num_engines == ARRAY_SIZE(engines))
break;
@@ -1032,7 +1032,7 @@ store_all(int fd, int num_children, int timeout)
int num_engines = 0;
const struct intel_execution_engine2 *e;

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
if (!gem_class_can_store_dword(fd, e->class))
continue;

@@ -1141,7 +1141,7 @@ preempt(int fd, const struct intel_execution_engine2 *e, int num_children, int t
uint32_t ctx[2];

if (!e) {
- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
names[num_engines] = e->name;
engines[num_engines++] = e->flags;
if (num_engines == ARRAY_SIZE(engines))
@@ -1227,7 +1227,7 @@ igt_main
igt_fork_hang_detector(fd);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("%s", e->name)
sync_ring(fd, e, 1, 150);
igt_subtest_f("idle-%s", e->name)
@@ -1301,7 +1301,7 @@ igt_main
igt_subtest("preempt-all")
preempt(fd, NULL, 1, 20);

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("preempt-%s", e->name)
preempt(fd, e, ncpus, 150);
}
diff --git a/tests/i915/gem_userptr_blits.c b/tests/i915/gem_userptr_blits.c
index 2433cc6668a7..bd4e02832a3b 100644
--- a/tests/i915/gem_userptr_blits.c
+++ b/tests/i915/gem_userptr_blits.c
@@ -1147,7 +1147,7 @@ static void test_readonly(int i915)

gem_userptr(i915, space, total, true, userptr_flags, &rhandle);

- __for_each_physical_engine(i915, engine) {
+ for_each_physical_engine(i915, engine) {
char *ref, *result;

/* First tweak the backing store through the write */
diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c
index b5e32219d77b..c1b2cf3e634e 100644
--- a/tests/i915/gem_wait.c
+++ b/tests/i915/gem_wait.c
@@ -177,7 +177,7 @@ igt_main
basic(fd, ALL_ENGINES, WRITE);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_group {
igt_subtest_f("busy-%s", e->name) {
gem_quiescent_gpu(fd);
@@ -234,7 +234,7 @@ igt_main
basic(fd, ALL_ENGINES, WRITE | HANG);
}

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
igt_subtest_f("hang-busy-%s", e->name) {
gem_quiescent_gpu(fd);
basic(fd, e->flags, HANG | BUSY);
diff --git a/tests/i915/i915_hangman.c b/tests/i915/i915_hangman.c
index 047d7d5f5d04..b7f41ec1e5d7 100644
--- a/tests/i915/i915_hangman.c
+++ b/tests/i915/i915_hangman.c
@@ -276,7 +276,7 @@ igt_main
igt_subtest("error-state-basic")
test_error_state_basic();

- __for_each_physical_engine(device, e)
+ for_each_physical_engine(device, e)
igt_subtest_f("error-state-capture-%s", e->name)
test_error_state_capture(e, e->name);

diff --git a/tests/i915/i915_module_load.c b/tests/i915/i915_module_load.c
index aabb701d592c..09519bf6b287 100644
--- a/tests/i915/i915_module_load.c
+++ b/tests/i915/i915_module_load.c
@@ -152,7 +152,7 @@ static void store_all(int fd)

nengine = 0;
intel_detect_and_clear_missed_interrupts(fd);
- __for_each_physical_engine(fd, engine) {
+ for_each_physical_engine(fd, engine) {
if (!gem_class_can_store_dword(fd, engine->class))
continue;

@@ -287,7 +287,7 @@ gem_exec_store(void)
fd = __drm_open_driver(DRIVER_INTEL);
igt_fork_hang_detector(fd);

- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
if (gem_class_can_store_dword(fd, e->class))
store_dword(fd, e);
}
diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c
index 72b9166afb4c..676148b7afad 100644
--- a/tests/perf_pmu.c
+++ b/tests/perf_pmu.c
@@ -445,7 +445,7 @@ busy_check_all(int gem_fd, const struct intel_execution_engine2 *e,

i = 0;
fd[0] = -1;
- __for_each_physical_engine(gem_fd, e_) {
+ for_each_physical_engine(gem_fd, e_) {
if (e->class == e_->class && e->instance == e_->instance)
busy_idx = i;

@@ -508,7 +508,7 @@ most_busy_check_all(int gem_fd, const struct intel_execution_engine2 *e,
unsigned int idle_idx, i;

i = 0;
- __for_each_physical_engine(gem_fd, e_) {
+ for_each_physical_engine(gem_fd, e_) {
if (e->class == e_->class && e->instance == e_->instance)
idle_idx = i;
else if (spin)
@@ -565,7 +565,7 @@ all_busy_check_all(int gem_fd, const unsigned int num_engines,
unsigned int i;

i = 0;
- __for_each_physical_engine(gem_fd, e) {
+ for_each_physical_engine(gem_fd, e) {
if (spin)
__submit_spin(gem_fd, spin, e, 64);
else
@@ -1686,7 +1686,7 @@ igt_main
igt_require_gem(fd);
igt_require(i915_type_id() > 0);

- __for_each_physical_engine(fd, e)
+ for_each_physical_engine(fd, e)
num_engines++;
}

@@ -1696,7 +1696,7 @@ igt_main
igt_subtest("invalid-init")
invalid_init();

- __for_each_physical_engine(fd, e) {
+ for_each_physical_engine(fd, e) {
const unsigned int pct[] = { 2, 50, 98 };

/**
@@ -1900,7 +1900,7 @@ igt_main
gem_quiescent_gpu(fd);
}

- __for_each_physical_engine(render_fd, e) {
+ for_each_physical_engine(render_fd, e) {
igt_subtest_group {
igt_fixture {
gem_context_has_engine(render_fd,
diff --git a/tests/prime_busy.c b/tests/prime_busy.c
index 661da2a56688..8b102b48da6d 100644
--- a/tests/prime_busy.c
+++ b/tests/prime_busy.c
@@ -241,7 +241,7 @@ igt_main
igt_fixture
gem_require_mmap_wc(fd);

- __for_each_static_engine(e) {
+ for_each_static_engine(e) {
for (const struct mode *m = modes; m->name; m++)
test_engine_mode(fd, e, m->name, m->flags);
}
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 030ca39de08c..2fff93c1f12e 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -844,7 +844,7 @@ igt_main
igt_subtest("coherency-gtt")
test_gtt_interleaved(vgem, i915);

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
igt_subtest_f("%ssync-%s",
e->class == I915_ENGINE_CLASS_RENDER ?
"basic-" : "", e->name) {
@@ -884,7 +884,7 @@ igt_main
igt_subtest("basic-fence-mmap")
test_fence_mmap(i915, vgem);

- __for_each_physical_engine(i915, e) {
+ for_each_physical_engine(i915, e) {
igt_subtest_f("%sfence-wait-%s",
e->class == I915_ENGINE_CLASS_RENDER ?
"basic-" : "", e->name) {