Merge pull request #478 from inducer/map-domain-transformation-v2

Map domain transformation v2

Author: inducer

loopy/__init__.py

@@ -76,7 +76,7 @@
         affine_map_inames, find_unused_axis_tag,
         make_reduction_inames_unique,
         has_schedulable_iname_nesting, get_iname_duplication_options,
-        add_inames_to_insn, add_inames_for_unused_hw_axes)
+        add_inames_to_insn, add_inames_for_unused_hw_axes, map_domain)
 
 from loopy.transform.instruction import (
         find_instructions, map_instructions,
@@ -202,7 +202,7 @@
         "affine_map_inames", "find_unused_axis_tag",
         "make_reduction_inames_unique",
         "has_schedulable_iname_nesting", "get_iname_duplication_options",
-        "add_inames_to_insn", "add_inames_for_unused_hw_axes",
+        "add_inames_to_insn", "add_inames_for_unused_hw_axes", "map_domain",
 
         "add_prefetch", "change_arg_to_image",
         "tag_array_axes", "tag_data_axes",

loopy/isl_helpers.py

@@ -767,4 +767,87 @@ def subst_into_pwaff(new_space, pwaff, subst_dict):
 
 # }}}
 
+
+# {{{ add_and_name_dims
+
+def add_and_name_dims(isl_obj, dt, names):
+    """Append dimensions of the specified dimension type to the provided ISL
+    object, and set their names.
+
+    :arg isl_obj: An :class:`islpy.Set` or  :class:`islpy.Map` to which
+        new dimensions will be added.
+
+    :arg dt: An :class:`islpy.dim_type`, i.e., an :class:`int`, specifying the
+        dimension type for the new dimensions.
+
+    :arg names: An iterable of :class:`str` values specifying the names of the
+        new dimensions to be added.
+
+    :returns: An object of the same type as *isl_obj* with the new dimensions
+        added and named.
+
+    """
+
+    new_idx_start = isl_obj.dim(dt)
+    isl_obj = isl_obj.add_dims(dt, len(names))
+    for i, name in enumerate(names):
+        isl_obj = isl_obj.set_dim_name(dt, new_idx_start+i, name)
+    return isl_obj
+
+# }}}
+
+
+# {{{ add_eq_constraint_from_names
+
+def add_eq_constraint_from_names(isl_obj, var1, var2):
+    """Add constraint *var1* = *var2* to an ISL object.
+
+    :arg isl_obj: An :class:`islpy.Set` or  :class:`islpy.Map` to which
+        a new constraint will be added.
+
+    :arg var1: A :class:`str` specifying the name of the first variable
+        involved in constraint *var1* = *var2*.
+
+    :arg var2: A :class:`str` specifying the name of the second variable
+        involved in constraint *var1* = *var2*.
+
+    :returns: An object of the same type as *isl_obj* with the constraint
+        *var1* = *var2*.
+
+    """
+    return isl_obj.add_constraint(
+               isl.Constraint.eq_from_names(
+                   isl_obj.space,
+                   {1: 0, var1: 1, var2: -1}))
+
+# }}}
+
+
+# {{{ find_and_rename_dim
+
+def find_and_rename_dim(isl_obj, dt, old_name, new_name):
+    """Rename a dimension in an ISL object.
+
+    :arg isl_obj: An :class:`islpy.Set` or  :class:`islpy.Map` containing the
+        dimension to be renamed.
+
+    :arg dt: An :class:`islpy.dim_type` (i.e., :class:`int`) specifying the
+        dimension type containing the dimension to be renamed.
+
+    :arg old_name: A :class:`str` specifying the name of the dimension to be
+        renamed.
+
+    :arg new_name: A :class:`str` specifying the new name of the dimension to
+        be renamed.
+
+    :returns: An object of the same type as *isl_obj* with the dimension
+        *old_name* renamed to *new_name*.
+
+    """
+    return isl_obj.set_dim_name(
+            dt, isl_obj.find_dim_by_name(dt, old_name), new_name)
+
+# }}}
+
+
 # vim: foldmethod=marker