Update dependencies during transformation

loopy/schedule/checker/utils.py

@@ -91,6 +91,48 @@ def reorder_dims_by_name(
     return new_set
 
 
+def move_dim_to_index(
+        isl_map, dim_name, dt, destination_idx):
+    """Return an isl map with the specified dimension moved to
+    the specified index.
+
+    :arg isl_map: A :class:`islpy.Map`.
+
+    :arg dim_name: A :class:`str` specifying the name of the dimension
+        to be moved.
+
+    :arg dt: A :class:`islpy.dim_type`, i.e., an :class:`int`,
+        specifying the type of dimension to be reordered.
+
+    :arg destination_idx: A :class:`int` specifying the desired dimension
+        index of the dimention to be moved.
+
+    :returns: An :class:`islpy.Map` matching `isl_map` with the
+        specified dimension moved to the specified index.
+
+    """
+
+    assert dt != dim_type.param
+
+    layover_dt = dim_type.param
+    layover_dim_len = len(isl_map.get_var_names(layover_dt))
+
+    current_idx = isl_map.find_dim_by_name(dt, dim_name)
+    if current_idx == -1:
+        raise ValueError("Dimension name %s not found in dim type %s of %s"
+            % (dim_name, dt, isl_map))
+
+    if current_idx != destination_idx:
+        # First move to other dim because isl is stupid
+        new_map = isl_map.move_dims(
+            layover_dt, layover_dim_len, dt, current_idx, 1)
+        # Now move it where we actually want it
+        new_map = new_map.move_dims(
+            dt, destination_idx, layover_dt, layover_dim_len, 1)
+
+    return new_map
+
+
 def move_dims_by_name(
         isl_obj, dst_type, dst_pos_start, src_type, dim_names):
     dst_pos = dst_pos_start
@@ -197,7 +239,6 @@ def append_mark_to_isl_map_var_names(old_isl_map, dt, mark):
 
 
 def append_mark_to_strings(strings, mark):
-    assert isinstance(strings, list)
     return [s+mark for s in strings]
 
 
@@ -340,6 +381,14 @@ def sorted_union_of_names_in_isl_sets(
     return sorted(inames)
 
 
+def convert_map_to_set(isl_map):
+    n_in_dims = len(isl_map.get_var_names(dim_type.in_))
+    n_out_dims = len(isl_map.get_var_names(dim_type.out))
+    return isl_map.move_dims(
+        dim_type.in_, n_in_dims, dim_type.out, 0, n_out_dims
+        ).domain(), n_in_dims, n_out_dims
+
+
 def create_symbolic_map_from_tuples(
         tuple_pairs_with_domains,
         space,

loopy/transform/add_barrier.py

@@ -90,10 +90,37 @@ def add_barrier(kernel, insn_before="", insn_after="", id_based_on=None,
 
     new_kernel = kernel.copy(instructions=kernel.instructions + [barrier_to_add])
     if insn_after is not None:
+        # TODO this should be a new dependency
         new_kernel = add_dependency(kernel=new_kernel,
                                  insn_match=insn_after,
                                  depends_on="id:"+id)
 
+    for insn_before_id in insns_before:
+        # make v2 dep:
+        from loopy.schedule.checker.utils import (
+            append_mark_to_strings,
+            make_dep_map,
+        )
+        from loopy.schedule.checker.schedule import BEFORE_MARK
+        inames_before = new_kernel.id_to_insn[insn_before_id].within_inames
+        inames_before_marked = append_mark_to_strings(
+            inames_before, BEFORE_MARK)
+
+        inames_after = set(within_inames) if within_inames else set()
+
+        shared_inames = inames_after & inames_before
+
+        in_space_str = ", ".join(inames_before_marked)
+        out_space_str = ", ".join(inames_after)
+        constraint_str = " and ".join([
+            "{0}{1} = {0}".format(iname, BEFORE_MARK) for iname in shared_inames])
+
+        dep_v2 = make_dep_map(
+            f"{{ [{in_space_str}] -> [{out_space_str}] : {constraint_str} }}",
+            knl_with_domains=new_kernel)
+        new_kernel = add_dependency(
+            new_kernel, "id:"+id, ("id:"+insn_before_id, dep_v2))
+
     return new_kernel
 
 # }}}