From 2763b403f19df47a1b9d6a351ad99c8ae6207d65 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 4 Jun 2019 08:37:52 +0000
Subject: [PATCH] build.res: simplify emission of port constraints on
 individual bits.

---
 nmigen/build/res.py                 |  8 ++++++++
 nmigen/vendor/fpga/lattice_ice40.py | 15 +++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/nmigen/build/res.py b/nmigen/build/res.py
index 0b32ded..bc388be 100644
--- a/nmigen/build/res.py
+++ b/nmigen/build/res.py
@@ -183,6 +183,14 @@ class ConstraintManager:
             else:
                 assert False
 
+    def iter_port_constraints_bits(self):
+        for port_name, pin_names, extras in self.iter_port_constraints():
+            if len(pin_names) == 1:
+                yield port_name, pin_names[0], extras
+            else:
+                for bit, pin_name in enumerate(pin_names):
+                    yield "{}[{}]".format(port_name, bit), pin_name, extras
+
     def iter_clock_constraints(self):
         for name, number in self.clocks.keys() & self._requested.keys():
             resource = self.resources[name, number]
diff --git a/nmigen/vendor/fpga/lattice_ice40.py b/nmigen/vendor/fpga/lattice_ice40.py
index 8dc2d2b..8434fc8 100644
--- a/nmigen/vendor/fpga/lattice_ice40.py
+++ b/nmigen/vendor/fpga/lattice_ice40.py
@@ -24,8 +24,9 @@ class LatticeICE40Platform(TemplatedPlatform):
         * ``synth_opts``: adds options for ``synth_ice40`` Yosys command.
         * ``script_after_read``: inserts commands after ``read_ilang`` in Yosys script.
         * ``script_after_synth``: inserts commands after ``synth_ice40`` in Yosys script.
-        * ``yosys_opts``: overrides default options (``-q``) for Yosys.
-        * ``nextpnr_opts``: overrides default options (``-q --placer heap``).
+        * ``yosys_opts``: adds extra options for Yosys.
+        * ``nextpnr_opts``: adds extra and overrides default options (``--placer heap``)
+          for nextpnr.
 
     Build products:
         * ``{{name}}.rpt``: Yosys log.
@@ -61,14 +62,8 @@ class LatticeICE40Platform(TemplatedPlatform):
         """,
         "{{name}}.pcf": r"""
             # {{autogenerated}}
-            {% for port, pins, extra in platform.iter_port_constraints() %}
-                {% if pins|count > 1 %}
-                    {% for bit in range -%}
-                        set_io {{port}}[{{bit}}] {{pins[bit]}}
-                    {% endfor %}
-                {% else -%}
-                    set_io {{port}} {{pins[0]}}
-                {% endif %}
+            {% for port_name, pin_name, extras in platform.iter_port_constraints_bits() -%}
+                set_io {{port_name}} {{pin_name}}
             {% endfor %}
         """,
         "{{name}}_pre_pack.py": r"""
-- 
2.30.2