From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 22 Dec 2020 14:54:36 +0000 (+0000)
Subject: rename to memory from add
X-Git-Tag: ls180-24jan2020~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1af966836af3e4c21fbf212c0d4b91120b0e8184;p=soclayout.git

rename to memory from add
---

diff --git a/experiments12/Makefile b/experiments12/Makefile
index 2343504..acd76db 100755
--- a/experiments12/Makefile
+++ b/experiments12/Makefile
@@ -6,7 +6,7 @@
 
 #           YOSYS_FLATTEN = Yes
                      CHIP = chip
-                     CORE = add
+                     CORE = memory
                    MARGIN = 2
                   BOOMOPT =  # -A
                   BOOGOPT =
@@ -18,14 +18,14 @@
 #                 RM_CHIP = Yes
 
                  NETLISTS = $(shell cat nets.txt)
-#                PATTERNS = add_r
+#                PATTERNS = memory_r
 
 
  include ./mk/design-flow.mk
 
 
-blif:      add.blif
-vst:       add.vst
+blif:      memory.blif
+vst:       memory.vst
 
 lvx:       lvx-chip_cts_r
 druc:      druc-chip_cts_r
@@ -40,4 +40,4 @@ cif:  	   chip_cts_r.cif
 
 
 view:      cgt-chip_cts_r
-sim:       asimut-add_cts_r
+sim:       asimut-memory_cts_r
diff --git a/experiments12/add.py b/experiments12/add.py
deleted file mode 100644
index 68aecc1..0000000
--- a/experiments12/add.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from nmigen import *
-from nmigen.cli import rtlil
-
-
-class ADD(Elaboratable):
-    def __init__(self, width):
-        self.a   = Signal(width)
-        self.b   = Signal(width)
-        self.f   = Signal(width)
-
-    def elaborate(self, platform):
-        m = Module()
-        m.d.sync += self.f.eq(self.a + self.b)
-        return m
-
-
-def create_ilang(dut, ports, test_name):
-    vl = rtlil.convert(dut, name=test_name, ports=ports)
-    with open("%s.il" % test_name, "w") as f:
-        f.write(vl)
-
-if __name__ == "__main__":
-    alu = ADD(width=4)
-    create_ilang(alu, [alu.a, alu.b, alu.f], "add")
diff --git a/experiments12/memory.py b/experiments12/memory.py
new file mode 100644
index 0000000..84fcdcf
--- /dev/null
+++ b/experiments12/memory.py
@@ -0,0 +1,30 @@
+from nmigen import *
+from nmigen.cli import rtlil
+
+
+class ADD(Elaboratable):
+    def __init__(self, width):
+        self.a   = Signal(width)
+        self.b   = Signal(width)
+        self.f   = Signal(width)
+
+    def elaborate(self, platform):
+        m = Module()
+        m.d.sync += self.f.eq(self.a + self.b)
+        #a = Signal(9)
+        #q = Signal(64)
+        #d = Signal(64)
+        #we = Signal(8)
+        #sram = Instance("SPBlock_512W64B8W", i_a=a, o_q=q, i_d=d, i_we=we)
+        #m.submodules += sram
+        return m
+
+
+def create_ilang(dut, ports, test_name):
+    vl = rtlil.convert(dut, name=test_name, ports=ports)
+    with open("%s.il" % test_name, "w") as f:
+        f.write(vl)
+
+if __name__ == "__main__":
+    alu = ADD(width=4)
+    create_ilang(alu, [alu.a, alu.b, alu.f], "memory")
diff --git a/experiments12/nets.txt b/experiments12/nets.txt
index 76d4bb8..2142c3a 100644
--- a/experiments12/nets.txt
+++ b/experiments12/nets.txt
@@ -1 +1 @@
-add
+memory