Merge pull request #62 from siliconcompiler/fix-spram-gen

correct search order of memories to pick largest width first

Author: gadfort

lambdalib/utils/__init__.py

@@ -28,7 +28,7 @@ def write_la_spram(fout, memories, control_signals=None, la_type='ram'):
         else:
             memory_inst_map[memory] = info["inst_name"]
 
-        selection_table.setdefault(info['AW'], {})[info['DW']] = memory
+        selection_table.setdefault(info['AW'], {})[int(info['DW'])] = memory
 
     selection_table = OrderedDict(sorted(selection_table.items(), reverse=True))
     for aw, items in selection_table.items():

lambdalib/utils/templates/la_spmemory.v

@@ -46,7 +46,7 @@ module la_sp{{ type }}
 
     // Determine which memory to select
     localparam MEM_TYPE = (TYPE != "DEFAULT") ? TYPE :{% for aw, dw_select in selection_table.items() %}
-      {% if loop.nextitem is defined %}(AW {% if loop.previtem is defined %}=={% else %}>={% endif %} {{ aw }}) ? {% endif %}{% for dw, memory in dw_select.items() %}{% if loop.nextitem is defined %}(DW {% if loop.previtem is defined %}=={% else %}>={% endif %} {{dw}}) ? {% endif %}"{{ memory}}"{% if loop.nextitem is defined %} : {% endif%}{% endfor %}{% if loop.nextitem is defined %} :{% else %};{% endif %}{% endfor %}
+      {% if loop.nextitem is defined %}(AW {% if loop.previtem is defined %}=={% else %}>={% endif %} {{ aw }}) ? {% endif %}{% for dw, memory in dw_select.items() %}{% if loop.nextitem is defined %}(DW >= {{dw}}) ? {% endif %}"{{ memory}}"{% if loop.nextitem is defined %} : {% endif%}{% endfor %}{% if loop.nextitem is defined %} :{% else %};{% endif %}{% endfor %}
 
     localparam MEM_WIDTH = {% for memory, width in width_table %}
       (MEM_TYPE == "{{ memory }}") ? {{ width }} :{% endfor %}