From 5828235f806c3e87a5b1eed34ef69ef317a110bd Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 4 Nov 2019 23:38:36 +0100
Subject: Extract streaming pattern into Mako definitions

This should allow for plugging in e.g. a AA pattern implementation
without without touching any file but `AA.$target.mako`.

OpenCL and C++ target templates now look basically the same and could
potentially be merged. However this would decrease flexibility should
more differences appear in the future.  Maintaining separate template
files is an acceptable overhead to preserve flexibility.
---
 .../kernel/template/collide_and_stream.cpp.mako    | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'boltzgen/kernel/template/collide_and_stream.cpp.mako')

diff --git a/boltzgen/kernel/template/collide_and_stream.cpp.mako b/boltzgen/kernel/template/collide_and_stream.cpp.mako
index ee42eb7..dec009f 100644
--- a/boltzgen/kernel/template/collide_and_stream.cpp.mako
+++ b/boltzgen/kernel/template/collide_and_stream.cpp.mako
@@ -1,22 +1,10 @@
+<%namespace name="pattern" file="${'/pattern/%s.cpp.mako' % context['streaming']}"/>
 <%
 import sympy
+subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
 %>
 
-void collide_and_stream(      ${float_type}* f_next,
-                        const ${float_type}* f_prev,
-                        std::size_t gid)
-{
-          ${float_type}* preshifted_f_next = f_next + ${layout.cell_preshift('gid')};
-    const ${float_type}* preshifted_f_prev = f_prev + ${layout.cell_preshift('gid')};
-
-% for i, c_i in enumerate(descriptor.c):
-    const ${float_type} f_curr_${i} = preshifted_f_prev[${layout.pop_offset(i) + layout.neighbor_offset(-c_i)}];
-% endfor
-
-<%
-    subexpr, assignment = model.collision(f_eq = model.equilibrium(resolve_moments = True))
-%>
-
+<%call expr="pattern.operator_ab('collide_and_stream')">
 % for i, expr in enumerate(subexpr):
     const ${float_type} ${expr[0]} = ${sympy.ccode(expr[1])};
 % endfor
@@ -24,8 +12,4 @@ void collide_and_stream(      ${float_type}* f_next,
 % for i, expr in enumerate(assignment):
     const ${float_type} ${sympy.ccode(expr)}
 % endfor
-
-% for i, expr in enumerate(assignment):
-    preshifted_f_next[${layout.pop_offset(i)}] = f_next_${i};
-% endfor
-}
+</%call>
-- 
cgit v1.2.3