Update himbaechel examples to support NR aliases

Author: jeremyherbert

apycula/family_aliases.py

@@ -0,0 +1,13 @@
+import importlib.resources
+import json
+
+def replace_family_alias(family):
+    with importlib.resources.path('apycula', f'family_info.json') as path:
+        with open(path, 'r') as f:
+            family_info = json.load(f)
+
+    if family in family_info:
+        return family_info[family]["base_family"]
+    else:
+        return family
+

apycula/gowin_pack.py

@@ -17,6 +17,7 @@
 from apycula import attrids
 from apycula import bslib
 from apycula.wirenames import wirenames, wirenumbers
+from apycula.family_aliases import replace_family_alias
 
 device = ""
 pnr = None
@@ -1029,16 +1030,6 @@ def route(db, tilemap, pips):
         for row, col in bits:
             tile[row][col] = 1
 
-def replace_family_alias(family):
-    with importlib.resources.path('apycula', f'family_info.json') as path:
-        with open(path, 'r') as f:
-            family_info = json.load(f)
-
-    if family in family_info:
-        return family_info[family]["base_family"]
-    else:
-        return family
-
 def header_footer(db, bs, compress, family):
     """
     Generate fs header and footer
@@ -1180,7 +1171,7 @@ def main():
         parser.add_argument('--png')
 
     args = parser.parse_args()
-    device = args.device
+    device = replace_family_alias(args.device)
 
     with open(args.netlist) as f:
         pnr = json.load(f)
@@ -1198,8 +1189,7 @@ def main():
         device = f"GW1N{mods}-{luts}"
         device = replace_family_alias(device)
 
-    family = replace_family_alias(args.device)
-    with importlib.resources.path('apycula', f'{family}.pickle') as path:
+    with importlib.resources.path('apycula', f'{device}.pickle') as path:
         with closing(gzip.open(path, 'rb')) as f:
             db = pickle.load(f)
 

apycula/gowin_unpack.py

@@ -14,6 +14,7 @@
 from apycula import attrids
 from apycula.bslib import read_bitstream
 from apycula.wirenames import wirenames
+from apycula.family_aliases import replace_family_alias
 
 _device = ""
 _pinout = ""
@@ -1074,7 +1075,7 @@ def main():
     args = parser.parse_args()
 
     global _device
-    _device = args.device
+    _device = replace_family_alias(args.device)
     # For tool integration it is allowed to pass a full part number
     m = re.match("GW1N(S?)[A-Z]*-(LV|UV|UX)([0-9])C?([A-Z]{2}[0-9]+P?)(C[0-9]/I[0-9])", _device)
     if m:

examples/himbaechel/Makefile.himbaechel

@@ -141,10 +141,10 @@ clean:
 # ============================================================
 # Tangnano20k
 %-tangnano20k.fs: %-tangnano20k.json
-	gowin_pack -d GW2A-18C -o $@ $<
+	gowin_pack -d GW2AR-18C -o $@ $<
 
 %-tangnano20k.json: %-tangnano20k-synth.json tangnano20k.cst
-	$(NEXTPNR) --json $< --write $@ --device GW2AR-LV18QN88C8/I7 --vopt family=GW2A-18C --vopt cst=tangnano20k.cst
+	$(NEXTPNR) --json $< --write $@ --device GW2AR-LV18QN88C8/I7 --vopt family=GW2AR-18C --vopt cst=tangnano20k.cst
 
 %-tangnano20k-synth.json: %.v
 	$(YOSYS) -D LEDS_NR=6 -D OSC_TYPE_OSC -D INV_BTN=1 -p "read_verilog $^; synth_gowin -json $@"
@@ -223,7 +223,7 @@ blinky-pll-tangnano4k-synth.json: pll/GW1NS-4-dyn.vh blinky-pll-vr.v
 	gowin_pack -d GW1N-9C -o $@ $^
 
 %-tangnano9k.json: %-tangnano9k-synth.json tangnano9k.cst
-	$(NEXTPNR) --json $< --write $@ --device GW1NR-LV9QN88PC6/I5 --vopt family=GW1N-9C --vopt cst=tangnano9k.cst
+	$(NEXTPNR) --json $< --write $@ --device GW1NR-LV9QN88PC6/I5 --vopt family=GW1NR-9C --vopt cst=tangnano9k.cst
 
 %-tangnano9k-synth.json: %.v
 	$(YOSYS) -D LEDS_NR=6 -D OSC_TYPE_OSC -D INV_BTN=0 -p "read_verilog $^; synth_gowin -json $@"
@@ -232,7 +232,7 @@ pll-nanolcd-tangnano9k-synth.json: pll/GW1N-9C-dyn.vh pll-nanolcd/TOP.v pll-nano
 	$(YOSYS) -D INV_BTN=0 -p "read_verilog $^; synth_gowin -json $@"
 
 pll-nanolcd-tangnano9k.fs: pll-nanolcd-tangnano9k.json
-	gowin_pack -d GW1N-9C --sspi_as_gpio --mspi_as_gpio -o $@ $^
+	gowin_pack -d GW1NR-9C --sspi_as_gpio --mspi_as_gpio -o $@ $^
 
 # ============================================================
 # szfpga (GW1N-9)
@@ -288,10 +288,10 @@ blinky-pll-runber-synth.json: pll/GW1N-4-dyn.vh blinky-pll.v
 	gowin_unpack -d GW1NS-4 -o $@ $^
 
 %-tangnano9k-unpacked.v: %-tangnano9k.fs
-	gowin_unpack -d GW1N-9C -o $@ $^
+	gowin_unpack -d GW1NR-9C -o $@ $^
 
 %-tangnano20k-unpacked.v: %-tangnano20k.fs
-	gowin_unpack -d GW2A-18C -o $@ $^
+	gowin_unpack -d GW2AR-18C -o $@ $^
 
 %-runber-unpacked.v: %-runber.fs
 	gowin_unpack -d GW1N-4 -o $@ $^