Cartoon dependency graph from new deps for linearization

loopy/kernel/instruction.py

@@ -222,6 +222,7 @@ class InstructionBase(ImmutableRecord, Taggable):
 
     def __init__(self, id, depends_on, depends_on_is_final,
             dependencies,
+            non_linearizing_deps,
             groups, conflicts_with_groups,
             no_sync_with,
             within_inames_is_final, within_inames,
@@ -253,6 +254,9 @@ def __init__(self, id, depends_on, depends_on_is_final,
 
         if dependencies is None:
             dependencies = {}
+        # TODO dependee ids for deps that don't affect cartoon dag
+        if non_linearizing_deps is None:
+            non_linearizing_deps = set()
 
         if groups is None:
             groups = frozenset()
@@ -311,6 +315,7 @@ def __init__(self, id, depends_on, depends_on_is_final,
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 no_sync_with=no_sync_with,
                 groups=groups, conflicts_with_groups=conflicts_with_groups,
                 within_inames_is_final=within_inames_is_final,
@@ -408,6 +413,9 @@ def get_str_options(self):
             result.append("dep="+":".join(self.depends_on))
         if self.dependencies:
             result.append("dependencies="+":".join(self.dependencies.keys()))
+        if self.non_linearizing_deps:
+            result.append(
+                "non_linearizing_deps="+":".join(self.non_linearizing_deps))
         if self.no_sync_with:
             result.append("nosync="+":".join(
                     "%s@%s" % entry for entry in self.no_sync_with))
@@ -478,6 +486,7 @@ def __setstate__(self, val):
             self.id = intern(self.id)
         self.depends_on = intern_frozenset_of_ids(self.depends_on)
         # TODO something with dependencies?
+        # TODO something with non_linearizing_deps?
         self.groups = intern_frozenset_of_ids(self.groups)
         self.conflicts_with_groups = (
                 intern_frozenset_of_ids(self.conflicts_with_groups))
@@ -905,6 +914,7 @@ def __init__(self,
             depends_on=None,
             depends_on_is_final=None,
             dependencies=None,
+            non_linearizing_deps=None,  # TODO
             groups=None,
             conflicts_with_groups=None,
             no_sync_with=None,
@@ -922,6 +932,7 @@ def __init__(self,
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 groups=groups,
                 conflicts_with_groups=conflicts_with_groups,
                 no_sync_with=no_sync_with,
@@ -1058,6 +1069,7 @@ def __init__(self,
             depends_on=None,
             depends_on_is_final=None,
             dependencies=None,
+            non_linearizing_deps=None,  # TODO
             groups=None,
             conflicts_with_groups=None,
             no_sync_with=None,
@@ -1072,6 +1084,7 @@ def __init__(self,
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 groups=groups,
                 conflicts_with_groups=conflicts_with_groups,
                 no_sync_with=no_sync_with,
@@ -1356,6 +1369,7 @@ def __init__(self,
             depends_on=None,
             depends_on_is_final=None,
             dependencies=None,
+            non_linearizing_deps=None,  # TODO
             groups=None,
             conflicts_with_groups=None,
             no_sync_with=None,
@@ -1379,6 +1393,7 @@ def __init__(self,
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 groups=groups, conflicts_with_groups=conflicts_with_groups,
                 no_sync_with=no_sync_with,
                 within_inames_is_final=within_inames_is_final,
@@ -1530,7 +1545,8 @@ def __init__(
             id=None,
             depends_on=None,
             depends_on_is_final=None,
-            dependencies=None,
+            dependencies=None,  # TODO
+            non_linearizing_deps=None,
             groups=None,
             conflicts_with_groups=None,
             no_sync_with=None,
@@ -1544,6 +1560,7 @@ def __init__(
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 groups=groups,
                 conflicts_with_groups=conflicts_with_groups,
                 no_sync_with=no_sync_with,
@@ -1598,7 +1615,8 @@ def __init__(
             id,
             depends_on=None,
             depends_on_is_final=None,
-            dependencies=None,
+            dependencies=None,  # TODO
+            non_linearizing_deps=None,
             groups=None,
             conflicts_with_groups=None,
             no_sync_with=None,
@@ -1618,6 +1636,7 @@ def __init__(
                 depends_on=depends_on,
                 depends_on_is_final=depends_on_is_final,
                 dependencies=dependencies,
+                non_linearizing_deps=non_linearizing_deps,  # TODO
                 groups=groups,
                 conflicts_with_groups=conflicts_with_groups,
                 no_sync_with=no_sync_with,

loopy/options.py

@@ -242,6 +242,7 @@ def __init__(
                 disable_global_barriers=kwargs.get("disable_global_barriers",
                     False),
                 check_dep_resolution=kwargs.get("check_dep_resolution", True),
+                use_dependencies_v2=kwargs.get("use_dependencies_v2", False),
 
                 enforce_variable_access_ordered=kwargs.get(
                     "enforce_variable_access_ordered", True),