move json creation to separate file
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 14 Nov 2021 19:22:58 +0000 (19:22 +0000)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Sun, 14 Nov 2021 19:22:58 +0000 (19:22 +0000)
src/jsoncreate.py [new file with mode: 0644]
src/pinmux_generator.py
src/spec/ls180.py

diff --git a/src/jsoncreate.py b/src/jsoncreate.py
new file mode 100644 (file)
index 0000000..9af2d8e
--- /dev/null
@@ -0,0 +1,307 @@
+from parse import Parse
+from pprint import pprint
+import json
+
+# map pins to litex name conventions, primarily for use in coriolis2
+# yes this is a mess.  it'll do the job though.  improvements later
+def pinparse(psp, pinspec):
+    p = Parse(pinspec, verify=False)
+    pinmap = {}
+    litexmap = {}
+
+    print (p.muxed_cells)
+    print (p.muxed_cells_bank)
+
+    ps = [''] * 32
+    pn = [''] * 32
+    pe = [''] * 32
+    pw = [''] * 32
+    pads = {'N': pn, 'S': ps, 'E': pe, 'W': pw}
+
+    iopads = []
+    domains = {}
+    clocks = {}
+
+    n_intpower = 0
+    n_extpower = 0
+    for (padnum, name, x), bank in zip(p.muxed_cells, p.muxed_cells_bank):
+        orig_name = name
+        litex_name = None
+        domain = None # TODO, get this from the PinSpec.  sigh
+        padnum = int(padnum)
+        start = p.bankstart[bank]
+        banknum = padnum - start
+        print ("bank", bank, banknum, "padname", name, padnum, x)
+        padbank = pads[bank]
+        pad = None
+        # VSS
+        if name.startswith('vss'):
+            name = 'p_%s_' % name[:-2] + name[-1]
+            if 'i' in name:
+                name = 'ground_' + name[-1]
+                name2 = 'vss'
+            else:
+                name = 'ioground_' + name[-1]
+                name2 = 'iovss'
+            pad = [name, name2]
+        # VDD
+        elif name.startswith('vdd'):
+            if 'i' in name:
+                n_intpower += 1
+                name = 'power_' + name[-1]
+                name2 = 'vdd'
+            else:
+                n_extpower += 1
+                name = 'iopower_' + name[-1]
+                name2 = 'iovdd'
+            pad = [name, name2]
+        # SYS
+        elif name.startswith('sys'):
+            domain = 'SYS'
+            if name == 'sys_pllclk':
+                pad = ["p_"+name, name, name]
+            elif name == 'sys_rst':
+                #name = 'p_sys_rst_1'
+                pad = [name, name, name]
+                padbank[banknum] = name
+                print ("sys_rst add", bank, banknum, name)
+                name = None
+            elif name == 'sys_pllclk':
+                name = None # ignore
+            elif name == 'sys_pllvcout':
+                name = 'sys_pll_vco_o'
+                pad = ['p_' + name, name, name, "A"] # A for Analog
+            elif name == 'sys_plltestout':
+                name = 'sys_pll_testout_o'
+                pad = ['p_' + name, name, name]
+            elif name.startswith('sys_pllsel'):
+                i = name[-1]
+                name2 = 'sys_clksel_i(%s)' % i
+                name = 'p_sys_clksel_' + i
+                pad = [name, name2, name2]
+            #if name:
+            #    iopads.append([pname, name, name])
+            print ("sys pad", name)
+        # SPI Card
+        elif name.startswith('mspi0') or name.startswith('mspi1'):
+            domain = 'MSPI'
+            suffix = name[6:]
+            if suffix == 'ck':
+                suffix = 'clk'
+            elif suffix == 'nss':
+                suffix = 'cs_n'
+            if name.startswith('mspi0'):
+                prefix = 'spimaster_'
+            else:
+                prefix = 'spisdcard_'
+            litex_name = name[:6] + suffix
+            name = prefix + suffix
+            pad = ['p_' + name, name, name]
+        # SD/MMC
+        elif name.startswith('sd0'):
+            domain = 'SD'
+            if name.startswith('sd0_d'):
+                i = name[5:]
+                name = 'sdcard_data' + i
+                name2 = 'sdcard_data_%%s(%s)' % i
+                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+            elif name.startswith('sd0_cmd'):
+                name = 'sdcard_cmd'
+                name2 = 'sdcard_cmd_%s'
+                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+            else:
+                name = 'sdcard_' + name[4:]
+                pad = ['p_' + name, name, name]
+            litex_name = orig_name[:4] + "_".join(name.split("_")[1:])
+        # SDRAM
+        elif name.startswith('sdr'):
+            domain = 'SDR'
+            if name == 'sdr_clk':
+                name = 'sdram_clock'
+                pad = ['p_' + name, name, name]
+            elif name.startswith('sdr_ad'):
+                i = name[6:]
+                name = 'sdram_a_' + i
+                name2 = 'sdram_a(%s)' % i
+                pad = ['p_' + name, name2, name2]
+            elif name.startswith('sdr_ba'):
+                i = name[-1]
+                name = 'sdram_ba_' + i
+                name2 = 'sdram_ba(%s)' % i
+                pad = ['p_' + name, name2, name2]
+            elif name.startswith('sdr_dqm'):
+                i = name[-1]
+                name = 'sdram_dm_' + i
+                name2 = 'sdram_dm(%s)' % i
+                pad = ['p_' + name, name2, name2]
+            elif name.startswith('sdr_d'):
+                i = name[5:]
+                name = 'sdram_dq_' + i
+                name2 = 'sdram_dq_%%s(%s)' % i
+                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+            elif name == 'sdr_csn0':
+                name = 'sdram_cs_n'
+                pad = ['p_' + name, name, name]
+            elif name[-1] == 'n':
+                name = 'sdram_' + name[4:-1] + '_n'
+                pad = ['p_' + name, name, name]
+            else:
+                name = 'sdram_' + name[4:]
+                pad = ['p_' + name, name, name]
+            litex_name = orig_name[:4] + "_".join(name.split("_")[1:])
+        # UART
+        elif name.startswith('uart'):
+            domain = 'UART'
+            name = 'uart_' + name[6:]
+            pad = ['p_' + name, name, name]
+        # GPIO
+        elif name.startswith('gpio'):
+            gbank = name[4]
+            domain = 'GPIO'
+            i = name[7:]
+            name = 'gpio_' + i
+            name2 = 'gpio_%%s(%s)' % i
+            pad = ['p_' + name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+            print ("GPIO pad", name, pad)
+            litex_name = "gpio_%s" % gbank + "_".join(name.split("_")[1:])
+        # I2C master-only
+        elif name.startswith('mtwi'):
+            domain = 'MTWI'
+            suffix = name[4:]
+            litex_name = 'mtwi' + suffix
+            name = 'i2c' + suffix
+            if name.startswith('i2c_sda'):
+                name2 = 'i2c_sda_%s'
+                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+                print ("I2C pad", name, pad)
+            else:
+                pad = ['p_' + name, name, name]
+        # I2C bi-directional
+        elif name.startswith('twi'):
+            domain = 'TWI'
+            name = 'i2c' + name[3:]
+            name2 = name + '_%s'
+            pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
+            print ("I2C pad", name, pad)
+        # EINT
+        elif name.startswith('eint'):
+            domain = 'EINT'
+            i = name[-1]
+            name = 'eint_%s' % i
+            name2 = 'eint_%s' % i
+            pad = ['p_' + name, name2, name2]
+        # PWM
+        elif name.startswith('pwm'):
+            domain = 'PWM'
+            name = name[:-4]
+            i = name[3:]
+            name2 = 'pwm(%s)' % i
+            pad = ['p_' + name, name2, name2]
+        else:
+            pad = ['p_' + name, name, name]
+            print ("GPIO pad", name, pad)
+
+        if litex_name is None:
+            litex_name = name
+
+        # JTAG domain
+        if name and name.startswith('jtag'):
+            domain = 'JTAG'
+
+        if name and not name.startswith('p_'):
+            if 'power' not in name and 'ground' not in name:
+                name = 'p_' + name
+        if name is not None:
+            padbank[banknum] = name
+            # create domains
+            if domain is not None:
+                if domain not in domains:
+                    domains[domain] = []
+                domains[domain].append(name)
+                dl = domain.lower()
+                if domain in psp.clocks and orig_name.startswith(dl):
+                    clk = psp.clocks[domain]
+                    if clk.lower() in orig_name: # TODO, might over-match
+                        clocks[domain] = name
+            # record remap
+            pinmap[orig_name] = name
+            litexmap[litex_name] = name
+
+        # add pad to iopads
+        if domain and pad is not None:
+            # append direction from spec/domain.  damn awkward processing
+            # to find it.
+            fn, name = orig_name.split("_")
+            if domain == 'PWM':
+                name = fn[3:]
+            print (psp.byspec)
+            spec = None
+            for k in psp.byspec.keys():
+                if k.startswith(domain):
+                    spec = psp.byspec[k]
+            print ("spec found", domain, spec)
+            assert spec is not None
+            found = None
+            for pname in spec:
+                if pname.lower().startswith(name):
+                    found = pname
+            print ("found spec", found)
+            assert found is not None
+            # whewwww.  add the direction onto the pad spec list
+            dirn = found[-1]
+            if pad[-1] == 'A':
+                pad[-1] += dirn
+            else:
+                pad.append(dirn)
+            iopads.append(pad)
+        elif pad is not None:
+            iopads.append(pad)
+
+    # not connected
+    nc_idx = 0
+    for pl in [pe, pw, pn, ps]:
+        for i in range(len(pl)):
+            if pl[i] == '':
+                name = 'nc_%d' % nc_idx
+                name2 = 'nc(%d)' % nc_idx
+                pl[i] = name
+                pinmap[name] = name
+                iopads.append([name, name2, name2, "-"])
+                nc_idx += 1
+
+    print (p.bankstart)
+    pprint(psp.clocks)
+
+    print()
+    print ("N pads", pn)
+    print ("S pads", ps)
+    print ("E pads", pe)
+    print ("W pads", pw)
+
+    # do not want these
+    del clocks['SYS']
+    del domains['SYS']
+
+    print ("chip domains (excluding sys-default)")
+    pprint(domains)
+    print ("chip clocks (excluding sys-default)")
+    pprint(clocks)
+    print ("pin spec")
+    pprint(psp.byspec)
+
+    chip = {
+             'pads.south'      : ps,
+              'pads.east'       : pe,
+              'pads.north'      : pn,
+              'pads.west'       : pw,
+              'pads.instances' : iopads,
+              'pins.specs' : psp.byspec,
+              'pins.map' : pinmap,
+              'litex.map' : litexmap,
+              'chip.domains' : domains,
+              'chip.clocks' : clocks,
+              'chip.n_intpower': n_intpower,
+              'chip.n_extpower': n_extpower,
+           }
+
+    return pinmap, chip
index febc722132d1b19734993f85a373373e220b84c4..aabfa2de734752da61600f0d086915b3a1b572e3 100644 (file)
@@ -22,7 +22,7 @@ import sys
 import json
 from spec import modules, specgen, dummytest
 from spec.ifaceprint import create_sv, temp_create_sv
-
+import jsoncreate
 
 def printhelp():
     print ('''pinmux_generator.py [-o outputdir] [-v|--validate] [-h|--help]
@@ -98,21 +98,20 @@ if __name__ == '__main__':
                     specgen(of, output_dir, pinout,
                             bankspec, ps.muxwidths, pin_spec, fixedpins,
                             ps.fastbus)
-                if hasattr(module, "pinparse"):
-                    pm, chip = module.pinparse(ps, pinspec)
-                    litexmap = ps.pywrite(pyf, pm)
-                    jchip = json.dumps(chip)
-                    with open("%s/litex_pinpads.json" % pinspec, "w") as f:
-                        f.write(jchip)
-                    # octavius: please keep line-lengths to below 80 chars
-                    # TODO: fix create_sv to allow different packages
-                    # (and die images)
-                    # Test with different package size, once working
-                    # 'create_sv' will be improved
-                    if pinspec == "ngi_router":
-                        temp_create_sv("%s/%s.svg" % (pinspec, pinspec), chip)
-                    else:
-                        create_sv("%s/%s.svg" % (pinspec, pinspec), chip)
+                pm, chip = jsoncreate.pinparse(ps, pinspec)
+                litexmap = ps.pywrite(pyf, pm)
+                jchip = json.dumps(chip)
+                with open("%s/litex_pinpads.json" % pinspec, "w") as f:
+                    f.write(jchip)
+                # octavius: please keep line-lengths to below 80 chars
+                # TODO: fix create_sv to allow different packages
+                # (and die images)
+                # Test with different package size, once working
+                # 'create_sv' will be improved
+                if pinspec == "ngi_router":
+                    temp_create_sv("%s/%s.svg" % (pinspec, pinspec), chip)
+                else:
+                    create_sv("%s/%s.svg" % (pinspec, pinspec), chip)
     else:
         if output_type == 'bsv':
             from bsv.pinmux_generator import pinmuxgen as gentypes
index 35a649d0d45108e53f87cd84fffe42f7fc36d4e5..2454b392cf1dcacad879b5bbd6869e945c92a327 100644 (file)
@@ -3,7 +3,6 @@
 
 from spec.base import PinSpec
 from parse import Parse
-import json
 
 from pprint import pprint
 from spec.ifaceprint import display, display_fns, check_functions
@@ -154,308 +153,3 @@ def pinspec():
                     descriptions)
 
     return ps
-
-
-# map pins to litex name conventions, primarily for use in coriolis2
-# yes this is a mess.  it'll do the job though.  improvements later
-def pinparse(psp, pinspec):
-    p = Parse(pinspec, verify=False)
-    pinmap = {}
-    litexmap = {}
-
-    print (p.muxed_cells)
-    print (p.muxed_cells_bank)
-
-    ps = [''] * 32
-    pn = [''] * 32
-    pe = [''] * 32
-    pw = [''] * 32
-    pads = {'N': pn, 'S': ps, 'E': pe, 'W': pw}
-
-    iopads = []
-    domains = {}
-    clocks = {}
-
-    n_intpower = 0
-    n_extpower = 0
-    for (padnum, name, x), bank in zip(p.muxed_cells, p.muxed_cells_bank):
-        orig_name = name
-        litex_name = None
-        domain = None # TODO, get this from the PinSpec.  sigh
-        padnum = int(padnum)
-        start = p.bankstart[bank]
-        banknum = padnum - start
-        print ("bank", bank, banknum, "padname", name, padnum, x)
-        padbank = pads[bank]
-        pad = None
-        # VSS
-        if name.startswith('vss'):
-            name = 'p_%s_' % name[:-2] + name[-1]
-            if 'i' in name:
-                name = 'ground_' + name[-1]
-                name2 = 'vss'
-            else:
-                name = 'ioground_' + name[-1]
-                name2 = 'iovss'
-            pad = [name, name2]
-        # VDD
-        elif name.startswith('vdd'):
-            if 'i' in name:
-                n_intpower += 1
-                name = 'power_' + name[-1]
-                name2 = 'vdd'
-            else:
-                n_extpower += 1
-                name = 'iopower_' + name[-1]
-                name2 = 'iovdd'
-            pad = [name, name2]
-        # SYS
-        elif name.startswith('sys'):
-            domain = 'SYS'
-            if name == 'sys_pllclk':
-                pad = ["p_"+name, name, name]
-            elif name == 'sys_rst':
-                #name = 'p_sys_rst_1'
-                pad = [name, name, name]
-                padbank[banknum] = name
-                print ("sys_rst add", bank, banknum, name)
-                name = None
-            elif name == 'sys_pllclk':
-                name = None # ignore
-            elif name == 'sys_pllvcout':
-                name = 'sys_pll_vco_o'
-                pad = ['p_' + name, name, name, "A"] # A for Analog
-            elif name == 'sys_plltestout':
-                name = 'sys_pll_testout_o'
-                pad = ['p_' + name, name, name]
-            elif name.startswith('sys_pllsel'):
-                i = name[-1]
-                name2 = 'sys_clksel_i(%s)' % i
-                name = 'p_sys_clksel_' + i
-                pad = [name, name2, name2]
-            #if name:
-            #    iopads.append([pname, name, name])
-            print ("sys pad", name)
-        # SPI Card
-        elif name.startswith('mspi0') or name.startswith('mspi1'):
-            domain = 'MSPI'
-            suffix = name[6:]
-            if suffix == 'ck':
-                suffix = 'clk'
-            elif suffix == 'nss':
-                suffix = 'cs_n'
-            if name.startswith('mspi0'):
-                prefix = 'spimaster_'
-            else:
-                prefix = 'spisdcard_'
-            litex_name = name[:6] + suffix
-            name = prefix + suffix
-            pad = ['p_' + name, name, name]
-        # SD/MMC
-        elif name.startswith('sd0'):
-            domain = 'SD'
-            if name.startswith('sd0_d'):
-                i = name[5:]
-                name = 'sdcard_data' + i
-                name2 = 'sdcard_data_%%s(%s)' % i
-                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-            elif name.startswith('sd0_cmd'):
-                name = 'sdcard_cmd'
-                name2 = 'sdcard_cmd_%s'
-                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-            else:
-                name = 'sdcard_' + name[4:]
-                pad = ['p_' + name, name, name]
-            litex_name = orig_name[:4] + "_".join(name.split("_")[1:])
-        # SDRAM
-        elif name.startswith('sdr'):
-            domain = 'SDR'
-            if name == 'sdr_clk':
-                name = 'sdram_clock'
-                pad = ['p_' + name, name, name]
-            elif name.startswith('sdr_ad'):
-                i = name[6:]
-                name = 'sdram_a_' + i
-                name2 = 'sdram_a(%s)' % i
-                pad = ['p_' + name, name2, name2]
-            elif name.startswith('sdr_ba'):
-                i = name[-1]
-                name = 'sdram_ba_' + i
-                name2 = 'sdram_ba(%s)' % i
-                pad = ['p_' + name, name2, name2]
-            elif name.startswith('sdr_dqm'):
-                i = name[-1]
-                name = 'sdram_dm_' + i
-                name2 = 'sdram_dm(%s)' % i
-                pad = ['p_' + name, name2, name2]
-            elif name.startswith('sdr_d'):
-                i = name[5:]
-                name = 'sdram_dq_' + i
-                name2 = 'sdram_dq_%%s(%s)' % i
-                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-            elif name == 'sdr_csn0':
-                name = 'sdram_cs_n'
-                pad = ['p_' + name, name, name]
-            elif name[-1] == 'n':
-                name = 'sdram_' + name[4:-1] + '_n'
-                pad = ['p_' + name, name, name]
-            else:
-                name = 'sdram_' + name[4:]
-                pad = ['p_' + name, name, name]
-            litex_name = orig_name[:4] + "_".join(name.split("_")[1:])
-        # UART
-        elif name.startswith('uart'):
-            domain = 'UART'
-            name = 'uart_' + name[6:]
-            pad = ['p_' + name, name, name]
-        # GPIO
-        elif name.startswith('gpio'):
-            gbank = name[4]
-            domain = 'GPIO'
-            i = name[7:]
-            name = 'gpio_' + i
-            name2 = 'gpio_%%s(%s)' % i
-            pad = ['p_' + name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-            print ("GPIO pad", name, pad)
-            litex_name = "gpio_%s" % gbank + "_".join(name.split("_")[1:])
-        # I2C master-only
-        elif name.startswith('mtwi'):
-            domain = 'MTWI'
-            suffix = name[4:]
-            litex_name = 'mtwi' + suffix
-            name = 'i2c' + suffix
-            if name.startswith('i2c_sda'):
-                name2 = 'i2c_sda_%s'
-                pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-                print ("I2C pad", name, pad)
-            else:
-                pad = ['p_' + name, name, name]
-        # I2C bi-directional
-        elif name.startswith('twi'):
-            domain = 'TWI'
-            name = 'i2c' + name[3:]
-            name2 = name + '_%s'
-            pad = ['p_'+name, name, name2 % 'o', name2 % 'i', name2 % 'oe']
-            print ("I2C pad", name, pad)
-        # EINT
-        elif name.startswith('eint'):
-            domain = 'EINT'
-            i = name[-1]
-            name = 'eint_%s' % i
-            name2 = 'eint_%s' % i
-            pad = ['p_' + name, name2, name2]
-        # PWM
-        elif name.startswith('pwm'):
-            domain = 'PWM'
-            name = name[:-4]
-            i = name[3:]
-            name2 = 'pwm(%s)' % i
-            pad = ['p_' + name, name2, name2]
-        else:
-            pad = ['p_' + name, name, name]
-            print ("GPIO pad", name, pad)
-
-        if litex_name is None:
-            litex_name = name
-
-        # JTAG domain
-        if name and name.startswith('jtag'):
-            domain = 'JTAG'
-
-        if name and not name.startswith('p_'):
-            if 'power' not in name and 'ground' not in name:
-                name = 'p_' + name
-        if name is not None:
-            padbank[banknum] = name
-            # create domains
-            if domain is not None:
-                if domain not in domains:
-                    domains[domain] = []
-                domains[domain].append(name)
-                dl = domain.lower()
-                if domain in psp.clocks and orig_name.startswith(dl):
-                    clk = psp.clocks[domain]
-                    if clk.lower() in orig_name: # TODO, might over-match
-                        clocks[domain] = name
-            # record remap
-            pinmap[orig_name] = name
-            litexmap[litex_name] = name
-
-        # add pad to iopads
-        if domain and pad is not None:
-            # append direction from spec/domain.  damn awkward processing
-            # to find it.
-            fn, name = orig_name.split("_")
-            if domain == 'PWM':
-                name = fn[3:]
-            print (psp.byspec)
-            spec = None
-            for k in psp.byspec.keys():
-                if k.startswith(domain):
-                    spec = psp.byspec[k]
-            print ("spec found", domain, spec)
-            assert spec is not None
-            found = None
-            for pname in spec:
-                if pname.lower().startswith(name):
-                    found = pname
-            print ("found spec", found)
-            assert found is not None
-            # whewwww.  add the direction onto the pad spec list
-            dirn = found[-1]
-            if pad[-1] == 'A':
-                pad[-1] += dirn
-            else:
-                pad.append(dirn)
-            iopads.append(pad)
-        elif pad is not None:
-            iopads.append(pad)
-
-    # not connected
-    nc_idx = 0
-    for pl in [pe, pw, pn, ps]:
-        for i in range(len(pl)):
-            if pl[i] == '':
-                name = 'nc_%d' % nc_idx
-                name2 = 'nc(%d)' % nc_idx
-                pl[i] = name
-                pinmap[name] = name
-                iopads.append([name, name2, name2, "-"])
-                nc_idx += 1
-
-    print (p.bankstart)
-    pprint(psp.clocks)
-
-    print()
-    print ("N pads", pn)
-    print ("S pads", ps)
-    print ("E pads", pe)
-    print ("W pads", pw)
-
-    # do not want these
-    del clocks['SYS']
-    del domains['SYS']
-
-    print ("chip domains (excluding sys-default)")
-    pprint(domains)
-    print ("chip clocks (excluding sys-default)")
-    pprint(clocks)
-    print ("pin spec")
-    pprint(psp.byspec)
-
-    chip = {
-             'pads.south'      : ps,
-              'pads.east'       : pe,
-              'pads.north'      : pn,
-              'pads.west'       : pw,
-              'pads.instances' : iopads,
-              'pins.specs' : psp.byspec,
-              'pins.map' : pinmap,
-              'litex.map' : litexmap,
-              'chip.domains' : domains,
-              'chip.clocks' : clocks,
-              'chip.n_intpower': n_intpower,
-              'chip.n_extpower': n_extpower,
-           }
-
-    return pinmap, chip