Fix loopy.statistics for CInstructions

loopy/statistics.py

@@ -914,7 +914,7 @@ def __init__(self, knl, callables_table, kernel_rec,
     arithmetic_count_granularity = CountGranularity.SUBGROUP
 
     def combine(self, values):
-        return sum(values)
+        return sum(values, self.new_zero_poly_map())
 
     def map_constant(self, expr):
         return self.new_zero_poly_map()
@@ -1670,24 +1670,27 @@ def _get_op_map_for_single_kernel(knl, callables_table,
     op_map = op_counter.new_zero_poly_map()
 
     from loopy.kernel.instruction import (
-            CallInstruction, CInstruction, Assignment,
+            MultiAssignmentBase, CInstruction,
             NoOpInstruction, BarrierInstruction)
 
     for insn in knl.instructions:
-        if isinstance(insn, (CallInstruction, CInstruction, Assignment)):
-            ops = op_counter(insn.assignees) + op_counter(insn.expression)
-            for key, val in ops.count_map.items():
-                count = _get_insn_count(knl, callables_table, insn.id,
-                            subgroup_size, count_redundant_work,
-                            key.count_granularity)
-                op_map = op_map + ToCountMap({key: val}) * count
+        if isinstance(insn, MultiAssignmentBase):
+            exprs_in_insn = (insn.assignees, insn.expression,
+                             tuple(insn.predicates))
 
-        elif isinstance(insn, (NoOpInstruction, BarrierInstruction)):
-            pass
+        elif isinstance(insn, (CInstruction, NoOpInstruction, BarrierInstruction)):
+            exprs_in_insn = tuple(insn.predicates)
         else:
             raise NotImplementedError("unexpected instruction item type: '%s'"
                     % type(insn).__name__)
 
+        ops = op_counter(exprs_in_insn)
+        for key, val in ops.count_map.items():
+            count = _get_insn_count(knl, callables_table, insn.id,
+                        subgroup_size, count_redundant_work,
+                        key.count_granularity)
+            op_map = op_map + ToCountMap({key: val}) * count
+
     return op_map
 
 

test/test_statistics.py

@@ -1531,6 +1531,29 @@ def test_no_loop_ops():
     assert f64_mul == 1
 
 
+def test_c_instructions_stats():
+    # loopy.git <= 04fb703 would fail this regression as CInstructions weren't
+    # supported in loopy.statistics
+    knl = lp.make_kernel(
+        "{ : }",
+        ["""
+         a = 2.0f
+         b = 2*a
+         """,
+         lp.CInstruction((),
+                         code='printf("Hello World\n");'),
+         """
+         c = a + b
+         """
+         ])
+
+    op_map = lp.get_op_map(knl, subgroup_size=1)
+    f32_add = op_map.filter_by(name="add").eval_and_sum({})
+    f32_mul = op_map.filter_by(name="mul").eval_and_sum({})
+    assert f32_add == 1
+    assert f32_mul == 1
+
+
 if __name__ == "__main__":
     if len(sys.argv) > 1:
         exec(sys.argv[1])