whitequark · Dec 18, 2018
diff --git a/software/glasgow/access/__init__.py b/software/glasgow/access/__init__.py
@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from migen import *
+from nmigen.compat import *
 
 from ..gateware.pads import Pads
 

diff --git a/software/glasgow/access/direct/multiplexer.py b/software/glasgow/access/direct/multiplexer.py
@@ -1,5 +1,5 @@
 import logging
-from migen import *
+from nmigen.compat import *
 
 from .. import AccessMultiplexer, AccessMultiplexerInterface
 

diff --git a/software/glasgow/access/simulation/demultiplexer.py b/software/glasgow/access/simulation/demultiplexer.py
@@ -1,5 +1,5 @@
 import asyncio
-from migen import *
+from nmigen.compat import *
 
 from ...support.logging import *
 from .. import AccessDemultiplexer, AccessDemultiplexerInterface

diff --git a/software/glasgow/access/simulation/multiplexer.py b/software/glasgow/access/simulation/multiplexer.py
@@ -1,5 +1,5 @@
-from migen import *
-from migen.genlib.fifo import _FIFOInterface, AsyncFIFO, SyncFIFOBuffered
+from nmigen.compat import *
+from nmigen.compat.genlib.fifo import _FIFOInterface, AsyncFIFO, SyncFIFOBuffered
 
 from .. import AccessMultiplexer, AccessMultiplexerInterface
 from ...gateware.fx2 import _FIFOWithFlush

diff --git a/software/glasgow/applet/__init__.py b/software/glasgow/applet/__init__.py
@@ -75,7 +75,7 @@ async def run(self, args):
 import threading
 import inspect
 import json
-from migen.sim import *
+from nmigen.compat.sim import *
 
 from ..access.simulation import *
 from ..access.direct import *

diff --git a/software/glasgow/applet/benchmark/__init__.py b/software/glasgow/applet/benchmark/__init__.py
@@ -2,7 +2,7 @@
 import asyncio
 import struct
 import time
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ...gateware.lfsr import *

diff --git a/software/glasgow/applet/hd44780/__init__.py b/software/glasgow/applet/hd44780/__init__.py
@@ -9,8 +9,8 @@
 import math
 import argparse
 import logging
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 from .. import *
 

diff --git a/software/glasgow/applet/i2c_master/__init__.py b/software/glasgow/applet/i2c_master/__init__.py
@@ -1,7 +1,7 @@
 import argparse
 import logging
 import math
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ...support.pyrepl import *

diff --git a/software/glasgow/applet/jtag/__init__.py b/software/glasgow/applet/jtag/__init__.py
@@ -2,8 +2,8 @@
 import logging
 import asyncio
 from bitarray import bitarray
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 from .. import *
 from ...support.pyrepl import *

diff --git a/software/glasgow/applet/jtag_pinout/__init__.py b/software/glasgow/applet/jtag_pinout/__init__.py
@@ -2,8 +2,8 @@
 import asyncio
 import random
 from functools import reduce
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 from .. import *
 from ...gateware.pads import *

diff --git a/software/glasgow/applet/nand_flash/__init__.py b/software/glasgow/applet/nand_flash/__init__.py
@@ -2,8 +2,8 @@
 import logging
 import asyncio
 import struct
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 from .. import *
 from ...database.jedec import *

diff --git a/software/glasgow/applet/program_ice40/__init__.py b/software/glasgow/applet/program_ice40/__init__.py
@@ -1,7 +1,7 @@
 import math
 import argparse
 import logging
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 

diff --git a/software/glasgow/applet/rgb_grabber/__init__.py b/software/glasgow/applet/rgb_grabber/__init__.py
@@ -1,7 +1,7 @@
 import logging
 import math
-from migen import *
-from migen.genlib.cdc import *
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import *
 
 from .. import *
 

diff --git a/software/glasgow/applet/selftest/__init__.py b/software/glasgow/applet/selftest/__init__.py
@@ -1,6 +1,6 @@
 import logging
 import asyncio
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 

diff --git a/software/glasgow/applet/shugart_floppy/__init__.py b/software/glasgow/applet/shugart_floppy/__init__.py
@@ -299,8 +299,8 @@
 import itertools
 import crcmod
 import math
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 from .. import *
 from ...gateware.pads import *

diff --git a/software/glasgow/applet/spi_flash_avr/__init__.py b/software/glasgow/applet/spi_flash_avr/__init__.py
@@ -5,7 +5,7 @@
 import asyncio
 import argparse
 import collections
-from migen import *
+from nmigen.compat import *
 from fx2.format import autodetect, input_data, output_data
 
 from .. import *

diff --git a/software/glasgow/applet/spi_master/__init__.py b/software/glasgow/applet/spi_master/__init__.py
@@ -2,8 +2,8 @@
 import logging
 import asyncio
 import math
-from migen import *
-from migen.genlib.cdc import *
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import *
 
 from .. import *
 

diff --git a/software/glasgow/applet/swd/__init__.py b/software/glasgow/applet/swd/__init__.py
@@ -4,7 +4,7 @@
 import asyncio
 import struct
 import math
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ...gateware.pads import *

diff --git a/software/glasgow/applet/uart/__init__.py b/software/glasgow/applet/uart/__init__.py
@@ -2,7 +2,7 @@
 import sys
 import logging
 import asyncio
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ...gateware.pads import *

diff --git a/software/glasgow/applet/vga_output/__init__.py b/software/glasgow/applet/vga_output/__init__.py
@@ -1,5 +1,5 @@
 import logging
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ...gateware.pads import *

diff --git a/software/glasgow/applet/vga_terminal/__init__.py b/software/glasgow/applet/vga_terminal/__init__.py
@@ -2,7 +2,7 @@
 import asyncio
 import logging
 import argparse
-from migen import *
+from nmigen.compat import *
 
 from .. import *
 from ..vga_output import VGAOutputApplet

diff --git a/software/glasgow/applet/vga_terminal/cpu.py b/software/glasgow/applet/vga_terminal/cpu.py
@@ -33,7 +33,7 @@
 #   * JN   off       ≡  if(A < 0) PC ← PC + signext(off)
 #   * HLT            ≡  halt
 
-from migen import *
+from nmigen.compat import *
 
 
 __all__ = [

diff --git a/software/glasgow/gateware/__init__.py b/software/glasgow/gateware/__init__.py
@@ -1,5 +1,9 @@
 import functools
-from migen import *
+import os
+if os.getenv("NMIGEN"):
+    from nmigen.compat import run_simulation
+else:
+    from nmigen.compat import run_simulation
 
 
 __all__ = ["GatewareBuildError", "simulation_test"]

diff --git a/software/glasgow/gateware/analyzer.py b/software/glasgow/gateware/analyzer.py
@@ -1,8 +1,8 @@
 from functools import reduce
 from collections import OrderedDict
-from migen import *
-from migen.genlib.fifo import _FIFOInterface, SyncFIFOBuffered
-from migen.genlib.coding import PriorityEncoder, PriorityDecoder
+from nmigen.compat import *
+from nmigen.compat.genlib.fifo import _FIFOInterface, SyncFIFOBuffered
+from nmigen.compat.genlib.coding import PriorityEncoder, PriorityDecoder
 
 
 __all__ = ["EventSource", "EventAnalyzer", "TraceDecodingError", "TraceDecoder"]
@@ -489,7 +489,6 @@ def is_done(self):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 

diff --git a/software/glasgow/gateware/boneless.py b/software/glasgow/gateware/boneless.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 from ..arch.boneless.opcode import *
 
@@ -785,7 +785,7 @@ def test_JSLE(self, tb):
 # -------------------------------------------------------------------------------------------------
 
 import argparse
-from migen.fhdl import verilog
+from nmigen.compat.fhdl import verilog
 
 
 class BonelessTestbench(Module):

diff --git a/software/glasgow/gateware/fx2.py b/software/glasgow/gateware/fx2.py
@@ -23,10 +23,10 @@
 # FIFOADR->FLAG                 10.7
 # FIFOADR->FIFODATA             14.3
 
-from migen import *
-from migen.genlib.cdc import MultiReg
-from migen.genlib.fifo import _FIFOInterface, AsyncFIFO, SyncFIFO, SyncFIFOBuffered
-from migen.genlib.resetsync import AsyncResetSynchronizer
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
+from nmigen.compat.genlib.fifo import _FIFOInterface, AsyncFIFO, SyncFIFO, SyncFIFOBuffered
+from nmigen.compat.genlib.resetsync import AsyncResetSynchronizer
 
 
 __all__ = ["FX2Arbiter"]

diff --git a/software/glasgow/gateware/i2c.py b/software/glasgow/gateware/i2c.py
@@ -1,7 +1,7 @@
 # I2C reference: https://www.nxp.com/docs/en/user-guide/UM10204.pdf
 
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 
 __all__ = ['I2CSlave']
@@ -397,7 +397,6 @@ def __init__(self, pads):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 
@@ -856,8 +855,3 @@ class _DummyPads(Module):
     def __init__(self):
         self.scl_t = TSTriple()
         self.sda_t = TSTriple()
-
-
-if __name__ == "__main__":
-    verilog.convert(I2CMaster(_DummyPads(), 16)).write("i2cmaster.v")
-    verilog.convert(I2CSlave(_DummyPads())).write("i2cslave.v")
diff --git a/software/glasgow/gateware/lfsr.py b/software/glasgow/gateware/lfsr.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 
 __all__ = ["LinearFeedbackShiftRegister"]
@@ -54,7 +54,6 @@ def generate(self):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 

diff --git a/software/glasgow/gateware/mpsse.py b/software/glasgow/gateware/mpsse.py
@@ -2,8 +2,8 @@
 # http://www.ftdichip.com/Support/Documents/AppNotes/AN_135_MPSSE_Basics.pdf
 # http://www.ftdichip.com/Support/Documents/AppNotes/ AN_108_Command_Processor_for_MPSSE_and_MCU_Host_Bus_Emulation_Modes.pdf
 
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 
 __all__ = ['MPSSE']
@@ -427,7 +427,6 @@ def __init__(self, pads):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 
@@ -740,13 +739,3 @@ def test_write_single_byte_clkwrong(self, tb):
         self.assertEqual((yield from tb.recv_tdi(8, pos=False)), 0xA5)
         yield
         self.assertEqual((yield tb.tck.o), 0)
-
-
-if __name__ == "__main__":
-    tck = TSTriple()
-    tdi = TSTriple()
-    tdo = TSTriple()
-    tms = TSTriple()
-    engine = MPSSE([tck, tdi, tdo, tms])
-
-    verilog.convert(engine).write("mpsse.v")
diff --git a/software/glasgow/gateware/pads.py b/software/glasgow/gateware/pads.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 
 __all__ = ['Pads']
@@ -82,7 +82,7 @@ def _add_elem(self, elem, name=None, index=None):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl.specials import Tristate
+from nmigen.compat.fhdl.specials import Tristate
 
 
 class PadsTestCase(unittest.TestCase):

diff --git a/software/glasgow/gateware/platform/lattice.py b/software/glasgow/gateware/platform/lattice.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 from .. import GatewareBuildError
 from ..pll import PLL

diff --git a/software/glasgow/gateware/pll.py b/software/glasgow/gateware/pll.py
@@ -1,5 +1,5 @@
 import logging
-from migen.fhdl.specials import Special
+from nmigen.compat.fhdl.specials import Special
 
 
 __all__ = ["PLL"]

diff --git a/software/glasgow/gateware/registers.py b/software/glasgow/gateware/registers.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 
 __all__ = ["Registers", "I2CRegisters"]
@@ -78,7 +78,6 @@ def do_finalize(self):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 from .i2c import I2CSlaveTestbench
@@ -148,7 +147,3 @@ def test_data_read(self, tb):
         self.assertEqual((yield from tb.i2c.read_octet()), 0b10100101)
         yield from tb.i2c.write_bit(1)
         yield from tb.i2c.stop()
-
-
-if __name__ == "__main__":
-    verilog.convert(I2CSlave(None)).write("registers.v")
diff --git a/software/glasgow/gateware/uart.py b/software/glasgow/gateware/uart.py
@@ -1,5 +1,5 @@
-from migen import *
-from migen.genlib.cdc import MultiReg
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
 
 
 __all__ = ['UART', 'uart_bit_cyc']
@@ -292,7 +292,6 @@ def calc_parity(sig, kind):
 # -------------------------------------------------------------------------------------------------
 
 import unittest
-from migen.fhdl import verilog
 
 from . import simulation_test
 

diff --git a/software/glasgow/platform/__init__.py b/software/glasgow/platform/__init__.py
@@ -1,5 +1,5 @@
-from migen.build.generic_platform import *
-from migen.build.lattice import LatticePlatform
+from nmigen.compat.build.generic_platform import *
+from nmigen.compat.build.lattice import LatticePlatform
 
 from .programmer import GlasgowProgrammer
 

diff --git a/software/glasgow/platform/programmer.py b/software/glasgow/platform/programmer.py
@@ -1,4 +1,4 @@
-from migen.build.generic_programmer import GenericProgrammer
+from nmigen.compat.build.generic_programmer import GenericProgrammer
 from ..device.hardware import GlasgowHardwareDevice
 
 

diff --git a/software/glasgow/target/analyzer.py b/software/glasgow/target/analyzer.py
@@ -1,7 +1,7 @@
 import logging
-from migen import *
-from migen.genlib.cdc import MultiReg
-from migen.genlib.fifo import _FIFOInterface
+from nmigen.compat import *
+from nmigen.compat.genlib.cdc import MultiReg
+from nmigen.compat.genlib.fifo import _FIFOInterface
 
 from ..gateware.analyzer import *
 

diff --git a/software/glasgow/target/hardware.py b/software/glasgow/target/hardware.py
@@ -4,7 +4,7 @@
 import tempfile
 import shutil
 import logging
-from migen import *
+from nmigen.compat import *
 
 from ..gateware.pads import Pads
 from ..gateware.i2c import I2CSlave

diff --git a/software/glasgow/target/simulation.py b/software/glasgow/target/simulation.py
@@ -1,4 +1,4 @@
-from migen import *
+from nmigen.compat import *
 
 from ..gateware.registers import Registers