From e44f6b083b903493e886ef94b9b8edf8ce9b456f Mon Sep 17 00:00:00 2001
From: Yehowshua Immanuel <yehowshua@scaledintelligence.com>
Date: Wed, 20 Mar 2024 02:25:31 -0400
Subject: [PATCH] it's been a while

---
 .DS_Store                                     | Bin 0 -> 8196 bytes
 .gitignore                                    |  17 +++++++++++++++++
 Makefile                                      |   4 ++--
 README.md                                     |  18 ++++++++++++++++--
 experiments/.DS_Store                         | Bin 0 -> 6148 bytes
 experiments/bram/.DS_Store                    | Bin 0 -> 6148 bytes
 .../bram}/Testbench.bsv                       |   0
 {bram_tests => experiments/bram}/bram2.txt    |   0
 experiments/bram/sim_inspect.tcl              |  14 ++++++++++++++
 shell.nix                                     |  14 ++++++++++++++
 sim_inspect.tcl                               |  15 +++++++++++++++
 11 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 experiments/.DS_Store
 create mode 100644 experiments/bram/.DS_Store
 rename {bram_tests => experiments/bram}/Testbench.bsv (100%)
 rename {bram_tests => experiments/bram}/bram2.txt (100%)
 create mode 100644 experiments/bram/sim_inspect.tcl
 create mode 100644 shell.nix
 create mode 100644 sim_inspect.tcl

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..72a088143423ac2578fb9196b119603dcd100a6d
GIT binary patch
literal 8196
zcmeHM&1(}u6o1pkW@8W{wAh|p5ib&I`e9NLB&Jaiyx0U4YDu%rnl5g3V?G)o6m#*Q
z;z8&i;oXBGdhj5kHxGL8>d~8c_svI>nN8N-qUa3Fyve-x_WkBJUppHBAh~vB0bmvY
z49rv};#iDGR8R9znh-6gP!jY9x4KZ+@@w@WOWmLu&<tn>Gy|Fe&A{Kn0G`=286oFB
z*XmL;pc(it8KC=viJ8i*kUcKh)`11P0-%gwGfP-c&<aXZ$gGe(E>VMta95Pvm53__
z;qKUO3cIY3JubOB5OMh+A~F#-6vCq8^G#+BB+I2PH3OP~VFu{kJp%Jk1qWK{{r%^<
ztgHF?yyf~9wizF5r$2qL-d$AnmEY>?+tRmzDf9%0V%!~Q!WQ^Y0b7k8Ssk{JG0e?9
z-Mdy|7y{3!`2!^3Rtg@z=|sRn9CdK4PO~oh`qHYqPP3IteIXN*kwa5aBWlErjl#Cy
zDYVM1b~9IQtkYjb-*>J3dfB?}*qu^hde!$@WyiA{%)zPHXmaa@<5m1l&To5_Ci5+D
zg%LAirNnHvyPQcU&E>P1-K5z)m&qi}^kQarH)hP7Jac}nbjPiE{v*a95V0M?5&pYh
zKE_(VKPt0Fi?UAU^vSmeEB$d5T*z#W(yKh06hJ@jPNCtszE{OIiZhD*wsD@h$Z`pG
z6jY>6=S09l#`XqgzAxBfyp`w32*a%uoD=Mnh=UFHaJ+43AgUTl4_eSva3Ls6A(k?}
zy&unBU;fPSg<22h<-yhpUXEfC*GdDnRD8!{s1zC*&xPXG6IaR%PhUHTKde>bZPJLs
zFEEOSaSUDLZ3)qo;5PDCg|f6_UW|Rk9P4(|OR1!}vceY3B374|(t!o@koE}YVc3G9
z3u<K7RJu3rhS|yF&riRNzv3I@$Y;t^_8?nzVA!|Sk<SbaQyjNeKCxZgUaL4%Yfyx%
zYH#k}#NLEh%Kdr&e0qQJg<20L*TL3GpGXQp=rn!?CV9wNdjG!^{{4Uaz;r~-fM#H9
z43J2^kk4Vb{j)I`nclTc%$t~LqINwlnF|)|I*yWE$5HnGFvPlvrqm}ZWRFX1!Sts-
Y1O#80_4!X<%%wL4eg3og`L7ng01ZOpM*si-

literal 0
HcmV?d00001

diff --git a/.gitignore b/.gitignore
index fc6396a..8c3232b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,19 @@
 *.vcd
 *.so
+
+# bluespec files
+*.bo
+*.ba
+
+# files generated from building/simulating core
+compile.log
+build_v
+verilog_RTL
+
+# generated experiment outputs
+experiments/bram/*.cxx
+experiments/bram/*.h
+experiments/bram/simBRAM
+
+*.o
+.vscode
\ No newline at end of file
diff --git a/Makefile b/Makefile
index fedfcc1..a58066c 100644
--- a/Makefile
+++ b/Makefile
@@ -140,9 +140,9 @@ v_compile:
 	@echo Compiling for Verilog finished
 
 .PHONY: v_link
-v_link:
+v_link: $(BDPI_OBJ)
 	@echo Linking for Verilog sim ...
-	bsc -e $(TOPMODULE) -verilog -o ./$(V_SIM_EXE) $(V_DIRS) -vsim $(V_SIM)  verilog_RTL/$(TOPMODULE).v
+	bsc -e $(TOPMODULE) -verilog -o ./$(V_SIM_EXE) $(V_DIRS) -vsim $(V_SIM)  verilog_RTL/$(TOPMODULE).v 
 	@echo Linking for Verilog sim finished
 
 .PHONY: v_sim
diff --git a/README.md b/README.md
index 894d153..856b113 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,18 @@ Just as "man does not live by bread alone, but by every word that proceeds from
 ``TOPMODULE=mkTop make v_compile`` to generate verilog. The generated verilog can
 be found in the ``verilog_RTL/`` folder.
 
+# Status
+Admittedly, not very far. Perhaps one could say we've got the beginnings 
+of what would make for LED and UART controllers.
+
 # Dependencies
-You'll need to install:
+## Linux
+Running `nix-shell` should *just work* on Linux. To be fair, haven't
+tested this yet.
+
+## MacOS
+Upstream nix recipes need to be adjusted a bit to work on MacOS, so
+for now do:
 1. [Yosys](https://github.com/YosysHQ/yosys) at git commit: 7ce5011c24b
 2. [nextpnr-0.4-36-gc8406b71](https://github.com/YosysHQ/nextpnr)
 3. [PrjTrellis](https://github.com/YosysHQ/prjtrellis) at git commit: 1.2.1-22-g35f5aff
@@ -26,16 +36,20 @@ screen /dev/tty.usbserial-K00027 9600
 ```
 
 # Simulation
+## Main Chip Core
 TODO
 
-# Generating Verilog
+## Experiments
+See experiments README.
 
+# Generating Verilog
 ```bash
 TOPMODULE=mkTop make v_compile
 ```
 
 # TODO
  - [ ] debug UART accuracy
+       - clk divider should be frequency matched
 
 # Notable Reference Files
 ``/Users/yehowshuaimmanuel/git/bsc/testsuite/bsc.bsv_examples/cpu/FiveStageCPUQ3sol.bsv``
\ No newline at end of file
diff --git a/experiments/.DS_Store b/experiments/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e78d1ef8930693d1b2ac6341afc79fc803f3788b
GIT binary patch
literal 6148
zcmeHKPfy!06t_#)IzmW2fW&T=xK<(^Y^dTAvhI!+1d|3T38^3>iL10-4^^eyx9_me
zu@Ask*r(yZd$wD(>fnef^q%zmv)>=v`6aUR7-QTY#Vy7fj4=U<SaG2FkDwoQMJm=(
z1LQbIG#>P$R7EiUyAn-?bz}hFU6n<wU?IyE-(S>Elflq+|MAL3^<Awl>S9w|1$Sy3
z48!4Q;D^O`9GxkZMzekxohQ9<x3T?M<-;(^dxcI&;vR%tUL<*}#=aWm@j&MW#vvTx
zbQ|v{lUB=ZH|3H0aoUuV_6N5q4-Y;~r;ga!+dux=y-%}T{W2_a_~5i`S)9Rd=*%A|
zy=?_ID(h=!{m-{WU#2=8`>~4a#~(*$*~7`QKYr2Qzgw7FoZ=Gmb$<p$o~ry7Y_ol$
zpM)4728e+*VZa_uVslOQL)#z*h=KKC0M7>ris)G^4eFx<8eIYaR>7<V`dCX~j<o1m
zEDeGOgqu`Alge$0!A&~YrH%6}mIh5a<F@$Vc4clW6s}i?`K1nL+%rfmF+dC~Gq7QX
z4ZQ!qJYWAWC((!)AO_wP1H9S^IzBv-y<1lv4)0nCdJT$#aizg|3Uu^U46%3>?}BOp
YyTlHlXR$O077+Ro&@@m(47@4>Po4y3J^%m!

literal 0
HcmV?d00001

diff --git a/experiments/bram/.DS_Store b/experiments/bram/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/bram_tests/Testbench.bsv b/experiments/bram/Testbench.bsv
similarity index 100%
rename from bram_tests/Testbench.bsv
rename to experiments/bram/Testbench.bsv
diff --git a/bram_tests/bram2.txt b/experiments/bram/bram2.txt
similarity index 100%
rename from bram_tests/bram2.txt
rename to experiments/bram/bram2.txt
diff --git a/experiments/bram/sim_inspect.tcl b/experiments/bram/sim_inspect.tcl
new file mode 100644
index 0000000..e691f96
--- /dev/null
+++ b/experiments/bram/sim_inspect.tcl
@@ -0,0 +1,14 @@
+# bluetcl sim_inspect.tcl
+namespace import ::Bluetcl::*
+package require Bluesim
+
+sim load simBRAM.so mkTestbench
+set count_hdl [sim lookup count]
+set bram [sim lookup dut1_memory]
+
+sim step
+sim step
+sim step
+
+puts "Value of count: [sim get $count_hdl]"
+puts "Value of bram\[0:3\]: [sim getrange $bram 0 3]"
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..328453b
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,14 @@
+{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/d34a98666913267786d9ab4aa803a1fc75f81f4d.tar.gz") {} }:
+
+pkgs.mkShell {
+  buildInputs = [
+    pkgs.yosys
+    pkgs.nextpnr
+    pkgs.bluespec
+    pkgs.yosys-bluespec
+  ];
+
+  shellHook = ''
+    echo "Dev environment for Manna Chip."
+  '';
+}
\ No newline at end of file
diff --git a/sim_inspect.tcl b/sim_inspect.tcl
new file mode 100644
index 0000000..a4e560f
--- /dev/null
+++ b/sim_inspect.tcl
@@ -0,0 +1,15 @@
+# bluetcl sim_inspect.tcl
+namespace import ::Bluetcl::*
+package require Bluesim
+
+cd bram_tests
+sim load simBRAM.so mkTestbench
+set count_hdl [sim lookup count]
+set bram [sim lookup dut1_memory]
+
+sim step
+sim step
+sim step
+
+puts "Value of count: [sim get $count_hdl]"
+puts "Value of bram\[0:3\]: [sim getrange $bram 0 3]"
\ No newline at end of file