diff --git a/.omo/run-continuation/ses_10239d2deffea8KLY07dbf73Xl.json b/.omo/run-continuation/ses_10239d2deffea8KLY07dbf73Xl.json new file mode 100644 index 0000000..20530da --- /dev/null +++ b/.omo/run-continuation/ses_10239d2deffea8KLY07dbf73Xl.json @@ -0,0 +1,10 @@ +{ + "sessionID": "ses_10239d2deffea8KLY07dbf73Xl", + "updatedAt": "2026-06-25T07:55:55.876Z", + "sources": { + "background-task": { + "state": "idle", + "updatedAt": "2026-06-25T07:55:55.876Z" + } + } +} \ No newline at end of file diff --git a/.omo/run-continuation/ses_10fa71838ffejKERYltTRb8Y0A.json b/.omo/run-continuation/ses_10fa71838ffejKERYltTRb8Y0A.json new file mode 100644 index 0000000..8b26aa4 --- /dev/null +++ b/.omo/run-continuation/ses_10fa71838ffejKERYltTRb8Y0A.json @@ -0,0 +1,10 @@ +{ + "sessionID": "ses_10fa71838ffejKERYltTRb8Y0A", + "updatedAt": "2026-06-25T11:54:10.632Z", + "sources": { + "background-task": { + "state": "idle", + "updatedAt": "2026-06-25T11:54:10.632Z" + } + } +} \ No newline at end of file diff --git a/rtl/ip/confreg/confreg.v b/rtl/ip/confreg/confreg.v index 26ab8c0..94a9b64 100644 --- a/rtl/ip/confreg/confreg.v +++ b/rtl/ip/confreg/confreg.v @@ -91,7 +91,6 @@ module confreg #( input [3 :0] touch_btn, input uart0_int, - input dma_finish, input fft_finish, output confreg_int ); @@ -384,7 +383,7 @@ always @(posedge aclk) begin end end -assign int_in = {24'b0, dma_finish, fft_finish, uart0_int, timer_int, touch_btn_data}; +assign int_in = {24'b0, 1'b0, fft_finish, uart0_int, timer_int, touch_btn_data}; int_ctrl u_int_ctrl ( .clk (aclk), diff --git a/rtl/ip/matmul/matmul_axi_slave.v b/rtl/ip/matmul/matmul_axi_slave.v index d33bdfe..081477b 100644 --- a/rtl/ip/matmul/matmul_axi_slave.v +++ b/rtl/ip/matmul/matmul_axi_slave.v @@ -103,7 +103,10 @@ module matmul_axi_slave ( output [1:0] s_axi_rresp, output reg s_axi_rlast, output reg s_axi_rvalid, - input s_axi_rready + input s_axi_rready, + + // Interrupt output (active high level, pulsed by calc_done) + output intr ); // ========================================== @@ -459,4 +462,7 @@ module matmul_axi_slave ( end end + // Interrupt: driven by done, cleared when software writes STATUS[1] + assign intr = done; + endmodule \ No newline at end of file diff --git a/rtl/soc_top.v b/rtl/soc_top.v index 79a54ac..f8f4c8f 100644 --- a/rtl/soc_top.v +++ b/rtl/soc_top.v @@ -603,6 +603,7 @@ wire axiOut_7_bvalid ; wire axiOut_7_bready ; wire confreg_int; +wire matmul_intr; AxiCrossbar_2x8 u_AxiCrossbar_2x8 ( .clk ( sys_clk ), @@ -1031,10 +1032,11 @@ AxiCrossbar_2x8 u_AxiCrossbar_2x8 ( ); - + core_top u_cpu( - .intrpt ({7'b0, confreg_int}), //high active + .intrpt ({5'd0, matmul_intr, dma_finish, confreg_int}), //high active + // intrpt[2]=matmul, intrpt[1]=dma, intrpt[0]=confreg .aclk (cpu_clk ), .aresetn (cpu_resetn ), //low active @@ -1370,7 +1372,6 @@ confreg #( // 中断与状态信号 .uart0_int (uart0_int), // UART0中断 - .dma_finish (dma_finish), // DMA完成信号 .fft_finish (fft_finish), // FFT完成信号 .confreg_int(confreg_int) // 输出中断给CPU ); @@ -1436,7 +1437,7 @@ assign fft_arready = 1'b1; assign fft_awready = 1'b1; assign fft_wready = 1'b1; -//slave 7 - matmul accelerator +//slave 7 - matmul accelerator matmul_axi_slave u_matmul_axi_slave ( .clk (sys_clk), .resetn (sys_resetn), @@ -1480,7 +1481,8 @@ matmul_axi_slave u_matmul_axi_slave ( .s_axi_rresp (axiOut_7_rresp ), .s_axi_rlast (axiOut_7_rlast ), .s_axi_rvalid (axiOut_7_rvalid), - .s_axi_rready (axiOut_7_rready) + .s_axi_rready (axiOut_7_rready), + .intr (matmul_intr) ); wire [31:0] cdma_s_awaddr; diff --git a/sdk/axi_ram.mif b/sdk/axi_ram.mif index 40c859e..4f1da13 100644 --- a/sdk/axi_ram.mif +++ b/sdk/axi_ram.mif @@ -52,7 +52,7 @@ 00000011100000000110000000001101 00000100000000000000000110101100 00011100000000000000000100101100 -00000010100100110111000110001100 +00000010100101001111000110001100 00011100000000000001000000001101 00000010101111001001000110101101 00011100000000000001000000101110 @@ -66,7 +66,7 @@ 00011100000000000001000000101100 00000010101011100111000110001100 00011100000000000001000000101101 -00000010101110100101000110101101 +00000010101110101001000110101101 01101100000000000001000110001101 00101001100000000000000110000000 00000010100000000001000110001100 @@ -144,132 +144,124 @@ 00000000000000000000000000000000 00010100001111101010000000001100 00000010101111101000000001100011 +00000010100000000000100000001101 00000011100001000000000110010001 00000011100011000000000110010000 00000011100001100000000110001111 00000010100000000000010000001110 -00000010100000000000100000001101 00000011100011100000000110001100 00011100000000000001000000000100 00000010101101101000000010000100 +00101001100000010100000001111000 00101001100000001000000001101111 00101001100000001001000001101100 -00101001100000010111000001100001 -00101001100000000110000001110001 -00101001100000000111000001110000 00101001100000001010000001101110 00101001100000001011000001101101 +00101001100000010111000001100001 +00101001100000010110000001110110 00101001100000010101000001110111 -00101001100000010100000001111000 +00101001100000010011000001111001 00101001100000010010000001111010 00101001100000010001000001111011 00101001100000010000000001111100 00101001100000001111000001111101 00101001100000001110000001111110 00101001100000001101000001111111 -00010101011111101010000000011000 -00101001100000010110000001110110 -00101001100000010011000001111001 -01010100000001010000000000000000 -00000010100000000001100000001100 -00000011100000000001001100010111 -00101001100000000000001011101100 +00101001100000000110000001110001 +00101001100000000111000001110000 +01010100000001010110010000000000 +00010101011111101010000000001100 +00000011100000000001000110001100 +00000010100000000001100000001101 +00101001100000000000000110001101 00101000100000000110000001100110 00000010100000000010100000001000 00000010100000100000000000000111 00010100001110001000000000000101 00000000000101010000000000000100 -01010100000001000110110000000000 -00000000000101010000000000000100 -01010100000001001010010000000000 -00101000100000001010000001101100 +00011100000000000001000000111000 +00000010101100110011001100011000 +01010100000001000110010000000000 +00101000100000000000001100001100 +01011011111111111111110110000000 +00101000100000001010000001101101 00010100001110001000000000011010 +00101001100000000000001100000000 +00010101011111101010000000001100 00000011100101000000001101011011 -00000010100000000000010000011111 -00010101011111101010000000011110 -00000010100000000000100000011101 -00000010100000000000010000011100 +00000010100000000000010000010110 00000011100000100000001101011010 -00101001100000000000001100001100 -00000011010000000000011111111001 +00011100000000000001000000110111 +00000010101100101000001011110111 +00011100000000000001000000111110 +00000010101100100100001111011110 +00000010100000000000010000011101 +00010101011111101010000000011100 +00101001100000000000000110001101 +00000011010000000000011011011001 00000000010000001000101100111001 00000010100000001100000001101100 00000000000100000110010110001100 00101000101111111010000110000110 -00000010101111111111111111111000 +00000010101111111111111011011111 00000010100000000010100000001000 00000010100000100000000000000111 00000000000101010000001101000101 00000000000101010000000000000100 -00000011010000000000011100011000 -01010100000001000001000000000000 +00000011010000000000011111111111 +01010100000000111111010000000000 00101000100000000000001011101100 -00000011010000000001100110001100 -01011011111111111111100110000000 -00101001100000000000001011111101 -00000010100000000000011111110110 -01011000000000000110001111111100 -00000010100000000000010000000100 -01010100000001000011000000000000 +01011011111111111111110110000000 +00101001100000000000001011100000 +01011000000000000001001011011101 +00101000100000000000001111001100 +01011011111111111111110110000000 +00101001100000000000001111000000 +00000000010000001000101111111111 00000010100000001100000001101100 -00000000010000001000101100011000 -00000000000100000110000110011000 -00101000101111111100001100000101 +00000000000100000111110110011111 +00101000101111111100001111100101 00000010100000000101000000001000 00000010100000110000000000000111 00000000000101010000001101100110 00000010100000000000010000000100 -01010100000000111100110000000000 -00000000000101010000000000000100 -01010100000001000000010000000000 +01010100000000111011010000000000 +00101000100000000000001100001100 +01011011111111111111110110000000 00000010100000001100000001101100 00000000000100000110010110011001 00101000101111111110001100101101 +00101001100000000000001100000000 +00000010100000000000011011010110 00000010100000000010100000001100 -00101001100000000000001111001101 -01011000000000000100111011001100 +00101001100000000000001110001101 00000010100000100000001101011010 00000010100000110000001101111011 -00000000000101010000001011011111 -01010011111111110110001111111111 -00000010100000001100000001101101 -00000000010000001000101100001100 -00000000000100000011000110101100 -00101000101111111100000110000101 -00000010100000000101000000001000 -00000010100000110000000000000111 -00000000000101010000001101100110 -00000010100000000000010000000100 -01010100000000110111100000000000 -00000000000101010000000000000100 -01010100000000111011000000000000 -00101000100000001011000001101100 -00101001100000000000001111001100 -01010011111111111011111111111111 -00010101011111101010000000001101 -00000011100000000001000110101101 -00101000100000000000000110101100 -00000011010000000001100110001100 -01011011111111111111100110000000 -00000010100000000000100000001100 -00101001100000000000000110101100 -00000010100000000000010000000100 -01010100000000111000000000000000 +01011111111111110110011011001100 +00101000100000000000001011101100 +01011011111111111111110110000000 +00101001100000000000001011100000 +00000011010000000000000000000000 +00101000100000000000001111001100 +01011011111111111111110110000000 00101000100000001001000001100101 00010100001110001000000000000110 00000010100000000101000000001000 00000010100000110000000000000111 00000011101011110000000011000110 00000010100000000000010000000100 -01010100000000110010010000000000 -00000010100000000000010000000100 -01010100000000110101110000000000 +00101001100000000000001111000000 +01010100000000110100110000000000 +00101000100000000000001111001100 +01011011111111111111110110000000 00010101011110001000000000010001 00000011100101000000001000101111 +00101001100000000000001111000000 00000010101111111111110000000101 00011100000000000001000000010000 -00000010101100000000001000010000 +00000010101100001001001000010000 00000011101100100000001000110001 +00000011010000000000000000000000 00101000100000000000000111101100 00000000010001001010000010110010 00000010100000000001000111101111 @@ -309,11 +301,11 @@ 01011111111111110111000111110001 00000000000101000001010000000101 00011100000000000001000000000100 -00000010101011001110000010000100 -01010100000000101101000000000000 +00000010101011010110000010000100 +01010100000000110101000000000000 00011100000000000001000000000100 -00000010101011010000000010000100 -01010100000000101100010000000000 +00000010101011011000000010000100 +01010100000000110100010000000000 00101000100000010111000001100001 00101000100000010110000001110110 00101000100000010101000001110111 @@ -334,6 +326,14 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 +00000000000000000000000000000000 00000010101111100001000001100011 00101001100000011110000001100001 00101001100000011101000001100010 @@ -383,27 +383,27 @@ 00000000000101010000000110101110 00000011010000000001000111001110 00000011100000000001000000010100 -01011000000000001111010111010100 +01011000000000001111100111010100 00000000000101010000000110101110 00000011010000000010000111001110 00000011100000000010000000010100 -01011000000000001110100111010100 +01011000000000001111000111010100 00000000000101010000000110101110 00000011010000000100000111001110 00000011100000000100000000010100 -01011000000000001101110111010100 +01011000000000001110010111010100 00000000000101010000000110101110 00000011010000001000000111001110 00000011100000001000000000010100 -01011000000000001101000111010100 +01011000000000001101100111010100 00000000000101010000000110101110 00000011010000010000000111001110 00000011100000010000000000010100 -01011000000000001100010111010100 +01011000000000001100110111010100 00000000000101010000000110101110 00000011010000100000000111001110 00000011100000100000000000010100 -01011000000000001011100111010100 +01011000000000001100000111010100 01010000000000000001000000000000 00000010100000000001000010110100 00000100000000000001100000110100 @@ -441,20 +441,20 @@ 00101000100000000000000001111111 00000010100000011111000001100011 00000110010010000011100000000000 -01010100000000000010010000000000 +01010100000000000010110000000000 01010011111111110111101111111111 -01010011111111110111011111111111 +01010100000000001011110000000000 01010011111111110111001111111111 -01010011111111110110111111111111 +01010100000000001000010000000000 01010011111111110110101111111111 01010011111111110110011111111111 01010011111111110110001111111111 01010011111111110101111111111111 +01010011111111110101101111111111 +01010011111111110101011111111111 +01010000000000000000000000000000 +01010000000000000000000000000000 01010000000000000000000000000000 -00000011010000000000000000000000 -00000011010000000000000000000000 -00000011010000000000000000000000 -00000011010000000000000000000000 00000011010000000000000000000000 00000011010000000000000000000000 00000011010000000000000000000000 @@ -478,21 +478,45 @@ 00000011010000000000000000000000 00000011010000000000000000000000 00000011010000000000000000000000 -00000000010000001001100010000100 -00010101011111100110000000001100 -00000000000100000011000010000100 +00011100000000000001000000101110 +00000010101000001001000111001110 +00000010100000000000010000001111 +00010101011111101010000000001100 +00000010100000000000100000001101 +00101001100000000000000111001111 +00000011100000000001000110001100 +00101001100000000000000110001101 +01001100000000000000000000100000 00000011010000000000000000000000 -00101000100000000101000010001100 +00000011010000000000000000000000 +00000011010000000000000000000000 +00010101011111100110000000001101 +00101000100000000101000110101100 00000011010000000000100110001100 -01011011111111111111100110000000 +01011000000000000001110110000000 +00011100000000000001000000001110 +00000010100111111000000111001110 +00000010100000000000010000001111 00000010100000000000100000001100 -00101001100000000101000010001100 +00101001100000000000000111001111 +00101001100000000101000110101100 +00010101011111100110000000001100 +00000011100000010000000110001100 +00101000100000000101000110001101 +00000011010000000000100110101101 +01011000000000000001110110100000 +00011100000000000001000000001110 +00000010100111101100000111001110 +00000010100000000000010000001111 +00000010100000000000100000001101 +00101001100000000000000111001111 +00101001100000000101000110001101 01001100000000000000000000100000 00000011010000000000000000000000 00000011010000000000000000000000 00000010101111110000000001100011 00011100000000000001000000001100 -00101000100100101111000110001100 +00101000100100010111000110001100 00101001100000001001000001100101 00101001100000001010000001100110 00000000000101010000000010000101 @@ -530,7 +554,7 @@ 00101001100000001110000001101100 01010100001111110101100000000000 00011100000000000001000000001100 -00101000100100001110000110001100 +00101000100011110110000110001100 00101000100000000000000110001100 00101001100000000110000001100100 00101001010000011101000001100000 @@ -599,7 +623,7 @@ 01101000000100011010101000101110 00000000010000001000100111001110 00011100000000000001000000001101 -00000010101011000110000110101101 +00000010101010101110000110101101 00000000000100000011100110101110 00101000100000000000000111001110 01001100000000000000000111000000 @@ -830,10 +854,10 @@ 00101000100000000010000001101110 00000010100000010001110000001101 00011100000000000000111111111000 -00000010100111001110001100011000 +00000010100110110110001100011000 01100100000000000000110110101110 00011100000000000000111111111000 -00000010100111001100001100011000 +00000010100110110100001100011000 00000010101111011111110000001101 00000000000101001011011011110111 00000000000101010000000000010110 @@ -866,10 +890,10 @@ 00101000100000000010000001101110 00000010100000010001110000001101 00011100000000000000111111111000 -00000010100110101100001100011000 +00000010100110010100001100011000 01100100000000000000110110101110 00011100000000000000111111111000 -00000010100110101010001100011000 +00000010100110010010001100011000 00000010101111011111110000001101 00000000000101001011011011110111 00000000000101010000000000001111 @@ -899,7 +923,7 @@ 01100100000000000110010000010000 00000010100000000100000000000110 00011100000000000000111111110100 -00000010100111111001001010010100 +00000010100111100001001010010100 00000010100000000001110000000111 00101000100000100110000001110010 00101000100000100101000001110001 @@ -973,7 +997,7 @@ 01100100000000000110010000011110 00000010100000000100000000010011 00011100000000000000111111101101 -00000010100110101011000110101101 +00000010100110010011000110101101 00000010100000000001110000010100 00101000100000100110000001110001 00101000100000100101000001110000 @@ -999,7 +1023,7 @@ 01100100000000000101110000011110 00000010100000000100000000010010 00011100000000000000111111101101 -00000010100110010001000110101101 +00000010100101111001000110101101 00000010100000000001110000010011 00101000100000100110000001101111 00101000100000100101000001110000 @@ -1091,7 +1115,7 @@ 00101001100000010110000001101100 01010100000101000110100000000000 00011100000000000000111111101110 -00000010100100111110000111001110 +00000010100100100110000111001110 00101000100000000000000111000110 00101000100000000001000111000111 01010100011010001011000000000000 @@ -1107,12 +1131,12 @@ 00101000100000000010000001101101 00000010100000011000010000001110 00011100000000000000111111111100 -00000010100010111101001110011100 +00000010100010100101001110011100 01011000000000000000110110101110 00011100000000000000111111111100 -00000010100010111111001110011100 +00000010100010100111001110011100 00011100000000000000111111101110 -00000010100100101011000111001110 +00000010100100010011000111001110 00101000100000000001000111001111 00101000100000000000000111001110 00000010101111111111111101011111 @@ -1152,7 +1176,7 @@ 00101000100000010111000001101100 01011111111111111000010010000000 00011100000000000000111111111111 -00000010100100000101001111111111 +00000010100011101101001111111111 00101000100000000000001111100110 00101000100000000001001111100111 00101000100000001010000001100100 @@ -1498,7 +1522,7 @@ 00101001100000000100000001101101 00010100000000000000000011101110 00011100000000000000111111101101 -00000010101100110110000110101101 +00000010101100011110000110101101 00000011101000001100000111001110 00101001100000010001000001101101 00000010100000011110000000001101 @@ -1523,7 +1547,7 @@ 00000000000101010000000000011011 00000000000101010000000000011111 00011100000000000000111111111000 -00000010101100100111001100011000 +00000010101100001111001100011000 01010011111101011110011111111111 00000010101111111111110000001110 00101001100000001010000001101100 @@ -1576,7 +1600,7 @@ 00101010000000000000001101111111 01010011111111111110111111111111 00011100000000000000111111101101 -00000010101011101101000110101101 +00000010101011010101000110101101 00101001100000010001000001101101 00000011010000001000001011101110 01011000000000000110000111000000 @@ -1601,7 +1625,7 @@ 00000010100000000000100000001110 01010011111111100001101111111111 00011100000000000000111111101101 -00000010101011001111000110101101 +00000010101010110111000110101101 01010011111111111001111111111111 00000010100000000001001101101101 00101001100000000100000001101101 @@ -1748,7 +1772,7 @@ 00000010100000100111000001110011 00000010100000000001110000000111 00011100000000000000111111110100 -00000010101010101000001010010100 +00000010101010010000001010010100 00000010100000000100000000000110 00000010101111111100001000010000 00000000000101010000001001101100 @@ -1767,7 +1791,7 @@ 00000010100000100111000001110010 00000010100000000001110000010100 00011100000000000000111111101101 -00000010101010010001000110101101 +00000010101001111001000110101101 00000010100000000100000000010011 00000010101111111100001111011110 00000000000101010000001001001100 @@ -1784,7 +1808,7 @@ 00000010100000100111000001110001 00000010100000000001110000010011 00011100000000000000111111101101 -00000010101010000000000110101101 +00000010101001101000000110101101 00000010100000000100000000010010 00000010101111111100001111011110 00000000000101010000001000101100 @@ -1802,8 +1826,8 @@ 01010100010110101100110000000000 00101000100000000010000001101100 01011100000000010111010010000000 -00011100000000000000111111101101 -00000010101000010001000110101101 +00011100000000000000111111001101 +00000010100111111001000110101101 00101001100000000000000110001101 00000010100000000000010000001101 00101001100000000001000110001101 @@ -1847,7 +1871,7 @@ 01100100000000000100100000011000 00000010100000000100000000011011 00011100000000000000111111111010 -00000010101001000001001101011010 +00000010101000101001001101011010 00000010100000000001110000011101 00101000100000100110000001101110 00101000100000100101000001101101 @@ -1897,7 +1921,7 @@ 00101000100000011110000001101101 01100000000000010101010000001101 00011100000000000000111111001101 -00000010100110110011000110101101 +00000010100110011011000110101101 00101001100000000000000110001101 00000010100000000000010000001101 00101001100000000001000110001101 @@ -1943,7 +1967,7 @@ 00000000000101010000000110001110 00000010100000000100000000011101 00011100000000000000111111011011 -00000010100111100001001101111011 +00000010100111001001001101111011 00000010100000000001110000011110 00101000100000100110000001101111 00101000100000100101000001101101 @@ -2005,7 +2029,7 @@ 01100100000000000101110000011010 00000010100000000100000000001110 00011100000000000000111111011110 -00000010100110100011001111011110 +00000010100110001011001111011110 00000010100000000001110000010001 00101000100000100110000001101111 00101000100000100101000001101101 @@ -2032,7 +2056,7 @@ 00000010100000000001110000011110 00101001100000000010000001101101 00011100000000000000111111011111 -00000010100110001000001111111111 +00000010100101110000001111111111 01011100000000011000001101100000 01011100000000011000001110100000 00000000000100000111001100001101 @@ -2093,7 +2117,7 @@ 01100111111111000111000000011000 00000010100000000100000000011011 00011100000000000000111111011010 -00000010100101001011001101011010 +00000010100100110011001101011010 00000010100000000001110000011101 00101000100000100110000001101110 00101000100000100101000001101101 @@ -2307,7 +2331,7 @@ 01100111111111111100010000011011 00000010100000000100000000011101 00011100000000000000111111011000 -00000010100001110101001100011000 +00000010100001011101001100011000 00000010100000000001110000011110 00101000100000100110000001101100 00101000100000100101000001101101 @@ -2346,7 +2370,7 @@ 01100111111110001000010000010111 00000010100000000100000000011010 00011100000000000000111111011000 -00000010100001010010001100011000 +00000010100000111010001100011000 00000010100000000001110000011011 00101000100000100110000001101110 00101000100000100101000001101101 @@ -2424,7 +2448,7 @@ 00000000000101010000000010101110 01011100000000000010111000000000 00011100000000000000111111001100 -00000010100000001111000110001100 +00000010101111110111000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010100111101110000000000 @@ -2468,7 +2492,7 @@ 00000010101111111111000010001101 00101001100000000000000010000000 00011100000000000000111111001110 -00101000100110000000000111001110 +00101000100101101000000111001110 00101000100000000000000111001100 01011100000000000001000110000000 00101001100000000000000010001100 @@ -2494,7 +2518,7 @@ 01001100000000000000000000100000 01011100000000000001100110001101 00011100000000000000111111001100 -00101000100101011000000110001100 +00101000100101000000000110001100 00000010100000000011000000001101 00101001100000000000000110001101 01001100000000000000000000100000 @@ -2524,7 +2548,7 @@ 00000010101111111110000000001100 00000000000100000101110010010111 00011100000000000000111111011010 -00000010100101001011001101011010 +00000010100100110011001101011010 00000000000101001011001100011000 00101001100000000000001101010111 00000010101111111111001100011000 @@ -2536,7 +2560,7 @@ 00000000000100000110011011110111 00101001100000000000001101010111 00011100000000000000111111001100 -00000010100101000000000110001100 +00000010100100101000000110001100 00101000100000000000000110001101 01011111111111111000100110100000 00101001100000000000000110011000 @@ -2544,7 +2568,7 @@ 00000010101111111100000001100011 00101001100000000010000001110111 00011100000000000000111111001100 -00000010100100110111000110001100 +00000010100100011111000110001100 00101000100000000000000010010111 00101000100000000000000110001100 00101001100000000000000001111001 @@ -2587,7 +2611,7 @@ 00000010101111111010110000001100 01101100000000000011100110000100 00011100000000000000111111001100 -00101000100011111011000110001100 +00101000100011100011000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000010111 @@ -2604,7 +2628,7 @@ 00000000000101001001001100011000 00000010100000000010001100011001 00011100000000000000111111011010 -00000010100011111101001101011010 +00000010100011100101001101011010 00101000100000000000001101010111 01011100000000000001111011100000 00000000000101010000001100100100 @@ -2796,7 +2820,7 @@ 01011000000011111111011101000000 00101000100000000111000001101101 00011100000000000000111111001100 -00000010101010100000000110001100 +00000010101010001000000110001100 00101001100000000001000001101100 01011000000000000001000110100000 00000010100000000000110110001100 @@ -2831,8 +2855,8 @@ 00000010100000000000010000001100 00101001100000000000000110101100 00101000100000000111000001101101 -00011100000000000000111111001100 -00000010101000001100000110001100 +00011100000000000000111110101100 +00000010100111110100000110001100 00101001100000000001000001101100 01011011111111111000000110100000 00101000100000000111000001101110 @@ -2861,17 +2885,17 @@ 00000010101100000000011100011000 00101001100000010010000001100000 00011100000000000000111111001100 -00000010101001100000000110001100 +00000010101001001000000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010100111011100000000000 00011100000000000000111111001100 -00000010101001011101000110001100 +00000010101001000101000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010011001111010000000000 00011100000000000000111111001100 -00000010101001011010000110001100 +00000010101001000010000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100001110000111000000000000 @@ -2880,7 +2904,7 @@ 00000000000101010000000010111011 01010100010111011001000000000000 00011100000000000000111111001100 -00000010101001010011000110001100 +00000010101000111011000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010011001011110000000000 @@ -2912,7 +2936,7 @@ 01101000000000000011010110010110 00000000010000001000111011001101 00011100000000000000111111001100 -00101000101110110111000110001100 +00101000101110011111000110001100 00000000000100000011010110001100 00101000100000000000000110000110 00101000100000000001000110000111 @@ -3033,7 +3057,7 @@ 00000000010000001000110110001101 00000000010010001001001011011101 00011100000000000000111111001100 -00101000101100111110000110001100 +00101000101100100110000110001100 00000000000100000011010110001100 00000011010000000100001110101110 00101000100000000001000110001101 @@ -3041,7 +3065,7 @@ 00101000100000000000000110001100 01011000000000000100000111000000 00011100000000000000111111001110 -00101000101100111000000111001110 +00101000101100100000000111001110 00101000100000001000000111000110 00101000100000001001000111000111 00101000100000001011000001100100 @@ -3056,7 +3080,7 @@ 00000000000101010000000010111100 00000010100000000000110000011000 00011100000000000000111111011110 -00101000101100101001001111011110 +00101000101100010001001111011110 01010000000000000011010000000000 00000011010000000000011110101111 01011000000000000010010111100000 @@ -3085,7 +3109,7 @@ 00000011010000000011111110101100 00000000010000001000110110001101 00011100000000000000111111001100 -00101000101100001010000110001100 +00101000101011110010000110001100 00000000000100000011010110001100 00101000100000000000000110000110 00101000100000000001000110000111 @@ -3093,7 +3117,7 @@ 00101000100000001110000001100101 00000000010010001001001110111101 00011100000000000000111111011110 -00101000101100000100001111011110 +00101000101011101100001111011110 01010100010010010111000000000000 00000000000101010000000010011001 00000000000101010000000010111100 @@ -3103,7 +3127,7 @@ 00101000100000001111000001101100 01011000000000011100110110000000 00011100000000000000111110101110 -00000010100101110110000111001110 +00000010100101011110000111001110 00101000100000000000000111000110 00101000100000000001000111000111 00000000000101010000001100100100 @@ -3115,7 +3139,7 @@ 00101000100000000100000001101100 01100100000000001110010000001100 00011100000000000000111110101110 -00000010100101101100000111001110 +00000010100101010100000111001110 00101000100000001000000001101101 00101000100000000000000111000110 00101000100000000001000111000111 @@ -3140,7 +3164,7 @@ 00000000000101010000000110100111 01010100010010001100000000000000 00011100000000000000111110101111 -00000010100101010101000111101111 +00000010100100111101000111101111 00101000100000000000000111100110 00101000100000000001000111100111 01010100001101000011110000000000 @@ -3148,7 +3172,7 @@ 00000000000100000001011100011000 01011100000000010011001111000000 00011100000000000000111110101100 -00000010100101001111000110001100 +00000010100100110111000110001100 00101000100000010001000001101110 00101000100000001100000001101101 00101000100000000000000110000110 @@ -3178,7 +3202,7 @@ 01100000000001000010110110110110 00000000010000001000111011001101 00011100000000000000111111001100 -00101000101010101101000110001100 +00101000101010010101000110001100 00000000000100000011010110001100 00101000100000000000000110011010 00101000100000000001000110011011 @@ -3187,7 +3211,7 @@ 01100000000000101100000000011111 01011100000001110010001111100000 00011100000000000000111110101100 -00000010100100101000000110001100 +00000010100100010000000110001100 00101000100000000000000110000110 00101000100000000001000110000111 00000000000101010000001101000100 @@ -3229,23 +3253,23 @@ 00101001100000010001000001101100 00101000100000000110000001101100 00011100000000000000111111001101 -00101000101001111010000110101101 +00101000101001100010000110101101 00000000000100000011100110101101 00101000100000000000000110100110 00101000100000000001000110100111 01011000000000001111110110000000 00011100000000000000111110101100 -00000010100011100010000110001100 +00000010100011001010000110001100 00101000100000000000000110000100 00101000100000000001000110000101 00101001100000001100000001111000 00011100000000000000111110111000 -00000010100011101111001100011000 +00000010100011010111001100011000 01010100001111000000010000000000 00101000100000001100000001101111 00000000000101010000001100100110 00011100000000000000111110111001 -00000010100011101000001100111001 +00000010100011010000001100111001 00000000000101010000000111100111 01010100010011011011110000000000 00101000100000000001000001111110 @@ -3321,7 +3345,7 @@ 00000000000101010000000010111001 01011100000000001000011110001100 00011100000000000000111110111100 -00000010100010001100001110011100 +00000010100001110100001110011100 00101000100000000000001110000110 00101000100000000001001110000111 00101000100000001100000001100100 @@ -3353,7 +3377,7 @@ 00000000000101010000000111011110 01010011111111111110101111111111 00011100000000000000111110101100 -00000010100001111110000110001100 +00000010100001100110000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010001010101100000000000 @@ -3430,7 +3454,7 @@ 00000000000101010000000110011110 01010011111111111100111111111111 00011100000000000000111110101100 -00000010100000110001000110001100 +00000010100000011001000110001100 00101000100000000000000110000110 00101000100000000001000110000111 00000010100000000000011100011000 @@ -3816,7 +3840,7 @@ 01010011111111010010101111111111 00101000100000000111000001101101 00011100000000000000111110101100 -00000010101010100001000110001100 +00000010101010001001000110001100 00101001100000000001000001101100 00000010100000000010000110001100 01011111111100000001010110100000 @@ -3849,13 +3873,13 @@ 00000010101111111100000001100011 00101001100000000010000001110111 00011100000000000000111110110111 -00000010100000100100001011110111 +00000010100000001100001011110111 00101000100000000000001011100100 00101001100000000011000001100001 01011000000000000001100010000000 01010111111010100100111111111111 00011100000000000000111110101100 -00000010100000011101000110001100 +00000010100000000101000110001100 00101001100000000000001011100000 00101001100000000000000110000000 00101000100000000011000001100001 @@ -3863,7 +3887,7 @@ 00000010100000000100000001100011 01001100000000000000000000100000 00011100000000000000111110101100 -00000010100000010100000110001100 +00000010101111111100000110001100 00101000100000000000000110001101 01011100000000000001100110100000 00000010100000000000010000001101 @@ -3874,7 +3898,7 @@ 00000000000101010000000000000100 01001100000000000000000000100000 00011100000000000000111110101100 -00000010100000001010000110001100 +00000010101111110010000110001100 00101000100000000000000110001101 01100100000000001000000110100100 00000010101111111100000001100011 @@ -3888,7 +3912,7 @@ 00000000000101010000000000001100 01011100000000000011110010000000 00011100000000000000111110101100 -00000010101111111101000110001100 +00000010101111100101000110001100 00101000100000000000000110000100 00000000000101010000000110011001 01011000000000000000100010000000 @@ -3899,7 +3923,7 @@ 01011000000000000000100010000000 00101001100000000000001100010111 00011100000000000000111110101100 -00000010101111110010000110001100 +00000010101111011010000110001100 00101000100000000000000110001100 00101000100000000011000001100001 00101000100000000010000001110111 @@ -3909,7 +3933,7 @@ 00000010100000000100000001100011 01001100000000000000000000100000 00011100000000000000111110101100 -00000010101111101000000110001100 +00000010101111010000000110001100 00101000100000000000000110001100 00000000000101010000000110000100 01001100000000000000000000100000 @@ -4223,7 +4247,7 @@ 00000010101111111111110110001100 00000000010000001000100110001100 00011100000000000000111110001101 -00000010100100011110000110101101 +00000010100100000110000110101101 00000000000100000011000110101100 00101000100000000000000110000101 00000000000101010000000000000110 @@ -4534,7 +4558,7 @@ 00000010100000000000100000000100 01010000000000000000010000000000 00011100000000000000111110001110 -00000010100101111000000111001110 +00000010100101100000000111001110 00000000000101010000000000001100 00000000000101010000000111001101 00000010100000001000000000010000 @@ -4604,48 +4628,48 @@ 00101001001111111111110110000000 01010011111111111111001111111111 00011100000000000000111110000100 -00101000100100101001000010000100 +00101000100100010001000010000100 00000010100000111100000010000100 01001100000000000000000000100000 00000000000101010000000010001100 00011100000000000000111110001101 -00000010100010101011000110101101 +00000010100010010011000110101101 00101000100000000000000110100100 01100100000000000011000110000000 00011100000000000000111110001110 -00101000100100011101000111001110 +00101000100100000101000111001110 00000000000100010011100010001110 00000000000100010011000000001111 01101100000000000010110111001111 00011100000000000000111110001100 -00101000100100001100000110001100 +00101000100011110100000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000010101111111111110000000100 01001100000000000000000000100000 00011100000000000000111110001110 -00101000100100001111000111001110 +00101000100011110111000111001110 00000000000100010001000111001110 01101011111111111101110111001100 00000000000100000011000010001100 00101001100000000000000110101100 01001100000000000000000000100000 00011100000000000000111110001100 -00101000100100000110000110001100 +00101000100011101110000110001100 00101001100000001000000010001100 00011100000000000000111110001100 -00101000100100000000000110001100 +00101000100011101000000110001100 00101001100000001001000010001100 00011100000000000000111110001100 -00101000100011111111000110001100 +00101000100011100111000110001100 00101001100000011000000010001100 00010101111111111111111100001100 00000000000101010011000010100101 00011100000000000000111110001100 -00101000100011110010000110001100 +00101000100011011010000110001100 00101001100000001010000010001100 00011100000000000000111110001100 -00101000100011111001000110001100 +00101000100011100001000110001100 00101001100000000000000010000000 00101001100000000001000010000000 00101001100000000010000010000000 @@ -4661,28 +4685,28 @@ 00101001100000001011000010001100 01001100000000000000000000100000 00011100000000000000111110000101 -00000010100001111011000010100101 +00000010100001100011000010100101 00011100000000000000111110000100 -00101000100011100001000010000100 +00101000100011001001000010000100 01010000000000010000110000000000 00011100000000000000111110001100 -00000010100001110101000110001100 +00000010100001011101000110001100 00101000100000000000000110000100 00000010101111111100000001100011 00101001100000000010000001110111 00101001100000000011000001100001 00011100000000000000111110010111 -00000010100101010001001011110111 +00000010100100111001001011110111 01011000000000000000100010010111 01010100000001110000010000000000 00011100000000000000111110001100 -00000010100001101010000110001100 +00000010100001010010000110001100 00101000100000000000000110000100 00000010100000011100001011101100 01011000000000000000100010001100 01010100000001101110110000000000 00011100000000000000111110001100 -00000010100001100011000110001100 +00000010100001001011000110001100 00101000100000000000000110000100 00000010100000111000001011110111 01011000000000000001010010010111 @@ -4696,18 +4720,18 @@ 01001100000000000000000000100000 00000010101111111100000001100011 00011100000000000000111110001100 -00000010100110001101000110001100 +00000010100101110101000110001100 00011100000000000000000000001101 00000010101111011011000110101101 00000000000101010000000000000110 00000010100000000001000000000101 00011100000000000000111110000100 -00000010100100110011000010000100 +00000010100100011011000010000100 00101001100000000011000001100001 00101001100000000000000110001101 01010111111111101101011111111111 00011100000000000000111110001101 -00000010100100101110000110101101 +00000010100100010110000110101101 00000010100000000000010000000110 00000010100000000010010000000101 00000010100000011100000110100100 @@ -4719,14 +4743,14 @@ 00000010100000000100000001100011 01010011111111101010011111111111 00011100000000000000111110001100 -00000010100100100000000110001100 +00000010100100001000000110001100 00101000100000000000000110001101 01011100000000000010010110100000 00011100000000000000000000001101 00000010101111000111000110101101 00101001100000000000000110001101 00011100000000000000111110001100 -00000010100101101111000110001100 +00000010100101010111000110001100 00101000100000000000000110001100 01011100000000000000100110000000 01010011111111110111011111111111 @@ -4840,7 +4864,7 @@ 00101000010000000011100010000100 01010000000011100111000000000000 00011100000000000000111110001100 -00101000100000111000000110001100 +00101000100000100000000110001100 00101000100000000000000110001100 00000010101111111100000001100011 00101001100000000010000001110111 @@ -4854,7 +4878,7 @@ 00000011010000000100000110001101 01011100000000000010010110100000 00011100000000000000111110001101 -00101000100000100000000110101101 +00101000100000001000000110101101 00000010100000000010010000001110 00101001100000000000000110101110 00000011100000010000000110001100 @@ -4969,7 +4993,7 @@ 01011100000000000000100110000000 01010011110110101010111111111111 00011100000000000000111110001100 -00101000101110101101000110001100 +00101000101110010101000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000000100 @@ -4997,7 +5021,7 @@ 00101000100000001010001011101110 01011011111111111110000111000000 00011100000000000000111110011000 -00101000101110010001001100011000 +00101000101101111001001100011000 00000000010001001011000110001101 00101000100000000000001100011001 00000011010000000000010110101101 @@ -5125,12 +5149,12 @@ 01010011111111111100111111111111 01011100000000000001100010000000 00011100000000000000111110000101 -00101000101100011110000010100101 +00101000101100000110000010100101 00011100000000000000000000000100 00000010101111111101000010000100 01010011111110011100111111111111 00011100000000000000111110001100 -00101000101100010110000110001100 +00101000101011111110000110001100 00101000100000000000000110001100 00000010101111111100000001100011 00101001100000000010000001110111 @@ -5301,7 +5325,7 @@ 00101000100000000011000001101110 01011100000000000100000010000000 00011100000000000000111110001100 -00101000101001100001000110001100 +00101000101001001001000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00101010010000000011001011101100 @@ -5536,7 +5560,7 @@ 00000010101111111010110000001100 01101100000000000100010110000101 00011100000000000000111101101100 -00101000100101110110000110001100 +00101000100101011110000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000011010 @@ -5565,7 +5589,7 @@ 01010111110100001100111111111111 01011100000000000110010010000000 00011100000000000000111101101101 -00101000100101100111000110101101 +00101000100101001111000110101101 00101000100000000000000110101100 01011000000000000011000110000000 01011100000000001000111110001100 @@ -5635,7 +5659,7 @@ 00000010100000111111110000001100 01101100000000000001110110000101 00011100000000000000111101101100 -00101000100100010011000110001100 +00101000100011111011000110001100 00000010100000100010100000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5671,7 +5695,7 @@ 00000010100000000000100000001100 01101100000000000001110110000100 00011100000000000000111101101100 -00101000100011101111000110001100 +00101000100011010111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5681,7 +5705,7 @@ 00000010100000000000100000001100 01101000000000000110000110000100 00011100000000000000111101101100 -00101000100011100100000110001100 +00101000100011001100000110001100 00101000100000000000000110001100 00000010101111111000000001100011 00101001100000000110000001110111 @@ -5704,7 +5728,7 @@ 01010100000000011010010000000000 01010011111111111110001111111111 00011100000000000000111101101100 -00101000100011001110000110001100 +00101000100010110110000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5727,7 +5751,7 @@ 01001100000000000000000000100000 01011100000000000111100010000000 00011100000000000000111101101100 -00101000100010110110000110001100 +00101000100010011110000110001100 00101000100000000000000110001100 01011000000000001000000110000000 00000010101111111000000001100011 @@ -5756,14 +5780,14 @@ 00000010100000000000011011110111 01010011111111111100101111111111 00011100000000000000111101101100 -00101000100010011010000110001100 +00101000100010000010000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 01001100000000000000000000100000 01001100000000000000000000100000 00011100000000000000111101101100 -00101000100010010011000110001100 +00101000100001111011000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5775,7 +5799,7 @@ 00000000000101010000000000000100 01001100000000000000000000100000 00011100000000000000111101101100 -00101000100010000111000110001100 +00101000100001101111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5783,7 +5807,7 @@ 00000010100000000000100000001100 01101100000000000001110110000100 00011100000000000000111101101100 -00101000100001111111000110001100 +00101000100001100111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5793,7 +5817,7 @@ 00000010100000000000100000001100 01101100000000000010000110000100 00011100000000000000111101101100 -00101000100001110101000110001100 +00101000100001011101000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5802,12 +5826,12 @@ 00000000000101010000000000000100 01010011111111111111011111111111 00011100000000000000111101101100 -00000010100001100101000110001100 +00000010100001001101000110001100 00101000100000000000000110001100 00101001000000000000000110000100 01001100000000000000000000100000 00011100000000000000111101101100 -00000010101111111100000110001100 +00000010101111100100000110001100 00101000100000000000000110001101 00000010100000000001010110101110 00101010000000000000000111001100 @@ -5816,7 +5840,7 @@ 00101001000000000000000110100100 01001100000000000000000000100000 00011100000000000000111101101100 -00000010101111110011000110001100 +00000010101111011011000110001100 00101000100000000000000110001101 00000010101111111100000001100011 00000010100000000001010110101110 @@ -5845,7 +5869,7 @@ 00000000010001001010000011010010 00000010100000000010000000001111 00011100000000000000111101101100 -00101000100001001100000110001100 +00101000100000110100000110001100 00000000000100000100100110001100 00101010000000000000000110001100 00000010100000001000000000010000 @@ -5916,7 +5940,7 @@ 00000000010001001110000111010010 00000010100000000110000000001111 00011100000000000000111101110000 -00101000100000000101001000010000 +00101000101111101101001000010000 00000000000100000100101000010000 00101010000000000000001000010000 00000010100000001000000000001100 @@ -5980,7 +6004,7 @@ 00000000010001001110000011101110 00000010100000000110000000010001 00011100000000000000111101101111 -00101000101111000101000111101111 +00101000101110101101000111101111 00000000000100000011100111101111 00101010000000000000000111101110 00000010100000001000000000010000 @@ -6182,7 +6206,7 @@ 00000000010001001110000011010010 00000010100000000110000000001111 00011100000000000000111101110000 -00101000101011111011001000010000 +00101000101011100011001000010000 00000000000100000100101000010000 00101010000000000000001000010000 00000010100000001000000000001110 @@ -6248,7 +6272,7 @@ 00000000010001001110000110110001 00000010100000000110000000001111 00011100000000000000111101110000 -00101000101010111001001000010000 +00101000101010100001001000010000 00000000000100000100011000010000 00101010000000000000001000010001 00000010100000001000000000001110 @@ -6300,7 +6324,7 @@ 00000000010001001110000011110001 00000010100000000110000000001110 00011100000000000000111101101100 -00101000101010000101000110001100 +00101000101001101101000110001100 00000000000100000100010110001100 00101010000000000000000110001100 00000010100000001000000000001111 @@ -7133,7 +7157,7 @@ 00000000000101011110001110110000 01101000000000101001010110011011 00011100000000000000111101001111 -00000010101001101110000111101111 +00000010101001010110000111101111 00000000010000001000101101101110 00000000000100000011100111101110 00101000100000000000000111001100 @@ -7846,7 +7870,7 @@ 00000010100000000000011101110001 01101000000000100100000110011001 00011100000000000000111100101110 -00000010101110110101000111001110 +00000010101110011101000111001110 00000000010000001000101100111001 00000000000100000110010111011001 00101000100000000000001100101100 @@ -9224,7 +9248,7 @@ 00000010100000001000000000001101 01101000000000000010000110000100 00011100000000000000111100001100 -00101000101100011001000110001100 +00101000101100000001000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000000000100010001000110100100 @@ -9232,7 +9256,7 @@ 00000011010000000000000000000000 00000000010001001010000010000100 00011100000000000000111100001100 -00101000101100010001000110001100 +00101000101011111001000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000110000000001101 @@ -9242,7 +9266,7 @@ 01101000000000000010010010001100 00000000010001001110000010000100 00011100000000000000111100001100 -00101000101100000111000110001100 +00101000101011101111000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000010000000001101 @@ -9250,7 +9274,7 @@ 01001100000000000000000000100000 00000000010001001100000010000100 00011100000000000000111100001100 -00101000101011111111000110001100 +00101000101011100111000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000100000000001101 @@ -9864,97 +9888,97 @@ 01101100011101010110111000101000 00000000000000000010100101101100 00000000000000000000000000110000 -00011100000000000000101000011000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000101000101100 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000100111001000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000101000110100 -00011100000000000000101001010100 -00011100000000000001101100000000 -00011100000000000000101001001100 -00011100000000000000101001011100 -00011100000000000001101100000000 -00011100000000000000101011000100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000000101011001100 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000110001011000 -00011100000000000001101100000000 -00011100000000000000101101100100 -00011100000000000000101110011000 -00011100000000000000110001011000 -00011100000000000000110001011000 -00011100000000000000110001011000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000101100001100 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001011011101000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001011110011100 -00011100000000000001101100000000 -00011100000000000001100000111000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001100010100100 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000000110001011000 -00011100000000000001101100000000 -00011100000000000000101101100100 +00011100000000000000101001111000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000101010001100 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000101000101000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000101010010100 +00011100000000000000101010110100 +00011100000000000001101101100000 +00011100000000000000101010101100 +00011100000000000000101010111100 +00011100000000000001101101100000 +00011100000000000000101100100100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000000101100101100 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000110010111000 +00011100000000000001101101100000 +00011100000000000000101111000100 +00011100000000000000101111111000 +00011100000000000000110010111000 +00011100000000000000110010111000 +00011100000000000000110010111000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000101101101100 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001011101001000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001011111111100 +00011100000000000001101101100000 +00011100000000000001100010011000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001100100000100 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000000110010111000 +00011100000000000001101101100000 +00011100000000000000101111000100 +00011100000000000000101111111100 +00011100000000000000110010111000 +00011100000000000000110010111000 +00011100000000000000110010111000 +00011100000000000000101101110100 +00011100000000000000101111111100 +00011100000000000000101110110100 +00011100000000000001101101100000 00011100000000000000101110011100 -00011100000000000000110001011000 -00011100000000000000110001011000 -00011100000000000000110001011000 -00011100000000000000101100010100 -00011100000000000000101110011100 -00011100000000000000101101010100 -00011100000000000001101100000000 -00011100000000000000101100111100 -00011100000000000001101100000000 -00011100000000000001011001111100 -00011100000000000001011011101100 -00011100000000000001011101100000 -00011100000000000000101101010100 -00011100000000000001101100000000 -00011100000000000001011110011100 -00011100000000000000101000010000 -00011100000000000001100000111100 -00011100000000000001101100000000 -00011100000000000001101100000000 -00011100000000000001100100001000 -00011100000000000001101100000000 -00011100000000000000101000010000 +00011100000000000001101101100000 +00011100000000000001011011011100 +00011100000000000001011101001100 +00011100000000000001011111000000 +00011100000000000000101110110100 +00011100000000000001101101100000 +00011100000000000001011111111100 +00011100000000000000101001110000 +00011100000000000001100010011100 +00011100000000000001101101100000 +00011100000000000001101101100000 +00011100000000000001100101101000 +00011100000000000001101101100000 +00011100000000000000101001110000 00110000001100000011000000110000 00110000001100000011000000110000 00110000001100000011000000110000 @@ -10166,38 +10190,38 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -11111111111110000110100011011000 -11111111111110000110011010000100 -11111111111110000110011110000000 -11111111111110000110011011100000 -11111111111110000110011110000000 -11111111111110000110100010100000 -11111111111110000110011110000000 -11111111111110000110011011100000 -11111111111110000110011010000100 -11111111111110000110011010000100 -11111111111110000110100010100000 -11111111111110000110011011100000 -11111111111110000110011011110000 -11111111111110000110011011110000 -11111111111110000110011011110000 -11111111111110000110100010111000 -11111111111110000111001101101000 -11111111111110000111000101101000 -11111111111110000111000101101000 -11111111111110000111000101100100 -11111111111110000111000101110100 -11111111111110000111000101110100 -11111111111110000111001100110000 -11111111111110000111000101100100 -11111111111110000111000101110100 -11111111111110000111001100110000 -11111111111110000111000101110100 -11111111111110000111000101100100 -11111111111110000111001100101000 -11111111111110000111001100101000 -11111111111110000111001100101000 -11111111111110000111001101001000 +11111111111110000110100100111000 +11111111111110000110011011100100 +11111111111110000110011111100000 +11111111111110000110011101000000 +11111111111110000110011111100000 +11111111111110000110100100000000 +11111111111110000110011111100000 +11111111111110000110011101000000 +11111111111110000110011011100100 +11111111111110000110011011100100 +11111111111110000110100100000000 +11111111111110000110011101000000 +11111111111110000110011101010000 +11111111111110000110011101010000 +11111111111110000110011101010000 +11111111111110000110100100011000 +11111111111110000111001111001000 +11111111111110000111000111001000 +11111111111110000111000111001000 +11111111111110000111000111000100 +11111111111110000111000111010100 +11111111111110000111000111010100 +11111111111110000111001110010000 +11111111111110000111000111000100 +11111111111110000111000111010100 +11111111111110000111001110010000 +11111111111110000111000111010100 +11111111111110000111000111000100 +11111111111110000111001110001000 +11111111111110000111001110001000 +11111111111110000111001110001000 +11111111111110000111001110101000 00000010000000100000000100000000 00000011000000110000001100000011 00000100000001000000010000000100 @@ -10263,7 +10287,7 @@ 00001000000010000000100000001000 00001000000010000000100000001000 10111111000000000000000000000000 -00011100000010000000111110100000 +00011100000010000000111110110000 00011100000010000000111100101000 00011100000010000000111010111000 00011100000010000000111001001000 @@ -10326,8 +10350,8 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 +00011100000000000101100001100100 00011100000000000101100000000100 -00011100000000000101011110100100 00000000000000000000000000000000 00011100000010000000100000101111 00011100000010000000011110101100 @@ -10367,21 +10391,21 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -00011100000000000100101100111100 +00011100000000000100101110011100 00011100000010000000101010110000 00011100000010000000110010101100 00011100000010000000011011011000 -00011100000000000101000000010100 +00011100000000000101000001110100 00011100000010000000011010110000 -00011100000000000100110100011100 +00011100000000000100110101111100 00011100000010000000101010111100 -00011100000000000100110010111100 -00011100000000000100101011010100 -00011100000000000100101110011100 +00011100000000000100110100011100 +00011100000000000100101100110100 +00011100000000000100101111111100 00011100000011110000000000000000 00011100000010000000111001000000 00011100000010000000100110110000 -00011100000010000000111110100000 +00011100000010000000111110110000 00011100000010000000101011000100 00011100000010000000110010101000 00011100000010000000101011010000 diff --git a/sdk/software/bsp/env/trap_handler.S b/sdk/software/bsp/env/trap_handler.S index c55bb8b..07e3e24 100644 --- a/sdk/software/bsp/env/trap_handler.S +++ b/sdk/software/bsp/env/trap_handler.S @@ -153,12 +153,18 @@ handle_hwi0: b trap_jump_exit -# HWI1 处理程序 +# HWI1 处理程序 - DMA完成 handle_hwi1: + + bl DMA_IntrHandler + b trap_jump_exit -# HWI2 处理程序 +# HWI2 处理程序 - Matmul完成 handle_hwi2: + + bl MATMUL_IntrHandler + b trap_jump_exit # HWI3 处理程序 @@ -186,3 +192,13 @@ handle_hwi7: HWI0_IntrHandler: 1: b 1b + +.weak DMA_IntrHandler +DMA_IntrHandler: +1: + b 1b + +.weak MATMUL_IntrHandler +MATMUL_IntrHandler: +1: + b 1b diff --git a/sdk/software/examples/asm/user-sample.c b/sdk/software/examples/asm/user-sample.c index 129e6a3..84bdd42 100644 --- a/sdk/software/examples/asm/user-sample.c +++ b/sdk/software/examples/asm/user-sample.c @@ -99,16 +99,43 @@ static const uint32_t crc32_table[256] = { 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D }; -/* ─── Poll IP STATUS until done and clear it (W1C) ────────────────── */ -static void wait_matmul_done(void) +static volatile int matmul_done_flag = 0; +static volatile int dma0_done_flag = 0; +static volatile int dma1_done_flag = 0; + +void MATMUL_IntrHandler(void) { - uint32_t status; - do { - status = REG_RD(MATMUL_STATUS); - } while (!(status & (STATUS_DONE | STATUS_ERROR))); - - // Write 1 to Clear the DONE bit - REG_WR(MATMUL_STATUS, STATUS_DONE); + matmul_done_flag = 1; + REG_WR(MATMUL_STATUS, STATUS_DONE); // W1C: deassert intr +} + +void DMA_IntrHandler(void) +{ + if (DMA_CH(0)->STATUS & STATUS_DONE_BIT) { + dma0_done_flag = 1; + DMA_CH(0)->STATUS = STATUS_DONE_BIT; + } + if (DMA_CH(1)->STATUS & STATUS_DONE_BIT) { + dma1_done_flag = 1; + DMA_CH(1)->STATUS = STATUS_DONE_BIT; + } +} + +static void wait_matmul_done_intr(void) +{ + while (!matmul_done_flag) { } + matmul_done_flag = 0; +} + +static void wait_dma_done_intr(int ch) +{ + if (ch == 0) { + while (!dma0_done_flag) { } + dma0_done_flag = 0; + } else { + while (!dma1_done_flag) { } + dma1_done_flag = 0; + } } /* ─── CRC32 over ExtRAM result region ─────────────────────────────── */ @@ -152,7 +179,7 @@ int main(void) /* ── Prologue: 第0组数据初始化 ────────────────────────── */ // DMA Ch0: 从 ExtRAM 将 Group 0 的 A、B (128 bytes) 搬入 IP 的 Bank 0 dma_start_transfer(0, EXTRAM_PHYS_AB(0), phys_bank_AB[0], 128, 10); - dma_wait_polling(0); // 必须等待首个数据加载完成 + wait_dma_done_intr(0); // 启动 IP Bank 0 计算 REG_WR(MATMUL_CTRL, ctrl_start[0]); @@ -170,30 +197,30 @@ int main(void) dma_start_transfer(0, EXTRAM_PHYS_AB(g), phys_bank_AB[cur_bank], 128, 10); // 2. 等待上一组在 IP 中的计算完成 - wait_matmul_done(); + wait_matmul_done_intr(); // 3. 确保上一次的结果写回 (Channel 1) 已经空闲 if (g > 1) { - dma_wait_polling(1); + wait_dma_done_intr(1); } // 4. 发起写回刚才计算完成的结果 (Channel 1: IP -> Memory) dma_start_transfer(1, phys_bank_C[prev_bank], EXTRAM_PHYS_C(g - 1), 192, 20); // 5. 确保当前要计算的输入数据 (Channel 0) 已经加载完毕 - dma_wait_polling(0); + wait_dma_done_intr(0); // 6. 立即启动当前组在 IP 中的计算 REG_WR(MATMUL_CTRL, ctrl_start[cur_bank]); } /* ── Epilogue: 收尾最后一组 ───────────────────────────── */ - wait_matmul_done(); // 等待最后一次计算完成 - dma_wait_polling(1); // 确保之前的 DMA CH1 空闲 + wait_matmul_done_intr(); // 等待最后一次计算完成 + wait_dma_done_intr(1); // 确保之前的 DMA CH1 空闲 // DMA CH1 将最后一组结果写回 dma_start_transfer(1, phys_bank_C[(MATMUL_GROUP_NUM - 1) % 2], EXTRAM_PHYS_C(MATMUL_GROUP_NUM - 1), 192, 20); - dma_wait_polling(1); // 必须等待最后一组写回完成 + wait_dma_done_intr(1); /* ── CRC32 over result region ─────────────────────────────── */ crc = compute_crc32(extram); diff --git a/sdk/user-sample.bin b/sdk/user-sample.bin index 42cd779..1248557 100755 Binary files a/sdk/user-sample.bin and b/sdk/user-sample.bin differ