void nir_reg_remove(nir_register *reg);
-/** Adds a variable to the appropreate list in nir_shader */
+/** Adds a variable to the appropriate list in nir_shader */
void nir_shader_add_variable(nir_shader *shader, nir_variable *var);
static inline void
/* The following data structure, which I have named merge_set is a way of
* representing a set registers of non-interfering registers. This is
- * based on the concept of a "dominence forest" presented in "Fast Copy
+ * based on the concept of a "dominance forest" presented in "Fast Copy
* Coalescing and Live-Range Identification" by Budimlic et. al. but the
* implementation concept is taken from "Revisiting Out-of-SSA Translation
* for Correctness, Code Quality, and Efficiency" by Boissinot et. al..
* Each SSA definition is associated with a merge_node and the association
* is represented by a combination of a hash table and the "def" parameter
* in the merge_node structure. The merge_set stores a linked list of
- * merge_nodes in dominence order of the ssa definitions. (Since the
- * liveness analysis pass indexes the SSA values in dominence order for us,
+ * merge_nodes in dominance order of the ssa definitions. (Since the
+ * liveness analysis pass indexes the SSA values in dominance order for us,
* this is an easy thing to keep up.) It is assumed that no pair of the
* nodes in a given set interfere. Merging two sets or checking for
* interference can be done in a single linear-time merge-sort walk of the
* returns inside of the body of the if. If we're in a loop, then these
* were lowered to breaks which automatically skip to the end of the
* loop so we don't have to do anything. If we're not in a loop, then
- * all we know is that the return flag is set appropreately and that the
+ * all we know is that the return flag is set appropriately and that the
* recursive calls ensured that nothing gets executed *inside* the if
* after a return. In order to ensure nothing outside gets executed
* after a return, we need to predicate everything following on the
if (vec->src[j].src.ssa != vec->src[i].src.ssa)
continue;
- /* Mark the given chanle as having been handled */
+ /* Mark the given channel as having been handled */
srcs_remaining &= ~(1 << j);
- /* Mark the appropreate channel as coming from src j */
+ /* Mark the appropriate channel as coming from src j */
swizzle[vec->src[j].swizzle[0]] = j;
}