change wrapper to Toplevel in gen_xo.tcl and have dynamic memory address bases in axi_test.py

Author: nathanielnrn

fud2/rsrc/gen_xo.tcl

@@ -46,4 +46,4 @@ ipx::save_core [ipx::current_core]
 close_project -delete
 
 # Package the project as an .xo file.
-package_xo -xo_path ${xoname} -kernel_name wrapper -ip_directory ${path_to_packaged} -kernel_xml ./kernel.xml
+package_xo -xo_path ${xoname} -kernel_name Toplevel -ip_directory ${path_to_packaged} -kernel_xml ./kernel.xml

yxi/axi-calyx/cocotb/axi_test.py

@@ -89,19 +89,22 @@ async def run_kernel_test(toplevel, data_path: str):
 
     # Finish when ap_done is high or 100 us of simulation have passed.
     timeout = 5000
-    #Base addresses for memories
-    await tb.control_manager.write(0x0010, encode([0x0],4))
-    await tb.control_manager.write(0x0014, encode([0x0],4))
-    await tb.control_manager.write(0x0018, encode([0x0],4))
-    await tb.control_manager.write(0x001C, encode([0x0],4))
-    await tb.control_manager.write(0x0020, encode([0x0],4))
-    await tb.control_manager.write(0x0024, encode([0x0],4))
+    # Base addresses for memories
+    # The od verilog wrapper seemed to be ok with base addresses of 0x0000
+    # for every memory, so trying that here.
+    # Xilinx spec has the first argument offset at 0x0010
+    # Note this differs from the old verilog testrunner because we assume no
+    # timeout argument with the new calyx wrapper.
+    register_offset = 0x0010
+    for mem in data_map.keys():
+        await tb.control_manager.write(register_offset, encode([0x0],4))
+        register_offset += 4
+        await tb.control_manager.write(register_offset, encode([0x0],4))
+        register_offset += 4
     #Assert ap_start by writing 1 to 0x0000
     await tb.control_manager.write(0x0000, encode([0x1],1))
     await with_timeout(RisingEdge(toplevel.done), timeout, "us")
 
-
-
 
     # Get data from ram
     mems: list[str] = list(data_map.keys())