Changeset 647

Timestamp:

12/21/17 15:13:40 (6 years ago)

Author:

dubos

Message:

devel/unstructured : more unrolling of stencil loops + bugfix (TRiSK stencil)

File:

• codes/icosagcm/devel/Python/src/unstructured/macros.jin (modified) (6 diffs)

codes/icosagcm/devel/Python/src/unstructured/macros.jin

@@ -88 +88 @@
 {# ------------------------------ MESHES --------------------------- #}
 
+{% macro get_edges(thecode, mesh,degree) %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'edge%d = %s_edge(%d,ij)'%(iedge,mesh,iedge) }} 
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'le_de%d = le_de(edge%d)'%(iedge,iedge) }}      
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'sign%d = %s_ne(%d,ij)'%(iedge,mesh,iedge) }}   
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'ij_up%d = up(edge%d)'%(iedge,iedge) if 'VERTEX1' in thecode }}
+{% endfor %}
+{% for iedge in range(1,degree+1) %} 
+{{ 'ij_down%d = down(edge%d)'%(iedge,iedge) if 'VERTEX2' in thecode }}
+{% endfor %}
+{% endmacro %}
+
 {# argument 'code' is the body enclosed by ON_XXX ... END_BLOCK ; it takes arguments : mesh,degree=0 #}
 
@@ -114 +132 @@
 SELECT CASE(primal_deg(ij))
 CASE(4)
+{{ get_edges(thecode, mesh, 4) }}
 {{ vloop(mesh, lrange, flags, code, 4) }}
 CASE(5)
+{{ get_edges(thecode, mesh, 5) }}
 {{ vloop(mesh, lrange, flags, code, 5) }}
 CASE(6)
+{{ get_edges(thecode, mesh, 6) }}
 {{ vloop(mesh, lrange, flags, code, 6) }}
 CASE DEFAULT
@@ -180 +201 @@
 
 {{ define('IS_BOTTOM_LEVEL', '_FALSE_') }}
+!DIR$ SIMD
   DO l = {{start}}, {{end}}
     {{ 'kdown = l-1' if 'KDOWN' in thecode }}
@@ -247 +269 @@
 {% macro forall_edges(mesh,degree) -%}
 {% set thecode = caller() %}
+
+{% if degree>1 %}
+{% for iedge in range(1,degree+1) %}
+{{ define('EDGE', 'l,edge%d'%iedge) }}
+{{ define('SIGN', 'sign%d'%iedge) }}
+{{ define('LE_DE', 'le_de%d'%iedge) }}
+{{ define('VERTEX1', 'l,ij_up%d'%iedge) }}
+{{ define('VERTEX2', 'l,ij_down%d'%iedge) }}
+  {{ thecode }}
+{% endfor %}
+{% else %}
 {{ define('EDGE', 'l,edge') }}
-{{ define('VERTEX1', 'l,ij_down') }}
-{{ define('VERTEX2', 'l,ij_up') }}
 {{ define('SIGN', mesh + '_ne(iedge,ij)') }}
 {{ define('LE_DE', 'le_de(edge)') }}
-
-{% if degree>1 %}
-{% for iedge in range(1,degree+1) %}
-  iedge = {{ iedge }}
-  edge = {{ mesh }}_edge({{ iedge }},ij)
-  {{ 'ij_up = up(edge)'       if 'VERTEX1' in thecode }}
-  {{ 'ij_down = down(edge)'   if 'VERTEX2' in thecode }}
-  {{ thecode }}
-{% endfor %}
-{% else %}
+{{ define('VERTEX1', 'l,ij_up') }}
+{{ define('VERTEX2', 'l,ij_down') }}
 DO iedge = 1, {{ mesh }}_deg(ij)
   edge = {{ mesh }}_edge(iedge,ij)
@@ -273 +296 @@
 {{ undef('SIGN') }}
 {{ undef('LE_DE') }}
+{{ undef('VERTEX1') }}
+{{ undef('VERTEX2') }}
 {%- endmacro %}
 
@@ -280 +305 @@
 {% if degree>1 %}
 {% for itrisk in range(1,degree+1) %}
+  itrisk = {{ itrisk }}
   edge_trisk = trisk({{ itrisk }},edge)
   {{ thecode }}