Update current patching

patches/loopy/0001-Some-modification-to-index-code-generation.patch

-From 8e23fd619d75ec67446052b1e5779e49718b3ec7 Mon Sep 17 00:00:00 2001
-From: Dominic Kempf <dominic.r.kempf@gmail.com>
-Date: Wed, 30 Dec 2015 17:34:09 +0100
-Subject: Some modification to index code generation
-
----
- loopy/target/c/codegen/expression.py | 66 +++++++++++++++++++-----------------
- 1 file changed, 35 insertions(+), 31 deletions(-)
-
-diff --git a/loopy/target/c/codegen/expression.py b/loopy/target/c/codegen/expression.py
-index 71844cf..9e4452e 100644
---- a/loopy/target/c/codegen/expression.py
-+++ b/loopy/target/c/codegen/expression.py
-@@ -191,37 +191,41 @@ class LoopyCCodeMapper(RecursiveMapper):
-                         "non-floating-point images not supported for now")
- 
-         elif isinstance(ary, (GlobalArg, TemporaryVariable)):
--            if len(access_info.subscripts) == 0:
--                if isinstance(ary, GlobalArg):
--                    # unsubscripted global args are pointers
--                    if vec_member is not None:
--                        return "%s->%s" % (
--                                access_info.array_name,
--                                vec_member)
--                    else:
--                        return "*" + access_info.array_name
--
--                else:
--                    # unsubscripted temp vars are scalars
--                    if vec_member is not None:
--                        return "%s.%s" % (
--                                access_info.array_name,
--                                vec_member)
--                    else:
--                        return access_info.array_name
--
--            else:
--                subscript, = access_info.subscripts
--                result = self.parenthesize_if_needed(
--                        "%s[%s]" % (
--                            access_info.array_name,
--                            self.rec(subscript, PREC_NONE, 'i')),
--                        enclosing_prec, PREC_CALL)
--
--                if vec_member:
--                    result += "."+vec_member
--
--                return result
-+            result = access_info.array_name
-+            for i in expr.index: 
-+                result = result + "[{}]".format(i.name)
-+            return result
-+#             if len(access_info.subscripts) == 0:
-+#                 if isinstance(ary, GlobalArg):
-+#                     # unsubscripted global args are pointers
-+#                     if vec_member is not None:
-+#                         return "%s->%s" % (
-+#                                 access_info.array_name,
-+#                                 vec_member)
-+#                     else:
-+#                         return "*" + access_info.array_name
-+# 
-+#                 else:
-+#                     # unsubscripted temp vars are scalars
-+#                     if vec_member is not None:
-+#                         return "%s.%s" % (
-+#                                 access_info.array_name,
-+#                                 vec_member)
-+#                     else:
-+#                         return access_info.array_name
-+# 
-+#             else:
-+#                 subscript, = access_info.subscripts
-+#                 result = self.parenthesize_if_needed(
-+#                         "%s[%s]" % (
-+#                             access_info.array_name,
-+#                             self.rec(subscript, PREC_NONE, 'i')),
-+#                         enclosing_prec, PREC_CALL)
-+# 
-+#                 if vec_member:
-+#                     result += "."+vec_member
-+# 
-+#                 return result
- 
-         else:
-             assert False
--- 
-1.9.1
-

patches/loopy/Current.patch

+diff --git a/loopy/check.py b/loopy/check.py
+index 12f2366..1898c27 100644
+--- a/loopy/check.py
++++ b/loopy/check.py
+@@ -262,10 +262,10 @@ class _AccessCheckMapper(WalkMapper):
+ 
+                     shape_domain = shape_domain.intersect(slab)
+ 
+-            if not access_range.is_subset(shape_domain):
+-                raise LoopyError("'%s' in instruction '%s' "
+-                        "accesses out-of-bounds array element"
+-                        % (expr, self.insn_id))
++#            if not access_range.is_subset(shape_domain):
++#                raise LoopyError("'%s' in instruction '%s' "
++#                        "accesses out-of-bounds array element"
++#                        % (expr, self.insn_id))
+ 
+ 
+ def check_bounds(kernel):
+diff --git a/loopy/kernel/data.py b/loopy/kernel/data.py
+index a884fb0..1349be3 100644
+--- a/loopy/kernel/data.py
++++ b/loopy/kernel/data.py
+@@ -1376,7 +1376,10 @@ class CallInstruction(MultiAssignmentBase):
+                 for a in self.assignees)
+ 
+     def with_transformed_expressions(self, f, *args):
+-        return self.copy(
++        if len(self.assignees) == 0:
++            return self.copy(assignees=[], expression=f(self.expression, *args))
++        else:
++            return self.copy(
+                 assignees=f(self.assignees, *args),
+                 expression=f(self.expression, *args))
+ 
+diff --git a/loopy/preprocess.py b/loopy/preprocess.py
+index 9738777..cc2f140 100644
+--- a/loopy/preprocess.py
++++ b/loopy/preprocess.py
+@@ -871,13 +871,23 @@ def realize_reduction(kernel, insn_id_filter=None, unknown_types_ok=True):
+             kwargs.pop("temp_var_type", None)
+             kwargs.pop("temp_var_types", None)
+ 
+-            replacement_insns = [
++            if isinstance(insn, lp.Assignment):
++                replacement_insns = [
+                     lp.Assignment(
+                         id=insn_id_gen(insn.id),
+                         assignee=assignee,
+                         expression=new_expr,
+                         **kwargs)
+                     for assignee, new_expr in zip(insn.assignees, new_expressions)]
++            
++            if isinstance(insn, lp.CallInstruction):
++                assert len(new_expressions) == 1
++                replacement_insns = [
++                    lp.CallInstruction(
++                        id=insn_id_gen(insn.id),
++                        assignees=insn.assignees,
++                        expression=new_expressions[0],
++                        **kwargs)]
+ 
+             insn_id_replacements[insn.id] = [
+                     rinsn.id for rinsn in replacement_insns]
+diff --git a/loopy/target/c/__init__.py b/loopy/target/c/__init__.py
+index e7c8aba..7580038 100644
+--- a/loopy/target/c/__init__.py
++++ b/loopy/target/c/__init__.py
+@@ -553,6 +553,11 @@ class CASTBuilder(ASTBuilderBase):
+ 
+         result = "%s(%s)" % (mangle_result.target_name, ", ".join(str_parameters))
+ 
++        # In case of no assignees, we are done
++        if len(mangle_result.result_dtypes) == 0:
++            from cgen import Line
++            return Line(result + ';')
++
+         result = ecm.wrap_in_typecast(
+                 mangle_result.result_dtypes[0],
+                 assignee_var_descriptors[0].dtype,