From db177e385f1dd39023305d55f85cc59e55c56a83 Mon Sep 17 00:00:00 2001
From: tj-sun <tianjiao.sun.2010@gmail.com>
Date: Thu, 29 Mar 2018 15:28:50 +0100
Subject: [PATCH] add make_inames_innermost() transformation

---
 loopy/__init__.py        |  4 ++--
 loopy/transform/ilp.py   |  7 -------
 loopy/transform/iname.py | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/loopy/__init__.py b/loopy/__init__.py
index 89683e0b4..cbef34d54 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -75,7 +75,7 @@ from loopy.transform.iname import (
         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_to_insn, make_inames_innermost)
 
 from loopy.transform.instruction import (
         find_instructions, map_instructions,
@@ -185,7 +185,7 @@ __all__ = [
         "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_to_insn", "make_inames_innermost",
 
         "add_prefetch", "change_arg_to_image",
         "tag_array_axes", "tag_data_axes",
diff --git a/loopy/transform/ilp.py b/loopy/transform/ilp.py
index 0ac71d603..b648ad505 100644
--- a/loopy/transform/ilp.py
+++ b/loopy/transform/ilp.py
@@ -87,13 +87,6 @@ def add_axes_to_temporaries_for_ilp_and_vec(kernel, iname=None):
                             kernel.iname_to_tag.get(iname),
                             (IlpBaseTag, VectorizeTag)))
             else:
-                if not isinstance(
-                        kernel.iname_to_tag.get(iname),
-                        (IlpBaseTag, VectorizeTag)):
-                    raise LoopyError(
-                            "'%s' is not an ILP iname"
-                            % iname)
-
                 ilp_inames = frozenset([iname])
 
             referenced_ilp_inames = (ilp_inames
diff --git a/loopy/transform/iname.py b/loopy/transform/iname.py
index 2347cef3c..f5afbedd8 100644
--- a/loopy/transform/iname.py
+++ b/loopy/transform/iname.py
@@ -1687,4 +1687,41 @@ def add_inames_to_insn(knl, inames, insn_match):
 # }}}
 
 
+# {{{ push iname to innermost
+
+def make_inames_innermost(knl, inames):
+    """
+    :arg inames: a frozenset of inames that will be pushed to the innermost
+        loop
+
+    .. versionadded:: 2018.1
+    """
+    if isinstance(inames, str):
+        inames = frozenset(s.strip() for s in inames.split(","))
+
+    if not isinstance(inames, frozenset):
+        raise TypeError("'inames' must be a frozenset")
+
+    from loopy.transform.ilp import add_axes_to_temporaries_for_ilp_and_vec
+
+    innermost_inames = []
+
+    name_gen = knl.get_var_name_generator()
+    for iname in inames:
+        knl = add_axes_to_temporaries_for_ilp_and_vec(knl, iname)
+        # split inner loops
+        for insn in knl.instructions:
+            new_iname = name_gen(iname)
+            knl = duplicate_inames(knl, iname, "id:{0}".format(insn.id),
+                                   new_inames=[new_iname])
+            innermost_inames.append(new_iname)
+
+    # push newly duplicated inames innermost
+    other_inames = knl.all_inames() - frozenset(innermost_inames)
+    knl = prioritize_loops(knl, other_inames)
+    return knl
+
+# }}}
+
+
 # vim: foldmethod=marker
-- 
GitLab