diff --git a/Lab3/Lab Axistream Multiple DMAs (axis).ipynb b/Lab3/Lab Axistream Multiple DMAs (axis).ipynb index 2dbc7a2..faf1d26 100644 --- a/Lab3/Lab Axistream Multiple DMAs (axis).ipynb +++ b/Lab3/Lab Axistream Multiple DMAs (axis).ipynb @@ -7,38 +7,14 @@ "outputs": [ { "data": { - "application/javascript": [ - "\n", - "try {\n", - "require(['notebook/js/codecell'], function(codecell) {\n", - " codecell.CodeCell.options_default.highlight_modes[\n", - " 'magic_text/x-csrc'] = {'reg':[/^%%microblaze/]};\n", - " Jupyter.notebook.events.one('kernel_ready.Kernel', function(){\n", - " Jupyter.notebook.get_cells().map(function(cell){\n", - " if (cell.cell_type == 'code'){ cell.auto_highlight(); } }) ;\n", - " });\n", - "});\n", - "} catch (e) {};\n" - ] + "application/javascript": "\ntry {\nrequire(['notebook/js/codecell'], function(codecell) {\n codecell.CodeCell.options_default.highlight_modes[\n 'magic_text/x-csrc'] = {'reg':[/^%%microblaze/]};\n Jupyter.notebook.events.one('kernel_ready.Kernel', function(){\n Jupyter.notebook.get_cells().map(function(cell){\n if (cell.cell_type == 'code'){ cell.auto_highlight(); } }) ;\n });\n});\n} catch (e) {};\n" }, "metadata": {}, "output_type": "display_data" }, { "data": { - "application/javascript": [ - "\n", - "try {\n", - "require(['notebook/js/codecell'], function(codecell) {\n", - " codecell.CodeCell.options_default.highlight_modes[\n", - " 'magic_text/x-csrc'] = {'reg':[/^%%pybind11/]};\n", - " Jupyter.notebook.events.one('kernel_ready.Kernel', function(){\n", - " Jupyter.notebook.get_cells().map(function(cell){\n", - " if (cell.cell_type == 'code'){ cell.auto_highlight(); } }) ;\n", - " });\n", - "});\n", - "} catch (e) {};\n" - ] + "application/javascript": "\ntry {\nrequire(['notebook/js/codecell'], function(codecell) {\n codecell.CodeCell.options_default.highlight_modes[\n 'magic_text/x-csrc'] = {'reg':[/^%%pybind11/]};\n Jupyter.notebook.events.one('kernel_ready.Kernel', function(){\n Jupyter.notebook.get_cells().map(function(cell){\n if (cell.cell_type == 'code'){ cell.auto_highlight(); } }) ;\n });\n});\n} catch (e) {};\n" }, "metadata": {}, "output_type": "display_data" @@ -122,9 +98,9 @@ "samples = random.sample(range(0, length), length)\n", "np.copyto(in_buffer2, samples)\n", "\n", - "\n", - "sadd_ip.write(0x10, length) # we got this address from Vivado source. Since we didn't do port=return, and we set a constant for ap_start, we only have to write length.\n", - "sadd_ip.write(0x00, 1)\n", + " # we got these addresses from Vivado source. For register document, refer to Lab3\\streamAdd\\streamAdd\\solution1\\impl\\verilog\\sadd_CTRL_s_axi.v\n", + "sadd_ip.write(0x10, length)\n", + "sadd_ip.write(0x00, 1) # write to AP_START\n", "t_start = time.time()\n", "dma1.sendchannel.transfer(in_buffer1)\n", "dma2.sendchannel.transfer(in_buffer2)\n",