Skip to content

Commit 45d46fa

Browse files
authored
Remove unhelpful axi wrapper runt tests and cocotb tests (#2515)
This PR gets rid of the yxi-based wrapper runt tests mentioned in #2233. These files tried to snapshot "steps" in the process of going from a calyx program to AXI based cocotb testing, but the process for updating was manual (updating snapshots one at a time then copying the new `*.expect` to the correct `*.file-suffix`) and error prone. (Forgetting to update a `*.file-suffix` would just leave the tests passing). Once work starts up on AXI again I do think something in the spirit of these tests would be useful to have. The cocotb axi tests working is a good starting point to making sure that the AXI wrappers are [at least partially] correct. With the changes introduced in #2516 being not well tested, I think it makes sense to get rid of these tests, as long as we want to merge those changes as well. Some more context in [zulip](https://calyx.zulipchat.com/#narrow/channel/445339-calyx-yxi/topic/AXI.20Controller/near/528563512)
1 parent a8c6310 commit 45d46fa

22 files changed

+1
-42833
lines changed

runt.toml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -626,44 +626,6 @@ fud2 {} -s sim.cycle_limit=500 \
626626
--to dat -q
627627
"""
628628

629-
##### Calyx AXI tests #####
630-
[[tests]]
631-
name = "calyx-py read-write-compute AXI wrapper generation"
632-
paths = ["yxi/tests/axi/read-compute-write/*.yxi"]
633-
cmd = """
634-
python3 yxi/axi-calyx/axi_generator.py {}
635-
"""
636-
637-
[[tests]]
638-
name = "calyx-py dynamic AXI wrapper generation"
639-
paths = ["yxi/tests/axi/dynamic/*.yxi"]
640-
cmd = """
641-
python3 yxi/axi-calyx/dynamic_axi_generator.py {}
642-
"""
643-
644-
#Ignore fud2 stderr for now due to ninja nondeterminism
645-
[[tests]]
646-
name = "fud2 AXI wrapper invocation"
647-
paths = ["yxi/tests/axi/*/*-mem-vec-add.futil"]
648-
cmd = """
649-
dynamic=$(head -n 2 {} | tail -n 1 | cut -c 4-)
650-
fud2 {} --to calyx --through axi-wrapped --set $dynamic 2> /dev/null
651-
"""
652-
653-
[[tests]]
654-
name = "fud2 AXI-wrapped to verilog"
655-
paths = ["yxi/tests/axi/*/*-mem-vec-add-axi-wrapped.futil"]
656-
cmd = """
657-
fud2 {} --from calyx --to verilog-noverify 2> /dev/null
658-
"""
659-
660-
[[tests]]
661-
name = "fud2 cocotb AXI-wrapped xecution"
662-
paths = ["yxi/tests/axi/*/*-mem-vec-add-verilog.v"]
663-
cmd = """
664-
fud2 {} --from verilog-noverify --to cocotb-axi --set sim.data=yxi/tests/axi/vectorized-add.data 2> /dev/null
665-
"""
666-
667629
##### Xilinx Tests ######
668630
[[tests]]
669631
name = "AXI wrapper generation"
@@ -683,7 +645,7 @@ target/debug/calyx {} -b xilinx-xml
683645

684646
[[tests]]
685647
name = "kernel.xml generation from yxi"
686-
paths = ["yxi/tests/axi/xml/*.yxi"]
648+
paths = ["yxi/tests/axi/xml-gen/*.yxi"]
687649
cmd = """
688650
python3 yxi/xml/xml_generator.py {}
689651
"""

0 commit comments

Comments
 (0)