Merge master and resolve conflicts

sdmurthy · sdmurthy · commit cd7ac1f04fc7 · 2026-04-27T12:35:43.000-07:00
diff --git a/.gitlab/ci/dsp.gitlab-ci.yml b/.gitlab/ci/dsp.gitlab-ci.yml
@@ -52,7 +52,6 @@ cic_simple_s_test:
   extends: .build-matrix
   image: $IMAGE
   before_script:
-    - pip install cocotb
     - cd dsp
   stage: test
   script:
diff --git a/.gitlab/ci/serial_io.gitlab-ci.yml b/.gitlab/ci/serial_io.gitlab-ci.yml
@@ -2,7 +2,6 @@ serial_io_test:
   extends: .build-matrix
   image: $IMAGE
   before_script:
-    - pip install numpy scipy cocotb==1.9.2 pytest cocotb-bus
     - cd serial_io
   stage: test
   script:
diff --git a/Dockerfile.bedrock_testing_base_bookworm b/Dockerfile.bedrock_testing_base_bookworm
@@ -32,6 +32,7 @@ RUN apt-get update && \
     libftdi1-dev \
     libusb-dev \
     openocd \
+    meson \
     pkg-config && \
     rm -rf /var/lib/apt/lists/* && \
     python3 -c "import numpy; print('LRD Test %f' % numpy.pi)" && \
@@ -121,9 +122,7 @@ RUN apt-get update && \
         ninja-build \
         gcc-aarch64-linux-gnu \
         ghdl && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip3 install \
-        meson
+    rm -rf /var/lib/apt/lists/*
 
 COPY build-tools/litex_meta.sh /
 
@@ -137,6 +136,11 @@ RUN mkdir ${LITEX_INSTALL_PATH} && \
 RUN pip3 install \
     leep==1.0.2
 
+# Install cocotb and related packages
+RUN pip3 install \
+    cocotb==2.0.1 \
+    cocotb-bus==0.3.0
+
 # Install sv2v
 RUN apt-get update && \
     apt-get install -y \
diff --git a/Dockerfile.bedrock_testing_base_trixie b/Dockerfile.bedrock_testing_base_trixie
@@ -32,6 +32,7 @@ RUN apt-get update && \
     libftdi1-dev \
     libusb-dev \
     openocd \
+    meson \
     pkg-config && \
     rm -rf /var/lib/apt/lists/* && \
     python3 -c "import numpy; print('LRD Test %f' % numpy.pi)" && \
@@ -121,9 +122,7 @@ RUN apt-get update && \
         ninja-build \
         gcc-aarch64-linux-gnu \
         ghdl && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip3 install \
-        meson
+    rm -rf /var/lib/apt/lists/*
 
 COPY build-tools/litex_meta.sh /
 
@@ -137,6 +136,11 @@ RUN mkdir ${LITEX_INSTALL_PATH} && \
 RUN pip3 install \
     leep==1.0.2
 
+# Install cocotb and related packages
+RUN pip3 install \
+    cocotb==2.0.1 \
+    cocotb-bus==0.3.0
+
 # Install sv2v
 RUN apt-get update && \
     apt-get install -y \
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ Recommended:
 *  Verilator
 *  YoSys
 
-Full list: see [dependencies.txt](dependencies.txt) and [Dockerfile](Dockerfile).
+Full list: see [dependencies.txt](dependencies.txt) and [Dockerfile](Dockerfile.bedrock_testing_base_trixie).
 
 On contributing
 ===============
diff --git a/board_support/zest/llspi_ad9653.py b/board_support/zest/llspi_ad9653.py
@@ -92,7 +92,7 @@ def spi_readn(self, obj_list, addr):
     if leep_addr is None:
         leep_addr = "leep://" + str(ip_addr)
 
-    leep = leep.open(leep_addr, timeout=2.0, instance=[])
+    leep = leep.open(leep_addr, timeout=5.0, instance=[])
     leepll = leep_llspi(leep)  # temporary(?) stand-in for c_zest
     U2_adc_spi = c_llspi_ad9653(2)
 
diff --git a/board_support/zest/zest_setup.py b/board_support/zest/zest_setup.py
@@ -1042,7 +1042,7 @@ def amc7823_print(self, check_channels=[]):
                         help='Run MMCM scan')
     parser.add_argument('--strict', action='store_true', dest='strict', default=False,
                         help='Strict checks on test results')
-    parser.add_argument('-t', '--timeout', type=float, default=0.1,
+    parser.add_argument('-t', '--timeout', type=float, default=5.0,
                         help='LEEP network timeout')
     parser.add_argument('-f', '--ref_freq', dest='ref_freq', default=50., type=float,
                         help='Reference oscillator (in MHz)')
diff --git a/dependencies.txt b/dependencies.txt
@@ -17,17 +17,17 @@ python3-scipy
 python3-matplotlib
 
 =====
-Summary, well tested on Debian Buster and Bullseye:
+Summary, well tested on Debian Bookworm and Trixie:
 
 apt-get install -y build-essential git iverilog gtkwave verilator python3-pip
 apt-get install -y python3-numpy python3-flake8 python3-scipy python3-matplotlib
-pip3 install cocotb
+pip3 install cocotb cocotb-bus
 
 =====
 The setup instructions for bedrock on Fedora should be:
 
 yum install iverilog gtkwave make g++ python3-numpy python3-scipy python3-pip
-pip3 install cocotb
+pip3 install cocotb cocotb-bus
 
 but then we hit a iverilog-vpi configuration bug seemingly caused by RedHat.
 The evasive action I suggest is to build iverilog from source:
diff --git a/projects/common/get_raw_adcs.py b/projects/common/get_raw_adcs.py
@@ -270,7 +270,7 @@ def usage():
                         help='Number of acquisitions')
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', default=False,
                         help='Verbose mode')
-    parser.add_argument('-t', '--timeout', type=float, default=0.1,
+    parser.add_argument('-t', '--timeout', type=float, default=5.0,
                         help='LEEP network timeout')
 
     args = parser.parse_args()
diff --git a/projects/test_marble_family/Makefile b/projects/test_marble_family/Makefile
@@ -7,25 +7,18 @@ UNISIMS_DIR = broken
 APP_NAME = marble
 GTX_TCL :=
 # Select between marblemini, marble, and marble_fiber
+# XXX needs support for marble_fiber
 CONFIG ?= marblemini
 ifeq ($(CONFIG),marblemini)
-  CARRIER       := marble1
   BOARD_DIR     := marblemini
   BOARD_TOP_CSV := marble_mini_top.csv
-  XDC_FILTER    :=
   IP_ADDR       := 192.168.19.31
-  HWLOAD_CMD     = openocd -f serial.cfg -f marble.cfg -c "transport select jtag; init; xc7_program xc7.tap; pld load 0 $(CONFIG).bit; exit"
-  HWTEST_EXTRA   = $(PYTHON) testcase.py -a $(IP_ADDR) --trx --marble 0
 else ifneq (,$(filter marble marble_fiber,$(CONFIG)))
-  CARRIER       := marble2
   BOARD_DIR     := marble
   BOARD_TOP_CSV := marble_top.csv
-  XDC_FILTER    := | sed -e '/FMC._.[AK]_/s/IOSTANDARD LVCMOS25/IOSTANDARD LVCMOS25 PULLTYPE PULLUP/'
   SERIAL        ?= ""
   IP_ADDR       := 192.168.19.$(SERIAL)
   ZEST_SN       ?= "LBNL DIGITIZER V1.0 SN  024"
-  HWLOAD_CMD     = openocd -c "adapter driver ftdi; ftdi_serial 0000$(SERIAL);" -f marble.cfg -c "transport select jtag; init; xc7_program xc7.tap; pld load 0 $(CONFIG).bit; exit"
-  HWTEST_EXTRA   = $(PYTHON) testcase.py -a $(IP_ADDR) --trx --si570 && sn="$$($(PYTHON) zest_sn.py -a $(IP_ADDR) -p 803)" && echo "$$sn" && test "$$sn" = $(ZEST_SN)
   ifeq ($(CONFIG),marble_fiber)
     # XXX missing QSFP tcl
     GTX_TCL     :=
@@ -91,7 +84,7 @@ scalar_marble_regmap.json: lb_marble_slave.v
 marble_regmap.json: static_regmap.json scalar_marble_regmap.json
 	$(PYTHON) $(BUILD_DIR)/merge_json.py -o $@ -i $(filter %.json, $^)
 config_romx.v: marble_regmap.json $(filter-out config_romx.v, $(MARBLE_SYNTH_SOURCE))
-	$(PYTHON) -m leep.build_rom --placeholder_rev -v $@ -j $< -d "Marble Testing"
+	$(PYTHON) -m leep.build_rom --placeholder_rev -v $@ -j $< -d "$(CONFIG) testing"
 
 # gen_features.py rules utilizing $(CONFIG)
 $(APP_NAME)_features: $(BUILD_DIR)/gen_features.py marble_features.yaml
@@ -160,8 +153,12 @@ marble_base_yosys.json: marble_base_shell.v $(MARBLE_BASE_V0)
 pin_map_fmc.csv: pin_map_fmc.py
 	$(PYTHON) $< > $@
 
-$(APP_NAME)_$(CARRIER).xdc: $(BADGER_DIR)/tests/meta-xdc.py $(patsubst %,$(BOARD_SUPPORT_DIR)/$(BOARD_DIR)/%, Marble.xdc pin_map.csv) pin_map_fmc.csv $(BOARD_TOP_CSV)
-	$(PYTHON) $^ $(XDC_FILTER) > $@
+$(CONFIG).xdc: $(BADGER_DIR)/tests/meta-xdc.py $(patsubst %,$(BOARD_SUPPORT_DIR)/$(BOARD_DIR)/%, Marble.xdc pin_map.csv) pin_map_fmc.csv $(BOARD_TOP_CSV)
+ifeq ($(CONFIG),marblemini)
+	$(PYTHON) $^ > $@
+else
+	$(PYTHON) $^ | sed -e '/FMC._.[AK]_/s/IOSTANDARD LVCMOS25/IOSTANDARD LVCMOS25 PULLTYPE PULLUP/' > $@
+endif
 
 # =====
 # Initialization file for i2cbridge
@@ -185,11 +182,11 @@ Vmarble_base: $(MARBLE_BASE_V) fake_xadc.v marble_base_sim.cpp ethernet_model.c
 # bitfile
 MARBLE_SYNTH_SOURCE = marble_top.v tmds_test.v marble/gmii_clock_handle.v $(FPGA_FAMILY_DIR)/xilinx/xilinx7_clocks.v gmii_to_rgmii.v $(MARBLE_BASE_V) read_trx.dat ../../fpga_family/ds_clk_buf.v
 
-$(APP_NAME)_$(CARRIER).d: $(MARBLE_SYNTH_SOURCE) $(APP_NAME)_$(CARRIER).xdc
+$(CONFIG).d: $(MARBLE_SYNTH_SOURCE) $(CONFIG).xdc
 	echo $^ | tr ' ' '\n' > $@
 
-# Target is now $(CONFIG).bit (e.g. marblemini.bit or marble_fiber.bit)
-$(CONFIG).bit: marble.tcl $(APP_NAME)_$(CARRIER).d $(APP_NAME)_features bit_stamp_mod
+# Target is now $(CONFIG).bit (e.g. marblemini.bit or marble.bit)
+$(CONFIG).bit: marble.tcl $(CONFIG).d $(APP_NAME)_features bit_stamp_mod
 	$(SYNTH_VIVADO) $< -tclargs $(filter %.d, $^) $(CONFIG) $(APP_NAME) $(BUILD_DIR)/vivado_tcl/swap_gitid.tcl $(GTX_TCL)
 
 .PHONY: bit
@@ -200,14 +197,23 @@ bit: $(CONFIG).bit
 
 .PHONY: hwload hwtest
 hwload:
-	@echo "Loading $(APP_NAME).bit onto $(CONFIG)..."
-	$(HWLOAD_CMD)
+	@echo "Loading $(CONFIG).bit onto $(CONFIG)..."
+ifeq ($(CONFIG),marblemini)
+	openocd -f serial.cfg -f marble.cfg -c "transport select jtag; init; xc7_program xc7.tap; pld load 0 $(CONFIG).bit; exit"
+else
+	openocd -c "adapter driver ftdi; ftdi_serial 0000$(SERIAL);" -f marble.cfg -c "transport select jtag; init; xc7_program xc7.tap; pld load 0 $(CONFIG).bit; exit"
+endif
 
 hwtest: udprtx
 	ping -c 2 $(IP_ADDR)
 	test $$(PYTHONPATH=../common $(PYTHON) -m leep.cli leep://$(IP_ADDR):803 gitid) = $$(git rev-parse HEAD) && echo "gitid OK"
 	./udprtx $(IP_ADDR) 100000 8  # should take under 3 seconds
-	$(HWTEST_EXTRA)
+ifeq ($(CONFIG),marblemini)
+	$(PYTHON) testcase.py -a $(IP_ADDR) --trx --marble 0
+else
+	$(PYTHON) testcase.py -a $(IP_ADDR) --trx --si570
+	sn="$$($(PYTHON) zest_sn.py -a $(IP_ADDR) -p 803)" && echo "$$sn" && test "$$sn" = $(ZEST_SN)
+endif
 
 dna_tb: dna_tb.v dna.v
 
diff --git a/projects/test_marble_family/badger_stat.py b/projects/test_marble_family/badger_stat.py
@@ -47,7 +47,7 @@ def update(dev):
     print("Packet badger stats from", leep_addr)
 
     try:
-        dev = leep.open(leep_addr)
+        dev = leep.open(leep_addr, timeout=5.0)
     except OSError as err:
         print("Leep initialization error:", err)
         sys.exit(1)
diff --git a/projects/test_marble_family/config_si570.py b/projects/test_marble_family/config_si570.py
@@ -292,7 +292,7 @@ def config_si570(addr, new_freq, verbose=False, debug=False):
     leep_addr = "leep://" + str(args.addr) + str(":") + str(args.port)
     print(leep_addr)
 
-    addr = leep.open(leep_addr, instance=[])
+    addr = leep.open(leep_addr, timeout=5.0, instance=[])
 
     # dev = lbus_access.lbus_access(args.addr, port=args.port, timeout=3.0, allow_burst=False)
 
diff --git a/projects/test_marble_family/ctrace_dump_gps.py b/projects/test_marble_family/ctrace_dump_gps.py
@@ -144,7 +144,7 @@ def usage():
         print("must supply IP address")
         exit(1)
     leep_addr = "leep://" + ip_addr + ":" + str(port)
-    fpga = leep.open(leep_addr)
+    fpga = leep.open(leep_addr, timeout=5.0)
     # signals, tw, tstep should be runtime config
     # this static configuration matches GPS_CTRACE option in lb_marble_slave.v
     signals = ["pps", "uart"]
diff --git a/projects/test_marble_family/i2c/oneshot.py b/projects/test_marble_family/i2c/oneshot.py
@@ -71,7 +71,7 @@ def decode(prog):
 
 def decodeI2CProgram(args):
     """Readout current I2C program and decode"""
-    dev = leep.open(args.dest)
+    dev = leep.open(args.dest, timeout=5.0)
     # Read program memory
     name_sizes = ((I2C_PROG[0], 0x400, I2C_PROG[1]),)  # (name, size, offset)
     prog = dev.reg_read_size(name_sizes)[0]
@@ -189,7 +189,7 @@ def doI2CXact(args):
     if args.dest == "test":
         print("Test done.")
         return 0
-    dev = leep.open(args.dest)
+    dev = leep.open(args.dest, timeout=5.0)
     stop(dev)
     program(dev, prog)
     run(dev)
diff --git a/projects/test_marble_family/i2c_live.py b/projects/test_marble_family/i2c_live.py
@@ -7,7 +7,7 @@
 
 
 class i2c_live:
-    def __init__(self, host, timeout=1.02, port=803,
+    def __init__(self, host, timeout=5.0, port=803,
                  retry=120, sim=False, i2c_base=0x040000,
                  force_burst=False, allow_burst=True):
         self.dev = lbus_access.lbus_access(
diff --git a/projects/test_marble_family/nmea_view.py b/projects/test_marble_family/nmea_view.py
@@ -160,7 +160,7 @@ def live_buffer(leep_dev, old_cnt, verbose=False):
     if not args.test:
         leep_addr = "leep://" + args.addr + ":" + str(args.port)
         try:
-            leep_dev = leep.open(leep_addr)
+            leep_dev = leep.open(leep_addr, timeout=5.0)
         except OSError as err:
             print("Leep initialization error:", err)
             sys.exit(1)
diff --git a/projects/test_marble_family/zest_auto_sn.py b/projects/test_marble_family/zest_auto_sn.py
@@ -87,7 +87,7 @@ def get_qrcode(results):
         exit(0)
     leep_addr = "leep://" + args.addr + ":" + str(args.port)
     # print(leep_addr)
-    dev = leep.open(leep_addr)
+    dev = leep.open(leep_addr, timeout=5.0)
     if args.write:
         old_sn = run_eeprom(dev, ss)
         print("Previous SN : %s" % old_sn)
diff --git a/projects/test_marble_family/zest_sn.py b/projects/test_marble_family/zest_sn.py
@@ -97,7 +97,7 @@ def run_eeprom(dev, new_sn, verbose=False, debug=False):
     # dev = lbus_access.lbus_access(args.addr, port=args.port, timeout=3.0, allow_burst=False)
     leep_addr = "leep://" + args.addr + ":" + str(args.port)
     # print(leep_addr)
-    dev = leep.open(leep_addr)
+    dev = leep.open(leep_addr, timeout=5.0)
 
     sn = run_eeprom(dev, args.new_sn, verbose=args.verbose, debug=args.debug)
     print(sn)
diff --git a/selftest.sh b/selftest.sh
@@ -4,42 +4,54 @@
 # Running this script is possibly easier than fussing with Docker,
 # and definitely gives more test coverage than typing "make" in whatever
 # directory you're developing in.  Measured execution time is about
-# three minutes on decent hardware (Ryzen 5 PRO 5650GE).
+# four minutes on decent hardware (Ryzen 5 PRO 5650GE).
 
 # Can be run as an unprivileged user on a pretty basic Debian Bookworm
-# system, or other recent-enough Linux distributions.
+# or Trixie system, or other recent-enough Linux distributions.
 # apt-get install -y build-essential git iverilog tcl flake8
 # apt-get install -y python3-yaml python3-scipy python3-matplotlib
 # apt-get install -y verilator yosys
+# To install other dependencies not found in Debian:
+# pip install cocotb==2.0.1 cocotb-bus==0.3.0 leep==1.0.2
+# Like everyone else, we strongly recommend using venv to manage
+# the python add-on environment.  In particular, given everything else
+# going on, create the venv with the --system-site-packages option.
+
 # On older systems, including Debian Bullseye and Ubuntu 22.04 LTS,
-# you'll have to instead build verilator v4.220 or later and yosys 0.23
-# or later from source, since the distribution's published versions are
-# too old and buggy.
+# you'd have to instead build verilator v4.220 or later and yosys 0.23
+# or later from source, since the distribution's published versions were
+# too old and buggy.  This approach is untested and deprecated, since
+# those distributions are no longer supported upstream.
 
 # An enhanced set of tests can be selected with "$1" = "more".
-# The additional setup on Debian Bullseye or Bookworm isn't so bad:
+# The additional setup on Debian Bookworm or Trixie isn't so bad:
 # apt-get install -y gcc-riscv64-unknown-elf picolibc-riscv64-unknown-elf
-# pip3 install nmigen==0.2
+# pip3 install migen==0.9.2
 
 # Suggest (but don't mandate) running with flags set:
 # sh -ex selftest.sh
 # or for more complete tests:
 # sh -ex selftest.sh more
 
-# XXX could/should we do a git clean -fdx between steps?
+# It's considered too dangerous to automatically git clean -fdx between steps
 
 # Print some system status and tool versions
 # When run with -e, will cause early failure if something is missing
 uname -s -r
 gcc --version
 python3 --version
+python3 -c 'import numpy; print("numpy found", numpy.__version__)'
+python3 -c 'import cocotb; print("cocotb found", cocotb.__version__)'
+python3 -c 'import cocotb_bus; print("cocotb_bus found", cocotb_bus.__version__)'
+# version info in leep 1.0.2 is too crazy to use here
+python3 -c 'import leep; print("leep found", "unknown version")'
 iverilog -V
 verilator --version
 yosys -V
 echo 'puts "tclsh [info patchlevel]"' | tclsh
 flake8 --version
 if [ "$1" = "more" ]; then
-python3 -c 'import nmigen; print("nmigen found", nmigen.__version__)'
+python3 -c 'import migen; print("migen found", "unknown version")'
 riscv64-unknown-elf-gcc --version
 fi
 
@@ -105,7 +117,7 @@ make -C projects/test_marble_family all net_slave_check
 make -C projects/test_marble_family/pps_lock
 
 ## oscope_top_test
-# optional, since it requires nmigen==0.2 (nmigen is not in Debian)
+# optional, since it requires migen (not in Debian)
 if [ "$1" = "more" ]; then
 make -C projects/oscope/bmb7_cu Voscope_top_tb
 make -C projects/oscope/bmb7_cu Voscope_top_leep
diff --git a/serial_io/EVG_EVR/test_evr_wrapper.py b/serial_io/EVG_EVR/test_evr_wrapper.py
