From e63766fb4b54bc88756ee7e82c3ff8cec0dc5561 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 26 Apr 2016 20:21:27 -0700 Subject: [PATCH] nir: Switch the arguments to nir_foreach_parallel_copy_entry This matches the "foreach x in container" pattern found in many other programming languages. Reviewed-by: Eduardo Lima Mitev Reviewed-by: Ian Romanick --- src/compiler/nir/nir.c | 4 ++-- src/compiler/nir/nir.h | 2 +- src/compiler/nir/nir_from_ssa.c | 6 +++--- src/compiler/nir/nir_print.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 238f5257602..0a8b0836ab0 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -981,7 +981,7 @@ static bool visit_parallel_copy_dest(nir_parallel_copy_instr *instr, nir_foreach_dest_cb cb, void *state) { - nir_foreach_parallel_copy_entry(instr, entry) { + nir_foreach_parallel_copy_entry(entry, instr) { if (!cb(&entry->dest, state)) return false; } @@ -1174,7 +1174,7 @@ static bool visit_parallel_copy_src(nir_parallel_copy_instr *instr, nir_foreach_src_cb cb, void *state) { - nir_foreach_parallel_copy_entry(instr, entry) { + nir_foreach_parallel_copy_entry(entry, instr) { if (!visit_src(&entry->src, cb, state)) return false; } diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index e2585c65bfb..a76718d85de 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -1323,7 +1323,7 @@ typedef struct { nir_dest dest; } nir_parallel_copy_entry; -#define nir_foreach_parallel_copy_entry(pcopy, entry) \ +#define nir_foreach_parallel_copy_entry(entry, pcopy) \ foreach_list_typed(nir_parallel_copy_entry, entry, node, &(pcopy)->entries) typedef struct { diff --git a/src/compiler/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index d333752b371..067e66fe86a 100644 --- a/src/compiler/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c @@ -395,7 +395,7 @@ static void aggressive_coalesce_parallel_copy(nir_parallel_copy_instr *pcopy, struct from_ssa_state *state) { - nir_foreach_parallel_copy_entry(pcopy, entry) { + nir_foreach_parallel_copy_entry(entry, pcopy) { if (!entry->src.is_ssa) continue; @@ -582,7 +582,7 @@ resolve_parallel_copy(nir_parallel_copy_instr *pcopy, struct from_ssa_state *state) { unsigned num_copies = 0; - nir_foreach_parallel_copy_entry(pcopy, entry) { + nir_foreach_parallel_copy_entry(entry, pcopy) { /* Sources may be SSA */ if (!entry->src.is_ssa && entry->src.reg.reg == entry->dest.reg.reg) continue; @@ -615,7 +615,7 @@ resolve_parallel_copy(nir_parallel_copy_instr *pcopy, * - Predicessors are recorded from sources and destinations */ int num_vals = 0; - nir_foreach_parallel_copy_entry(pcopy, entry) { + nir_foreach_parallel_copy_entry(entry, pcopy) { /* Sources may be SSA */ if (!entry->src.is_ssa && entry->src.reg.reg == entry->dest.reg.reg) continue; diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index e504d88484e..9a77faf8fb5 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -806,7 +806,7 @@ static void print_parallel_copy_instr(nir_parallel_copy_instr *instr, print_state *state) { FILE *fp = state->fp; - nir_foreach_parallel_copy_entry(instr, entry) { + nir_foreach_parallel_copy_entry(entry, instr) { if (&entry->node != exec_list_get_head(&instr->entries)) fprintf(fp, "; "); -- 2.30.2