Merge pull request #101 from yrabbit/gwalu

Fix the ALU unpack
YosysHQ · Apr 3, 2022 · 5b93c76 · 5b93c76
2 parents 43e6e2b + 8add147
commit 5b93c76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/apycula/chipdb.py b/apycula/chipdb.py
@@ -201,6 +201,7 @@ def fse_luts(fse, ttyp):
             # ADDSUB INIT="0110 0000 1001 1010"
             #              add   0   sub  carry
             add_alu_mode(mode, bel.modes, lut, "2",     "0110000010011010")
+            add_alu_mode(mode, bel.modes, lut, "hadder", "1111000000000000")
             # NE     INIT="1001 0000 1001 1111"
             #              add   0   sub  carry
             add_alu_mode(mode, bel.modes, lut, "3",     "1001000010011111")
@@ -283,7 +284,7 @@ def fse_osc(device, fse, ttyp):
 
     if device == 'GW1NS-2':
         bel.portmap['OSCEN'] = "B3"
-    elif device == 'GW1NS-4':   
+    elif device == 'GW1NS-4':
         bel.portmap['OSCEN'] = "D6"
     elif device == 'GW1NZ-1':
         bel.portmap['OSCEN'] = "A6"

diff --git a/apycula/gowin_unpack.py b/apycula/gowin_unpack.py
@@ -300,6 +300,8 @@ def tile2verilog(dbrow, dbcol, bels, pips, clock_pips, mod, cst, db):
             kind, = flags # ALU only have one flag
             idx = int(idx)
             name = f"R{row}C{col}_ALU_{idx}"
+            if kind == 'hadder':
+                kind = '0'
             if kind in "012346789": # main ALU
                 alu = codegen.Primitive("ALU", name)
                 alu.params["ALU_MODE"] = kind
@@ -457,7 +459,7 @@ def main():
     parser.add_argument('-d', '--device', required=True)
     parser.add_argument('-o', '--output', default='unpack.v')
     parser.add_argument('-s', '--cst', default=None)
-    parser.add_argument('--noalu', action = 'store_false')
+    parser.add_argument('--noalu', action = 'store_true')
 
     args = parser.parse_args()