build: add nvboard support to led light

npc/Makefile

@@ -1,31 +1,71 @@
-VSRC := $(wildcard vsrc/*.v)
+NVBOARD_HOME ?= $(abspath ../nvboard)
-CPPSRC := $(addprefix $(PWD)/,$(wildcard csrc/*.cpp))
 PREFIX ?= build
 OBJDIR := $(PREFIX)/obj
+TARGET := $(OBJDIR)/Vexample
+
+VSRC := $(wildcard vsrc/*.v)
+CPPSRCS := $(addprefix $(PWD)/,$(wildcard csrc/*.cpp))
 SUBMAKE := $(OBJDIR)/Vexample.mk
+
 VERILATOR_FLAGS := --cc --exe
+LDFLAGS += $(shell sdl2-config --libs) -lSDL2_image
 
-all: sim
+all: sim-bin nvboard-bin
-
-sim: VERILATOR_FLAGS += --trace
-sim: $(VSRC) $(CPPSRC) $(OBJDIR)/Vexample
-	$(call git_commit, "sim RTL") # DO NOT REMOVE THIS LINE!!!
-	@echo "Running" $(OBJDIR)/Vexample "..."
-	@echo "================================"
-	@$(OBJDIR)/Vexample
 	
 $(OBJDIR)/Vexample: $(SUBMAKE)
 	$(MAKE) -C $(OBJDIR) -f $(notdir $(SUBMAKE)) Vexample
 
-$(SUBMAKE): $(VSRC) $(CPPSRC) $(OBJDIR)
+$(SUBMAKE): $(VSRC) $(CPPSRCS) $(OBJDIR)
-	verilator $(VERILATOR_FLAGS) --Mdir $(PWD)/$(OBJDIR) $(VSRC) $(CPPSRC)
+	verilator $(VERILATOR_FLAGS) $(addprefix -CFLAGS , $(CXXFLAGS)) $(addprefix -LDFLAGS , $(LDFLAGS)) --Mdir $(abspath $(OBJDIR)) $(VSRC) $(CPPSRCS)
 
 $(OBJDIR):
 	mkdir -p $(OBJDIR)
 
-include ../Makefile
+sim-bin: VERILATOR_FLAGS += --trace 
+sim-bin: $(VSRC) $(CPPSRCS) $(OBJDIR)/Vexample
 
-.PHONY: clean 
+SRC_AUTO_BIND := $(abspath $(PREFIX)/auto_bind.cpp)
+NXDC_FILES := $(abspath constr/top.nxdc)
+$(SRC_AUTO_BIND): $(NXDC_FILES)
+	NVBOARD_HOME=$(NVBOARD_HOME) python3 $(NVBOARD_HOME)/scripts/auto_pin_bind.py $< $@
+
+nvboard-bin: OBJDIR := $(PREFIX)/nvobj
+nvboard-bin: SUBMAKE := $(OBJDIR)/Vexample.mk
+# TODO: fix this awkward way to find nvboard.a
+nvboard-bin: CPPSRCS := $(addprefix $(PWD)/,$(wildcard csrc_nvboard/*.cpp)) $(SRC_AUTO_BIND) $(NVBOARD_HOME)/build/nvboard.a
+nvboard-bin: CXXFLAGS += -I$(NVBOARD_HOME)/include $(shell sdl2-config --cflags) -g
+
+nvboard-bin: $(VSRC) $(CPPSRCS) $(SUBMAKE) $(SRC_AUTO_BIND) $(OBJDIR)/Vexample 
+
+
+ifneq (,$(wildcard ../Makefile))
+include ../Makefile
+else
+define git_commit	# not in ICS subfolder, no tracing
+endef
+endif
+
+git_trace_sim: 
+	$(call git_commit, "sim RTL")
+
+git_trace_nvboard: 
+	$(call git_commit, "nvboard")
+
+.PHONY: clean nvboard sim compile_commands.json 
+
+nvboard: nvboard-bin git_trace_nvboard
+	@NVBOARD_HOME=$(NVBOARD_HOME) $(OBJDIR)/Vexample
+
+sim: sim-bin git_trace_sim
+	@echo "Running" $(OBJDIR)/Vexample "..."
+	@echo "================================"
+	@$(OBJDIR)/Vexample
+
+compile_commands.json: clean
+	bear --output nvboard.json -- $(MAKE) nvboard-bin
+	bear --output all.json -- $(MAKE) sim-bin
+	jq -s ".[0] + .[1]"  all.json nvboard.json > compile_commands.json
+	$(RM) all.json nvboard.json
 
 clean: 
-	$(RM) -r $(OBJDIR)
+	$(RM) -r $(PREFIX)

npc/csrc/main.cpp

@@ -3,9 +3,9 @@
 #include <cstdlib>
 #include <verilated.h>
 #include <verilated_vcd_c.h>
-#include "Vexample.h"
+#include <Vexample.h>
 
-#define MAX_SIM_TIME 100
+const int MAX_SIM_TIME=100;
 
 int main(int argc, char **argv, char **env) {
     int sim_time = 0;
@@ -14,19 +14,23 @@ int main(int argc, char **argv, char **env) {
 
     Verilated::traceEverOn(true);
     VerilatedVcdC *m_trace = new VerilatedVcdC; 
+#ifdef VERILATOR_TRACE
     top->trace(m_trace, 5);
     m_trace->open("waveform.vcd");
+#endif
     for (sim_time = 0; sim_time < MAX_SIM_TIME; sim_time++) {
-        int a = rand() & 1;
+        CData sw = rand() & 0b11;
-        int b = rand() & 1;
+        top->sw = sw;
-        top->a = a;
-        top->b = b;
         top->eval();
-        printf("a = %d, b = %d, f = %d\n", a, b, top->f);
+        printf("sw0 = %d, sw1 = %d, ledr = %d\n", sw & 0b1, sw >> 1, top->ledr);
-        assert(top->f == (a ^ b));
+        assert(top->ledr == ((sw >> 1) ^ (sw & 0b1)) );
+#ifdef VERILATOR_TRACE
         m_trace->dump(sim_time);
+#endif
     }
+#ifdef VERILATOR_TRACE
     m_trace->close();
+#endif
     delete top;
     exit(EXIT_SUCCESS);
 }

npc/csrc_nvboard/main.cpp

@@ -0,0 +1,23 @@
+#include <cstdlib>
+#include <cassert>
+#include <cstdlib>
+#include <verilated.h>
+#include <verilated_vcd_c.h>
+#include <Vexample.h>
+#include <nvboard.h>
+
+const int MAX_SIM_TIME=100;
+
+void nvboard_bind_all_pins(Vexample* top);
+
+int main(int argc, char **argv, char **env) {
+    Vexample *top = new Vexample;
+
+    nvboard_bind_all_pins(top);
+    nvboard_init();
+    while (true) {
+        nvboard_update();
+        top->eval();
+    }
+    delete top;
+}

npc/flake.nix

@@ -13,8 +13,22 @@
             verilator
             gtkwave
             gcc
+            gdb
+            jq
             bear
+            clang-tools
+            rnix-lsp
           ];
+
+          nativeBuildInputs = with pkgs; [
+            python3
+          ];
+
+          buildInputs = with pkgs; [
+            SDL2
+            SDL2_image
+          ];
+
           shellHook = ''
             export NEMU_HOME=/home/xin/repo/ysyx-workbench/nemu
           '';

npc/vsrc/example.v

@@ -1,7 +1,6 @@
 module top(
-  input a,
+  input [1:0] sw,
-  input b,
+  output ledr
-  output f
 );
-  assign f = a ^ b;
+  assign ledr = sw[1] ^ sw[0];
 endmodule