Skip to content

[#333] Fix for tProcV2 doesnt pause when dispatcher FIFOs are full #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meeg merged 9 commits into from
Jun 24, 2025
Merged

[#333] Fix for tProcV2 doesnt pause when dispatcher FIFOs are full #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9f2cc5
[openquantumhardware/qick_internal#37] Updated qick_processor IP comp…
mmdiego Jun 13, 2025
35319ea
[openquantumhardware/qick_internal#37] Fixed qick_processor to work w…
mmdiego Jun 18, 2025
45306c3
[openquantumhardware/qick_internal#37] Added demo notebook from Sho t…
mmdiego Jun 18, 2025
c445737
[openquantumhardware/qick_internal#37] Added new hazard condition to …
mmdiego Jun 20, 2025
6a1c114
Merge remote-tracking branch 'origin/main' into 37-tproc-v2-doesnt-pa…
mmdiego Jun 23, 2025
ec325e1
Merge remote-tracking branch 'origin/main' into 37-tproc-v2-doesnt-pa…
mmdiego Jun 24, 2025
cf7a1ae
update version
qickbot Jun 24, 2025
02ddbc4
Removed test project and demo notebook
mmdiego Jun 24, 2025
72c59f8
Merge branch 'PR-37-tproc-v2-doesnt-pause-when-dispatcher-fifos-are-f…
mmdiego Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 62 additions & 7 deletions firmware/ip/qick_processor/component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2236,7 +2236,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>viewChecksum</spirit:name>
<spirit:value>b6bbf956</spirit:value>
<spirit:value>df332d1b</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:view>
Expand All @@ -2255,7 +2255,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>viewChecksum</spirit:name>
<spirit:value>b6bbf956</spirit:value>
<spirit:value>df332d1b</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:view>
Expand All @@ -2270,7 +2270,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>viewChecksum</spirit:name>
<spirit:value>34fe2b84</spirit:value>
<spirit:value>935dfa09</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:view>
Expand Down Expand Up @@ -6283,71 +6283,88 @@
<spirit:file>
<spirit:name>src/axis_read.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axis_write.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/data_mem_ctrl.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/mem_rw.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_mem.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_mem_ctrl.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/_qproc_defines.svh</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:isIncludeFile>true</spirit:isIncludeFile>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/_qproc_ips.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_cpu.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_ctrl_hazard.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_reg_bank.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qick_processor.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_axi_reg.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_core.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_dispatcher.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_inport_reg.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_time_ctrl.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axi_slv_qproc.vhd</spirit:name>
Expand All @@ -6357,11 +6374,13 @@
<spirit:name>src/qproc_ctrl.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:userFileType>CHECKSUM_ccdd2edc</spirit:userFileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axis_qick_processor.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:userFileType>CHECKSUM_bcc232a7</spirit:userFileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
</spirit:fileSet>
<spirit:fileSet>
Expand All @@ -6384,71 +6403,88 @@
<spirit:file>
<spirit:name>src/axis_read.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axis_write.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/data_mem_ctrl.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/mem_rw.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_mem.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_mem_ctrl.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/_qproc_defines.svh</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:isIncludeFile>true</spirit:isIncludeFile>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/_qproc_ips.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_cpu.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_ctrl_hazard.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qcore_reg_bank.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qick_processor.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_axi_reg.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_core.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_dispatcher.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_inport_reg.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/qproc_time_ctrl.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axi_slv_qproc.vhd</spirit:name>
Expand All @@ -6457,10 +6493,12 @@
<spirit:file>
<spirit:name>src/qproc_ctrl.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/axis_qick_processor.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
</spirit:fileSet>
<spirit:fileSet>
Expand All @@ -6476,10 +6514,27 @@
<spirit:fileSet>
<spirit:name>xilinx_testbench_view_fileset</spirit:name>
<spirit:file>
<spirit:name>src/TB/tb_axis_qick_processor.sv</spirit:name>
<spirit:name>src/tb/tb_axis_qick_processor.sv</spirit:name>
<spirit:fileType>systemVerilogSource</spirit:fileType>
<spirit:userFileType>USED_IN_simulation</spirit:userFileType>
<spirit:userFileType>USED_IN_testbench</spirit:userFileType>
<spirit:logicalName>xil_defaultlib</spirit:logicalName>
</spirit:file>
<spirit:file>
<spirit:name>src/tb/axi_mst_0/axi_mst_0.xci</spirit:name>
<spirit:userFileType>xci</spirit:userFileType>
</spirit:file>
<spirit:file>
<spirit:name>src/tb/tb_qproc.wcfg</spirit:name>
<spirit:fileType>unknown</spirit:fileType>
</spirit:file>
<spirit:file>
<spirit:name>src/tb/wave.bin</spirit:name>
<spirit:fileType>unknown</spirit:fileType>
</spirit:file>
<spirit:file>
<spirit:name>src/tb/prog.bin</spirit:name>
<spirit:fileType>unknown</spirit:fileType>
</spirit:file>
</spirit:fileSet>
<spirit:fileSet>
Expand Down Expand Up @@ -6637,11 +6692,11 @@
<xilinx:displayName>qick_processor</xilinx:displayName>
<xilinx:autoFamilySupportLevel>level_2</xilinx:autoFamilySupportLevel>
<xilinx:definitionSource>package_project</xilinx:definitionSource>
<xilinx:coreRevision>24</xilinx:coreRevision>
<xilinx:coreRevision>25</xilinx:coreRevision>
<xilinx:upgrades>
<xilinx:canUpgradeFrom>user.org:user:axis_tproc_B:1.0</xilinx:canUpgradeFrom>
</xilinx:upgrades>
<xilinx:coreCreationDateTime>2025-06-05T23:02:03Z</xilinx:coreCreationDateTime>
<xilinx:coreCreationDateTime>2025-06-13T14:01:52Z</xilinx:coreCreationDateTime>
<xilinx:tags>
<xilinx:tag xilinx:name="ui.data.coregen.dd@648bece3_ARCHIVE_LOCATION">/home/mdifeder/Projects/20.2/IPs/TPROCB_1</xilinx:tag>
<xilinx:tag xilinx:name="ui.data.coregen.dd@7858384c_ARCHIVE_LOCATION">/home/mdifeder/Projects/20.2/IPs/TPROCB_1</xilinx:tag>
Expand Down Expand Up @@ -7484,7 +7539,7 @@
<xilinx:xilinxVersion>2023.1</xilinx:xilinxVersion>
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="2897c82e"/>
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="769c350d"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="760adee5"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="7c18a930"/>
<xilinx:checksum xilinx:scope="ports" xilinx:value="f423e66e"/>
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="0a52d470"/>
<xilinx:checksum xilinx:scope="parameters" xilinx:value="4960cdd2"/>
Expand Down
Loading
Loading