diff --git a/rtl/ip/matmul/matmul_axi_slave.v b/rtl/ip/matmul/matmul_axi_slave.v index 7b574ef..d33bdfe 100644 --- a/rtl/ip/matmul/matmul_axi_slave.v +++ b/rtl/ip/matmul/matmul_axi_slave.v @@ -341,8 +341,6 @@ module matmul_axi_slave ( if (c0_part == 2'd0) s_axi_rdata = target_c0[31:0]; else if (c0_part == 2'd1) s_axi_rdata = target_c0[63:32]; else s_axi_rdata = {30'b0, target_c0[65:64]}; - $display("RCH B0_C off=%h elem=%d part=%d data=%h raw=%h", - current_r_offset, c0_elem, c0_part, s_axi_rdata, target_c0); end else if (current_r_offset >= ADDR_B1_A && current_r_offset < ADDR_B1_B) s_axi_rdata = b1_a[(current_r_offset - ADDR_B1_A) >> 2]; @@ -352,8 +350,6 @@ module matmul_axi_slave ( if (c1_part == 2'd0) s_axi_rdata = target_c1[31:0]; else if (c1_part == 2'd1) s_axi_rdata = target_c1[63:32]; else s_axi_rdata = {30'b0, target_c1[65:64]}; - $display("RCH B1_C off=%h elem=%d part=%d data=%h raw=%h", - current_r_offset, c1_elem, c1_part, s_axi_rdata, target_c1); end end end @@ -449,10 +445,6 @@ module matmul_axi_slave ( else b1_c[calc_idx] <= ({2'b0, mult_p_r[0]} + {2'b0, mult_p_r[1]}) + ({2'b0, mult_p_r[2]} + {2'b0, mult_p_r[3]}); - $display("ACCUM calc_idx=%d expr=%h", - calc_idx, - ({2'b0, mult_p_r[0]} + {2'b0, mult_p_r[1]}) + - ({2'b0, mult_p_r[2]} + {2'b0, mult_p_r[3]})); if (calc_idx == 4'd15) begin calc_done_pulse <= 1'b1; diff --git a/sdk/axi_ram.mif b/sdk/axi_ram.mif index 2df5c46..40c859e 100644 --- a/sdk/axi_ram.mif +++ b/sdk/axi_ram.mif @@ -52,7 +52,7 @@ 00000011100000000110000000001101 00000100000000000000000110101100 00011100000000000000000100101100 -00000010100011111011000110001100 +00000010100100110111000110001100 00011100000000000001000000001101 00000010101111001001000110101101 00011100000000000001000000101110 @@ -94,7 +94,7 @@ 00000000000101010000000000001110 00101001000000000001000110101110 00011100000000000000000000001100 -00000010100011010001000110001100 +00000010100011110001000110001100 00000100000000000011000000101100 00000011100000000000010000001101 00000100000000010001000000101101 @@ -142,162 +142,194 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -00000010101110100100000001100011 +00010100001111101010000000001100 +00000010101111101000000001100011 +00000011100001000000000110010001 +00000011100011000000000110010000 +00000011100001100000000110001111 +00000010100000000000010000001110 +00000010100000000000100000001101 +00000011100011100000000110001100 00011100000000000001000000000100 -00000010101101101111000010000100 -00101001100001011011000001100001 -00101001100001011010000001110111 -00101001100001011001000001111000 -00101001100001011000000001111001 -00101001100001010111000001111010 -00101001100001010110000001111011 -00101001100001010101000001111100 -00101001100001010100000001111101 -01010100000001000101010000000000 -00010101011111101010000000001010 -00010100100000010101111111110100 -00000010100000100100000001110000 -00000010100000010100000001110010 -00010101011110001000000000000001 -00000010100111100000000000010111 -00000010100000000100000001101011 -00000011100000001000000101000101 -00000011100000011000000101000100 -00000011101111011000001010010100 -00000000000100010100000000001001 -00000000000100010100100000001000 -00000000000100010100001011110111 -00000000000101010000001000000111 -00000010100001010100000001110001 -00000011100000010000000000111011 -00000000000100010010110010100101 -00000000000100010100100010000100 -00000011100000000001000101010011 -00000010100000000001100000011010 -00000000000100000101001000010100 -00000010100000000000010000011001 -00000011100001011000000101000110 -00000011100101000000000000111000 -00000000000101010000001001001100 -00000000000101010000000101101101 -00000000000100000000010100011101 -00000000000100000110110100011100 -00000000000100000011001110101111 -00000000000100000011001110001110 -00101000100000000000000111101111 -00101000100000000000000111001110 -00000010100000000001000110101101 -00000010100000000001000110001100 -00101001101111111111000110101111 -00101001101111111111000110001110 -01011111111111111110001001001101 -00000000000101010000000101101100 -00101000100000000000000110001110 -00000000000100000011000010101101 -00000010100000000001000110001100 -00101001100000000000000110101110 -01011111111111111111001001001100 -00000000000101010000001001001100 -00101000100000000000000110001110 -00000000000100000011000010001101 -00000010100000000001000110001100 -00101001100000000000000110101110 -01011111111111111111000011101100 -00101001100000000000001001111010 -00101001100000000000000101011001 -00000011010000000000000000000000 -00101000100000000000001001101100 +00000010101101101000000010000100 +00101001100000001000000001101111 +00101001100000001001000001101100 +00101001100000010111000001100001 +00101001100000000110000001110001 +00101001100000000111000001110000 +00101001100000001010000001101110 +00101001100000001011000001101101 +00101001100000010101000001110111 +00101001100000010100000001111000 +00101001100000010010000001111010 +00101001100000010001000001111011 +00101001100000010000000001111100 +00101001100000001111000001111101 +00101001100000001110000001111110 +00101001100000001101000001111111 +00010101011111101010000000011000 +00101001100000010110000001110110 +00101001100000010011000001111001 +01010100000001010000000000000000 +00000010100000000001100000001100 +00000011100000000001001100010111 +00101001100000000000001011101100 +00101000100000000110000001100110 +00000010100000000010100000001000 +00000010100000100000000000000111 +00010100001110001000000000000101 +00000000000101010000000000000100 +01010100000001000110110000000000 +00000000000101010000000000000100 +01010100000001001010010000000000 +00101000100000001010000001101100 +00010100001110001000000000011010 +00000011100101000000001101011011 +00000010100000000000010000011111 +00010101011111101010000000011110 +00000010100000000000100000011101 +00000010100000000000010000011100 +00000011100000100000001101011010 +00101001100000000000001100001100 +00000011010000000000011111111001 +00000000010000001000101100111001 +00000010100000001100000001101100 +00000000000100000110010110001100 +00101000101111111010000110000110 +00000010101111111111111111111000 +00000010100000000010100000001000 +00000010100000100000000000000111 +00000000000101010000001101000101 +00000000000101010000000000000100 +00000011010000000000011100011000 +01010100000001000001000000000000 +00101000100000000000001011101100 00000011010000000001100110001100 01011011111111111111100110000000 -00000011100000101000000101001100 -00101000100000000000000110001110 -00000000000100000011001010001101 -00000010100000000001000110001100 -00101001100000000000000110101110 -01011111111111111111000110000110 -00000000000101010000001000001100 -00000000000100000110000100101111 -00000011010000000000000000000000 -00101000100000000000000110001110 -00000000000100000011000111101101 -00000010100000000001000110001100 -00101001100000000000000110101110 -01011111111111111111001000101100 -00000010100000110000000100101001 -00000010100000100000000100001000 -01011111111111110100010100110111 -00010101011110001000000000010010 -00000000000101010000001100010000 -00000010101111111111110000001101 -00011100000000000001000000010001 -00000010101100100110001000110001 -00000011101100100000001001010010 -00101000100000000000001000001100 -00000000010001001010000110110011 -00000010100000000001001000010000 -00000000000101011011000110101101 -00101001100000000011000001101101 -00101010000000000011000001101101 -00000000010001001010000110001111 -00000000010001001100000110001110 -00000000010000001000100110101101 -00000000000100000011011000101101 -00101000100000000000000110100101 +00101001100000000000001011111101 +00000010100000000000011111110110 +01011000000000000110001111111100 +00000010100000000000010000000100 +01010100000001000011000000000000 +00000010100000001100000001101100 +00000000010000001000101100011000 +00000000000100000110000110011000 +00101000101111111100001100000101 +00000010100000000101000000001000 +00000010100000110000000000000111 +00000000000101010000001101100110 +00000010100000000000010000000100 +01010100000000111100110000000000 +00000000000101010000000000000100 +01010100000001000000010000000000 +00000010100000001100000001101100 +00000000000100000110010110011001 +00101000101111111110001100101101 +00000010100000000010100000001100 +00101001100000000000001111001101 +01011000000000000100111011001100 +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 +00101000100000001001000001100101 +00010100001110001000000000000110 +00000010100000000101000000001000 +00000010100000110000000000000111 +00000011101011110000000011000110 +00000010100000000000010000000100 +01010100000000110010010000000000 +00000010100000000000010000000100 +01010100000000110101110000000000 +00010101011110001000000000010001 +00000011100101000000001000101111 +00000010101111111111110000000101 +00011100000000000001000000010000 +00000010101100000000001000010000 +00000011101100100000001000110001 +00101000100000000000000111101100 +00000000010001001010000010110010 +00000010100000000001000111101111 +00000000000101011011000010100101 +00101001100000000011000001100101 +00101010000000000011000001100101 +00000000010001001010000110001110 +00000000010001001100000110001101 +00000000010000001000100010100101 +00000000000100000001011000000101 +00101000100000000000000010100101 00000000010001001110000110001100 -00000000000101011100110010100101 -00000000000101011011110010101101 -00101001100000000011000001101101 -00101010000000000011000001101101 -00000000010001001010000010101111 -00000000010000001000100110101101 -00000000000100000011011000101101 -00101000100000000000000110100101 -00000000000101011011110010100101 -00000000000101011011100010101101 +00000000000101011100100010100101 +00000000000101011011100010101110 +00101001100000000011000001101110 +00101010000000000011000001101110 +00000000010001001010000010110010 +00000000010000001000100111001110 +00000000000100000011101000001110 +00101000100000000000000111000101 +00000000000101011100100010100101 +00000000000101011011010010101101 00101001100000000011000001101101 00101010000000000011000001101101 00000000010001001010000010101110 00000000010000001000100110101101 -00000000000100000011011000101101 +00000000000100000011011000001101 00101000100000000000000110100101 00000000000101011011100010100101 00000000000101011001010110001100 00000011010000111111110110001100 00000000010000001000100110001100 -00000000000100000011001000101100 +00000000000100000011001000001100 00000000010001001010000010101101 00101000100000000000000110000101 -00000000000101011011010010101101 -01011111111111110111001000010010 -00000000000101000011010000000101 +00000000000101011011010010100101 +01011111111111110111000111110001 +00000000000101000001010000000101 00011100000000000001000000000100 -00000010101011110100000010000100 -01010100000000100111100000000000 +00000010101011001110000010000100 +01010100000000101101000000000000 00011100000000000001000000000100 -00000010101011110110000010000100 -01010100000000100110110000000000 -00101000100001011011000001100001 -00101000100001011010000001110111 -00101000100001011001000001111000 -00101000100001011000000001111001 -00101000100001010111000001111010 -00101000100001010110000001111011 -00101000100001010101000001111100 -00101000100001010100000001111101 +00000010101011010000000010000100 +01010100000000101100010000000000 +00101000100000010111000001100001 +00101000100000010110000001110110 +00101000100000010101000001110111 +00101000100000010100000001111000 +00101000100000010011000001111001 +00101000100000010010000001111010 +00101000100000010001000001111011 +00101000100000010000000001111100 +00101000100000001111000001111101 +00101000100000001110000001111110 +00101000100000001101000001111111 00000000000101010000000000000100 -00000010100001011100000001100011 +00000010100000011000000001100011 01001100000000000000000000100000 00000011010000000000000000000000 00000011010000000000000000000000 -00000011010000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 -00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 @@ -430,9 +462,37 @@ 00000011010000000000000000000000 00000011010000000000000000000000 00000011010000000000000000000000 +00010101011111100110000000001100 +00000000010000001001100010000100 +00000000000100000011000010000100 +00101000100000000101000010001100 +00000011010000000000010110001100 +01011100000000000001110110000000 +00101001100000000000000010000101 +00000011101111110100010000001100 +00101001100000000001000010000110 +00101001100000000010000010000111 +00101001100000000011000010001000 +00101001100000000100000010001100 +01001100000000000000000000100000 +00000011010000000000000000000000 +00000011010000000000000000000000 +00000011010000000000000000000000 +00000000010000001001100010000100 +00010101011111100110000000001100 +00000000000100000011000010000100 +00000011010000000000000000000000 +00101000100000000101000010001100 +00000011010000000000100110001100 +01011011111111111111100110000000 +00000010100000000000100000001100 +00101001100000000101000010001100 +01001100000000000000000000100000 +00000011010000000000000000000000 +00000011010000000000000000000000 00000010101111110000000001100011 00011100000000000001000000001100 -00101000100101101011000110001100 +00101000100100101111000110001100 00101001100000001001000001100101 00101001100000001010000001100110 00000000000101010000000010000101 @@ -470,7 +530,7 @@ 00101001100000001110000001101100 01010100001111110101100000000000 00011100000000000001000000001100 -00101000100101001010000110001100 +00101000100100001110000110001100 00101000100000000000000110001100 00101001100000000110000001100100 00101001010000011101000001100000 @@ -539,7 +599,7 @@ 01101000000100011010101000101110 00000000010000001000100111001110 00011100000000000001000000001101 -00000010101100000010000110101101 +00000010101011000110000110101101 00000000000100000011100110101110 00101000100000000000000111001110 01001100000000000000000111000000 @@ -769,11 +829,11 @@ 00101001000000011100110001101101 00101000100000000010000001101110 00000010100000010001110000001101 -00011100000000000001000000011000 -00000010101000001010001100011000 +00011100000000000000111111111000 +00000010100111001110001100011000 01100100000000000000110110101110 -00011100000000000001000000011000 -00000010101000001000001100011000 +00011100000000000000111111111000 +00000010100111001100001100011000 00000010101111011111110000001101 00000000000101001011011011110111 00000000000101010000000000010110 @@ -806,10 +866,10 @@ 00101000100000000010000001101110 00000010100000010001110000001101 00011100000000000000111111111000 -00000010100111101000001100011000 +00000010100110101100001100011000 01100100000000000000110110101110 00011100000000000000111111111000 -00000010100111100110001100011000 +00000010100110101010001100011000 00000010101111011111110000001101 00000000000101001011011011110111 00000000000101010000000000001111 @@ -838,8 +898,8 @@ 00000000000100010011100110110000 01100100000000000110010000010000 00000010100000000100000000000110 -00011100000000000001000000010100 -00000010101000110101001010010100 +00011100000000000000111111110100 +00000010100111111001001010010100 00000010100000000001110000000111 00101000100000100110000001110010 00101000100000100101000001110001 @@ -913,7 +973,7 @@ 01100100000000000110010000011110 00000010100000000100000000010011 00011100000000000000111111101101 -00000010100111100111000110101101 +00000010100110101011000110101101 00000010100000000001110000010100 00101000100000100110000001110001 00101000100000100101000001110000 @@ -939,7 +999,7 @@ 01100100000000000101110000011110 00000010100000000100000000010010 00011100000000000000111111101101 -00000010100111001101000110101101 +00000010100110010001000110101101 00000010100000000001110000010011 00101000100000100110000001101111 00101000100000100101000001110000 @@ -1031,7 +1091,7 @@ 00101001100000010110000001101100 01010100000101000110100000000000 00011100000000000000111111101110 -00000010100101111010000111001110 +00000010100100111110000111001110 00101000100000000000000111000110 00101000100000000001000111000111 01010100011010001011000000000000 @@ -1047,12 +1107,12 @@ 00101000100000000010000001101101 00000010100000011000010000001110 00011100000000000000111111111100 -00000010100011111001001110011100 +00000010100010111101001110011100 01011000000000000000110110101110 00011100000000000000111111111100 -00000010100011111011001110011100 +00000010100010111111001110011100 00011100000000000000111111101110 -00000010100101100111000111001110 +00000010100100101011000111001110 00101000100000000001000111001111 00101000100000000000000111001110 00000010101111111111111101011111 @@ -1092,7 +1152,7 @@ 00101000100000010111000001101100 01011111111111111000010010000000 00011100000000000000111111111111 -00000010100101000001001111111111 +00000010100100000101001111111111 00101000100000000000001111100110 00101000100000000001001111100111 00101000100000001010000001100100 @@ -1438,7 +1498,7 @@ 00101001100000000100000001101101 00010100000000000000000011101110 00011100000000000000111111101101 -00000010101101110010000110101101 +00000010101100110110000110101101 00000011101000001100000111001110 00101001100000010001000001101101 00000010100000011110000000001101 @@ -1463,7 +1523,7 @@ 00000000000101010000000000011011 00000000000101010000000000011111 00011100000000000000111111111000 -00000010101101100011001100011000 +00000010101100100111001100011000 01010011111101011110011111111111 00000010101111111111110000001110 00101001100000001010000001101100 @@ -1516,7 +1576,7 @@ 00101010000000000000001101111111 01010011111111111110111111111111 00011100000000000000111111101101 -00000010101100101001000110101101 +00000010101011101101000110101101 00101001100000010001000001101101 00000011010000001000001011101110 01011000000000000110000111000000 @@ -1541,7 +1601,7 @@ 00000010100000000000100000001110 01010011111111100001101111111111 00011100000000000000111111101101 -00000010101100001011000110101101 +00000010101011001111000110101101 01010011111111111001111111111111 00000010100000000001001101101101 00101001100000000100000001101101 @@ -1688,7 +1748,7 @@ 00000010100000100111000001110011 00000010100000000001110000000111 00011100000000000000111111110100 -00000010101011100100001010010100 +00000010101010101000001010010100 00000010100000000100000000000110 00000010101111111100001000010000 00000000000101010000001001101100 @@ -1707,7 +1767,7 @@ 00000010100000100111000001110010 00000010100000000001110000010100 00011100000000000000111111101101 -00000010101011001101000110101101 +00000010101010010001000110101101 00000010100000000100000000010011 00000010101111111100001111011110 00000000000101010000001001001100 @@ -1724,7 +1784,7 @@ 00000010100000100111000001110001 00000010100000000001110000010011 00011100000000000000111111101101 -00000010101010111100000110101101 +00000010101010000000000110101101 00000010100000000100000000010010 00000010101111111100001111011110 00000000000101010000001000101100 @@ -1743,7 +1803,7 @@ 00101000100000000010000001101100 01011100000000010111010010000000 00011100000000000000111111101101 -00000010101001001101000110101101 +00000010101000010001000110101101 00101001100000000000000110001101 00000010100000000000010000001101 00101001100000000001000110001101 @@ -1787,7 +1847,7 @@ 01100100000000000100100000011000 00000010100000000100000000011011 00011100000000000000111111111010 -00000010101001111101001101011010 +00000010101001000001001101011010 00000010100000000001110000011101 00101000100000100110000001101110 00101000100000100101000001101101 @@ -1837,7 +1897,7 @@ 00101000100000011110000001101101 01100000000000010101010000001101 00011100000000000000111111001101 -00000010100111101111000110101101 +00000010100110110011000110101101 00101001100000000000000110001101 00000010100000000000010000001101 00101001100000000001000110001101 @@ -1882,8 +1942,8 @@ 00000000000100010110100000011010 00000000000101010000000110001110 00000010100000000100000000011101 -00011100000000000000111111111011 -00000010101000011101001101111011 +00011100000000000000111111011011 +00000010100111100001001101111011 00000010100000000001110000011110 00101000100000100110000001101111 00101000100000100101000001101101 @@ -1945,7 +2005,7 @@ 01100100000000000101110000011010 00000010100000000100000000001110 00011100000000000000111111011110 -00000010100111011111001111011110 +00000010100110100011001111011110 00000010100000000001110000010001 00101000100000100110000001101111 00101000100000100101000001101101 @@ -1972,7 +2032,7 @@ 00000010100000000001110000011110 00101001100000000010000001101101 00011100000000000000111111011111 -00000010100111000100001111111111 +00000010100110001000001111111111 01011100000000011000001101100000 01011100000000011000001110100000 00000000000100000111001100001101 @@ -2033,7 +2093,7 @@ 01100111111111000111000000011000 00000010100000000100000000011011 00011100000000000000111111011010 -00000010100110000111001101011010 +00000010100101001011001101011010 00000010100000000001110000011101 00101000100000100110000001101110 00101000100000100101000001101101 @@ -2247,7 +2307,7 @@ 01100111111111111100010000011011 00000010100000000100000000011101 00011100000000000000111111011000 -00000010100010110001001100011000 +00000010100001110101001100011000 00000010100000000001110000011110 00101000100000100110000001101100 00101000100000100101000001101101 @@ -2286,7 +2346,7 @@ 01100111111110001000010000010111 00000010100000000100000000011010 00011100000000000000111111011000 -00000010100010001110001100011000 +00000010100001010010001100011000 00000010100000000001110000011011 00101000100000100110000001101110 00101000100000100101000001101101 @@ -2364,7 +2424,7 @@ 00000000000101010000000010101110 01011100000000000010111000000000 00011100000000000000111111001100 -00000010100001001011000110001100 +00000010100000001111000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010100111101110000000000 @@ -2408,7 +2468,7 @@ 00000010101111111111000010001101 00101001100000000000000010000000 00011100000000000000111111001110 -00101000100110111100000111001110 +00101000100110000000000111001110 00101000100000000000000111001100 01011100000000000001000110000000 00101001100000000000000010001100 @@ -2434,7 +2494,7 @@ 01001100000000000000000000100000 01011100000000000001100110001101 00011100000000000000111111001100 -00101000100110010100000110001100 +00101000100101011000000110001100 00000010100000000011000000001101 00101001100000000000000110001101 01001100000000000000000000100000 @@ -2464,7 +2524,7 @@ 00000010101111111110000000001100 00000000000100000101110010010111 00011100000000000000111111011010 -00000010100110000111001101011010 +00000010100101001011001101011010 00000000000101001011001100011000 00101001100000000000001101010111 00000010101111111111001100011000 @@ -2476,7 +2536,7 @@ 00000000000100000110011011110111 00101001100000000000001101010111 00011100000000000000111111001100 -00000010100101111100000110001100 +00000010100101000000000110001100 00101000100000000000000110001101 01011111111111111000100110100000 00101001100000000000000110011000 @@ -2484,7 +2544,7 @@ 00000010101111111100000001100011 00101001100000000010000001110111 00011100000000000000111111001100 -00000010100101110011000110001100 +00000010100100110111000110001100 00101000100000000000000010010111 00101000100000000000000110001100 00101001100000000000000001111001 @@ -2527,7 +2587,7 @@ 00000010101111111010110000001100 01101100000000000011100110000100 00011100000000000000111111001100 -00101000100100110111000110001100 +00101000100011111011000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000010111 @@ -2544,7 +2604,7 @@ 00000000000101001001001100011000 00000010100000000010001100011001 00011100000000000000111111011010 -00000010100100111001001101011010 +00000010100011111101001101011010 00101000100000000000001101010111 01011100000000000001111011100000 00000000000101010000001100100100 @@ -2736,7 +2796,7 @@ 01011000000011111111011101000000 00101000100000000111000001101101 00011100000000000000111111001100 -00000010101011011100000110001100 +00000010101010100000000110001100 00101001100000000001000001101100 01011000000000000001000110100000 00000010100000000000110110001100 @@ -2772,7 +2832,7 @@ 00101001100000000000000110101100 00101000100000000111000001101101 00011100000000000000111111001100 -00000010101001001000000110001100 +00000010101000001100000110001100 00101001100000000001000001101100 01011011111111111000000110100000 00101000100000000111000001101110 @@ -2801,17 +2861,17 @@ 00000010101100000000011100011000 00101001100000010010000001100000 00011100000000000000111111001100 -00000010101010011100000110001100 +00000010101001100000000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010100111011100000000000 00011100000000000000111111001100 -00000010101010011001000110001100 +00000010101001011101000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010011001111010000000000 00011100000000000000111111001100 -00000010101010010110000110001100 +00000010101001011010000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100001110000111000000000000 @@ -2820,7 +2880,7 @@ 00000000000101010000000010111011 01010100010111011001000000000000 00011100000000000000111111001100 -00000010101010001111000110001100 +00000010101001010011000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010011001011110000000000 @@ -2852,7 +2912,7 @@ 01101000000000000011010110010110 00000000010000001000111011001101 00011100000000000000111111001100 -00101000101111110011000110001100 +00101000101110110111000110001100 00000000000100000011010110001100 00101000100000000000000110000110 00101000100000000001000110000111 @@ -2973,7 +3033,7 @@ 00000000010000001000110110001101 00000000010010001001001011011101 00011100000000000000111111001100 -00101000101101111010000110001100 +00101000101100111110000110001100 00000000000100000011010110001100 00000011010000000100001110101110 00101000100000000001000110001101 @@ -2981,7 +3041,7 @@ 00101000100000000000000110001100 01011000000000000100000111000000 00011100000000000000111111001110 -00101000101101110100000111001110 +00101000101100111000000111001110 00101000100000001000000111000110 00101000100000001001000111000111 00101000100000001011000001100100 @@ -2996,7 +3056,7 @@ 00000000000101010000000010111100 00000010100000000000110000011000 00011100000000000000111111011110 -00101000101101100101001111011110 +00101000101100101001001111011110 01010000000000000011010000000000 00000011010000000000011110101111 01011000000000000010010111100000 @@ -3025,7 +3085,7 @@ 00000011010000000011111110101100 00000000010000001000110110001101 00011100000000000000111111001100 -00101000101101000110000110001100 +00101000101100001010000110001100 00000000000100000011010110001100 00101000100000000000000110000110 00101000100000000001000110000111 @@ -3033,7 +3093,7 @@ 00101000100000001110000001100101 00000000010010001001001110111101 00011100000000000000111111011110 -00101000101101000000001111011110 +00101000101100000100001111011110 01010100010010010111000000000000 00000000000101010000000010011001 00000000000101010000000010111100 @@ -3043,7 +3103,7 @@ 00101000100000001111000001101100 01011000000000011100110110000000 00011100000000000000111110101110 -00000010100110110010000111001110 +00000010100101110110000111001110 00101000100000000000000111000110 00101000100000000001000111000111 00000000000101010000001100100100 @@ -3055,7 +3115,7 @@ 00101000100000000100000001101100 01100100000000001110010000001100 00011100000000000000111110101110 -00000010100110101000000111001110 +00000010100101101100000111001110 00101000100000001000000001101101 00101000100000000000000111000110 00101000100000000001000111000111 @@ -3080,7 +3140,7 @@ 00000000000101010000000110100111 01010100010010001100000000000000 00011100000000000000111110101111 -00000010100110010001000111101111 +00000010100101010101000111101111 00101000100000000000000111100110 00101000100000000001000111100111 01010100001101000011110000000000 @@ -3088,7 +3148,7 @@ 00000000000100000001011100011000 01011100000000010011001111000000 00011100000000000000111110101100 -00000010100110001011000110001100 +00000010100101001111000110001100 00101000100000010001000001101110 00101000100000001100000001101101 00101000100000000000000110000110 @@ -3118,7 +3178,7 @@ 01100000000001000010110110110110 00000000010000001000111011001101 00011100000000000000111111001100 -00101000101011101001000110001100 +00101000101010101101000110001100 00000000000100000011010110001100 00101000100000000000000110011010 00101000100000000001000110011011 @@ -3127,7 +3187,7 @@ 01100000000000101100000000011111 01011100000001110010001111100000 00011100000000000000111110101100 -00000010100101100100000110001100 +00000010100100101000000110001100 00101000100000000000000110000110 00101000100000000001000110000111 00000000000101010000001101000100 @@ -3169,23 +3229,23 @@ 00101001100000010001000001101100 00101000100000000110000001101100 00011100000000000000111111001101 -00101000101010110110000110101101 +00101000101001111010000110101101 00000000000100000011100110101101 00101000100000000000000110100110 00101000100000000001000110100111 01011000000000001111110110000000 00011100000000000000111110101100 -00000010100100011110000110001100 +00000010100011100010000110001100 00101000100000000000000110000100 00101000100000000001000110000101 00101001100000001100000001111000 00011100000000000000111110111000 -00000010100100101011001100011000 +00000010100011101111001100011000 01010100001111000000010000000000 00101000100000001100000001101111 00000000000101010000001100100110 00011100000000000000111110111001 -00000010100100100100001100111001 +00000010100011101000001100111001 00000000000101010000000111100111 01010100010011011011110000000000 00101000100000000001000001111110 @@ -3261,7 +3321,7 @@ 00000000000101010000000010111001 01011100000000001000011110001100 00011100000000000000111110111100 -00000010100011001000001110011100 +00000010100010001100001110011100 00101000100000000000001110000110 00101000100000000001001110000111 00101000100000001100000001100100 @@ -3293,7 +3353,7 @@ 00000000000101010000000111011110 01010011111111111110101111111111 00011100000000000000111110101100 -00000010100010111010000110001100 +00000010100001111110000110001100 00101000100000000000000110000110 00101000100000000001000110000111 01010100010001010101100000000000 @@ -3370,7 +3430,7 @@ 00000000000101010000000110011110 01010011111111111100111111111111 00011100000000000000111110101100 -00000010100001101101000110001100 +00000010100000110001000110001100 00101000100000000000000110000110 00101000100000000001000110000111 00000010100000000000011100011000 @@ -3756,7 +3816,7 @@ 01010011111111010010101111111111 00101000100000000111000001101101 00011100000000000000111110101100 -00000010101011011101000110001100 +00000010101010100001000110001100 00101001100000000001000001101100 00000010100000000010000110001100 01011111111100000001010110100000 @@ -3789,13 +3849,13 @@ 00000010101111111100000001100011 00101001100000000010000001110111 00011100000000000000111110110111 -00000010100001100000001011110111 +00000010100000100100001011110111 00101000100000000000001011100100 00101001100000000011000001100001 01011000000000000001100010000000 01010111111010100100111111111111 00011100000000000000111110101100 -00000010100001011001000110001100 +00000010100000011101000110001100 00101001100000000000001011100000 00101001100000000000000110000000 00101000100000000011000001100001 @@ -3803,7 +3863,7 @@ 00000010100000000100000001100011 01001100000000000000000000100000 00011100000000000000111110101100 -00000010100001010000000110001100 +00000010100000010100000110001100 00101000100000000000000110001101 01011100000000000001100110100000 00000010100000000000010000001101 @@ -3814,7 +3874,7 @@ 00000000000101010000000000000100 01001100000000000000000000100000 00011100000000000000111110101100 -00000010100001000110000110001100 +00000010100000001010000110001100 00101000100000000000000110001101 01100100000000001000000110100100 00000010101111111100000001100011 @@ -3828,7 +3888,7 @@ 00000000000101010000000000001100 01011100000000000011110010000000 00011100000000000000111110101100 -00000010100000111001000110001100 +00000010101111111101000110001100 00101000100000000000000110000100 00000000000101010000000110011001 01011000000000000000100010000000 @@ -3839,7 +3899,7 @@ 01011000000000000000100010000000 00101001100000000000001100010111 00011100000000000000111110101100 -00000010100000101110000110001100 +00000010101111110010000110001100 00101000100000000000000110001100 00101000100000000011000001100001 00101000100000000010000001110111 @@ -3849,7 +3909,7 @@ 00000010100000000100000001100011 01001100000000000000000000100000 00011100000000000000111110101100 -00000010100000100100000110001100 +00000010101111101000000110001100 00101000100000000000000110001100 00000000000101010000000110000100 01001100000000000000000000100000 @@ -4163,7 +4223,7 @@ 00000010101111111111110110001100 00000000010000001000100110001100 00011100000000000000111110001101 -00000010100101011010000110101101 +00000010100100011110000110101101 00000000000100000011000110101100 00101000100000000000000110000101 00000000000101010000000000000110 @@ -4474,7 +4534,7 @@ 00000010100000000000100000000100 01010000000000000000010000000000 00011100000000000000111110001110 -00000010100110110100000111001110 +00000010100101111000000111001110 00000000000101010000000000001100 00000000000101010000000111001101 00000010100000001000000000010000 @@ -4544,48 +4604,48 @@ 00101001001111111111110110000000 01010011111111111111001111111111 00011100000000000000111110000100 -00101000100101100101000010000100 +00101000100100101001000010000100 00000010100000111100000010000100 01001100000000000000000000100000 00000000000101010000000010001100 00011100000000000000111110001101 -00000010100011100111000110101101 +00000010100010101011000110101101 00101000100000000000000110100100 01100100000000000011000110000000 00011100000000000000111110001110 -00101000100101011001000111001110 +00101000100100011101000111001110 00000000000100010011100010001110 00000000000100010011000000001111 01101100000000000010110111001111 00011100000000000000111110001100 -00101000100101001000000110001100 +00101000100100001100000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000010101111111111110000000100 01001100000000000000000000100000 00011100000000000000111110001110 -00101000100101001011000111001110 +00101000100100001111000111001110 00000000000100010001000111001110 01101011111111111101110111001100 00000000000100000011000010001100 00101001100000000000000110101100 01001100000000000000000000100000 00011100000000000000111110001100 -00101000100101000010000110001100 +00101000100100000110000110001100 00101001100000001000000010001100 00011100000000000000111110001100 -00101000100100111100000110001100 +00101000100100000000000110001100 00101001100000001001000010001100 00011100000000000000111110001100 -00101000100100111011000110001100 +00101000100011111111000110001100 00101001100000011000000010001100 00010101111111111111111100001100 00000000000101010011000010100101 00011100000000000000111110001100 -00101000100100101110000110001100 +00101000100011110010000110001100 00101001100000001010000010001100 00011100000000000000111110001100 -00101000100100110101000110001100 +00101000100011111001000110001100 00101001100000000000000010000000 00101001100000000001000010000000 00101001100000000010000010000000 @@ -4601,28 +4661,28 @@ 00101001100000001011000010001100 01001100000000000000000000100000 00011100000000000000111110000101 -00000010100010110111000010100101 +00000010100001111011000010100101 00011100000000000000111110000100 -00101000100100011101000010000100 +00101000100011100001000010000100 01010000000000010000110000000000 00011100000000000000111110001100 -00000010100010110001000110001100 +00000010100001110101000110001100 00101000100000000000000110000100 00000010101111111100000001100011 00101001100000000010000001110111 00101001100000000011000001100001 00011100000000000000111110010111 -00000010100110001101001011110111 +00000010100101010001001011110111 01011000000000000000100010010111 01010100000001110000010000000000 00011100000000000000111110001100 -00000010100010100110000110001100 +00000010100001101010000110001100 00101000100000000000000110000100 00000010100000011100001011101100 01011000000000000000100010001100 01010100000001101110110000000000 00011100000000000000111110001100 -00000010100010011111000110001100 +00000010100001100011000110001100 00101000100000000000000110000100 00000010100000111000001011110111 01011000000000000001010010010111 @@ -4636,18 +4696,18 @@ 01001100000000000000000000100000 00000010101111111100000001100011 00011100000000000000111110001100 -00000010100111001001000110001100 +00000010100110001101000110001100 00011100000000000000000000001101 00000010101111011011000110101101 00000000000101010000000000000110 00000010100000000001000000000101 00011100000000000000111110000100 -00000010100101101111000010000100 +00000010100100110011000010000100 00101001100000000011000001100001 00101001100000000000000110001101 01010111111111101101011111111111 00011100000000000000111110001101 -00000010100101101010000110101101 +00000010100100101110000110101101 00000010100000000000010000000110 00000010100000000010010000000101 00000010100000011100000110100100 @@ -4659,14 +4719,14 @@ 00000010100000000100000001100011 01010011111111101010011111111111 00011100000000000000111110001100 -00000010100101011100000110001100 +00000010100100100000000110001100 00101000100000000000000110001101 01011100000000000010010110100000 00011100000000000000000000001101 00000010101111000111000110101101 00101001100000000000000110001101 00011100000000000000111110001100 -00000010100110101011000110001100 +00000010100101101111000110001100 00101000100000000000000110001100 01011100000000000000100110000000 01010011111111110111011111111111 @@ -4780,7 +4840,7 @@ 00101000010000000011100010000100 01010000000011100111000000000000 00011100000000000000111110001100 -00101000100001110100000110001100 +00101000100000111000000110001100 00101000100000000000000110001100 00000010101111111100000001100011 00101001100000000010000001110111 @@ -4794,7 +4854,7 @@ 00000011010000000100000110001101 01011100000000000010010110100000 00011100000000000000111110001101 -00101000100001011100000110101101 +00101000100000100000000110101101 00000010100000000010010000001110 00101001100000000000000110101110 00000011100000010000000110001100 @@ -4909,7 +4969,7 @@ 01011100000000000000100110000000 01010011110110101010111111111111 00011100000000000000111110001100 -00101000101111101001000110001100 +00101000101110101101000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000000100 @@ -4937,7 +4997,7 @@ 00101000100000001010001011101110 01011011111111111110000111000000 00011100000000000000111110011000 -00101000101111001101001100011000 +00101000101110010001001100011000 00000000010001001011000110001101 00101000100000000000001100011001 00000011010000000000010110101101 @@ -5065,12 +5125,12 @@ 01010011111111111100111111111111 01011100000000000001100010000000 00011100000000000000111110000101 -00101000101101011010000010100101 +00101000101100011110000010100101 00011100000000000000000000000100 00000010101111111101000010000100 01010011111110011100111111111111 00011100000000000000111110001100 -00101000101101010010000110001100 +00101000101100010110000110001100 00101000100000000000000110001100 00000010101111111100000001100011 00101001100000000010000001110111 @@ -5241,7 +5301,7 @@ 00101000100000000011000001101110 01011100000000000100000010000000 00011100000000000000111110001100 -00101000101010011101000110001100 +00101000101001100001000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00101010010000000011001011101100 @@ -5476,7 +5536,7 @@ 00000010101111111010110000001100 01101100000000000100010110000101 00011100000000000000111101101100 -00101000100110110010000110001100 +00101000100101110110000110001100 00000010100000000011000000001101 00101001100000000000000110001101 00000000000101010000000000011010 @@ -5505,7 +5565,7 @@ 01010111110100001100111111111111 01011100000000000110010010000000 00011100000000000000111101101101 -00101000100110100011000110101101 +00101000100101100111000110101101 00101000100000000000000110101100 01011000000000000011000110000000 01011100000000001000111110001100 @@ -5575,7 +5635,7 @@ 00000010100000111111110000001100 01101100000000000001110110000101 00011100000000000000111101101100 -00101000100101001111000110001100 +00101000100100010011000110001100 00000010100000100010100000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5611,7 +5671,7 @@ 00000010100000000000100000001100 01101100000000000001110110000100 00011100000000000000111101101100 -00101000100100101011000110001100 +00101000100011101111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5621,7 +5681,7 @@ 00000010100000000000100000001100 01101000000000000110000110000100 00011100000000000000111101101100 -00101000100100100000000110001100 +00101000100011100100000110001100 00101000100000000000000110001100 00000010101111111000000001100011 00101001100000000110000001110111 @@ -5644,7 +5704,7 @@ 01010100000000011010010000000000 01010011111111111110001111111111 00011100000000000000111101101100 -00101000100100001010000110001100 +00101000100011001110000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5667,7 +5727,7 @@ 01001100000000000000000000100000 01011100000000000111100010000000 00011100000000000000111101101100 -00101000100011110010000110001100 +00101000100010110110000110001100 00101000100000000000000110001100 01011000000000001000000110000000 00000010101111111000000001100011 @@ -5696,14 +5756,14 @@ 00000010100000000000011011110111 01010011111111111100101111111111 00011100000000000000111101101100 -00101000100011010110000110001100 +00101000100010011010000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 01001100000000000000000000100000 01001100000000000000000000100000 00011100000000000000111101101100 -00101000100011001111000110001100 +00101000100010010011000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5715,7 +5775,7 @@ 00000000000101010000000000000100 01001100000000000000000000100000 00011100000000000000111101101100 -00101000100011000011000110001100 +00101000100010000111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5723,7 +5783,7 @@ 00000010100000000000100000001100 01101100000000000001110110000100 00011100000000000000111101101100 -00101000100010111011000110001100 +00101000100001111111000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5733,7 +5793,7 @@ 00000010100000000000100000001100 01101100000000000010000110000100 00011100000000000000111101101100 -00101000100010110001000110001100 +00101000100001110101000110001100 00000010100000000010010000001101 00101001100000000000000110001101 00000010101111111111110000000100 @@ -5742,12 +5802,12 @@ 00000000000101010000000000000100 01010011111111111111011111111111 00011100000000000000111101101100 -00000010100010100001000110001100 +00000010100001100101000110001100 00101000100000000000000110001100 00101001000000000000000110000100 01001100000000000000000000100000 00011100000000000000111101101100 -00000010100000111000000110001100 +00000010101111111100000110001100 00101000100000000000000110001101 00000010100000000001010110101110 00101010000000000000000111001100 @@ -5756,7 +5816,7 @@ 00101001000000000000000110100100 01001100000000000000000000100000 00011100000000000000111101101100 -00000010100000101111000110001100 +00000010101111110011000110001100 00101000100000000000000110001101 00000010101111111100000001100011 00000010100000000001010110101110 @@ -5785,7 +5845,7 @@ 00000000010001001010000011010010 00000010100000000010000000001111 00011100000000000000111101101100 -00101000100010001000000110001100 +00101000100001001100000110001100 00000000000100000100100110001100 00101010000000000000000110001100 00000010100000001000000000010000 @@ -5856,7 +5916,7 @@ 00000000010001001110000111010010 00000010100000000110000000001111 00011100000000000000111101110000 -00101000100001000001001000010000 +00101000100000000101001000010000 00000000000100000100101000010000 00101010000000000000001000010000 00000010100000001000000000001100 @@ -5920,7 +5980,7 @@ 00000000010001001110000011101110 00000010100000000110000000010001 00011100000000000000111101101111 -00101000100000000001000111101111 +00101000101111000101000111101111 00000000000100000011100111101111 00101010000000000000000111101110 00000010100000001000000000010000 @@ -6122,7 +6182,7 @@ 00000000010001001110000011010010 00000010100000000110000000001111 00011100000000000000111101110000 -00101000101100110111001000010000 +00101000101011111011001000010000 00000000000100000100101000010000 00101010000000000000001000010000 00000010100000001000000000001110 @@ -6188,7 +6248,7 @@ 00000000010001001110000110110001 00000010100000000110000000001111 00011100000000000000111101110000 -00101000101011110101001000010000 +00101000101010111001001000010000 00000000000100000100011000010000 00101010000000000000001000010001 00000010100000001000000000001110 @@ -6240,7 +6300,7 @@ 00000000010001001110000011110001 00000010100000000110000000001110 00011100000000000000111101101100 -00101000101011000001000110001100 +00101000101010000101000110001100 00000000000100000100010110001100 00101010000000000000000110001100 00000010100000001000000000001111 @@ -7073,7 +7133,7 @@ 00000000000101011110001110110000 01101000000000101001010110011011 00011100000000000000111101001111 -00000010101010101010000111101111 +00000010101001101110000111101111 00000000010000001000101101101110 00000000000100000011100111101110 00101000100000000000000111001100 @@ -7786,7 +7846,7 @@ 00000010100000000000011101110001 01101000000000100100000110011001 00011100000000000000111100101110 -00000010101111110001000111001110 +00000010101110110101000111001110 00000000010000001000101100111001 00000000000100000110010111011001 00101000100000000000001100101100 @@ -9164,7 +9224,7 @@ 00000010100000001000000000001101 01101000000000000010000110000100 00011100000000000000111100001100 -00101000101101010101000110001100 +00101000101100011001000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000000000100010001000110100100 @@ -9172,7 +9232,7 @@ 00000011010000000000000000000000 00000000010001001010000010000100 00011100000000000000111100001100 -00101000101101001101000110001100 +00101000101100010001000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000110000000001101 @@ -9182,7 +9242,7 @@ 01101000000000000010010010001100 00000000010001001110000010000100 00011100000000000000111100001100 -00101000101101000011000110001100 +00101000101100000111000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000010000000001101 @@ -9190,7 +9250,7 @@ 01001100000000000000000000100000 00000000010001001100000010000100 00011100000000000000111100001100 -00101000101100111011000110001100 +00101000101011111111000110001100 00000000000100000001000110001100 00101010000000000000000110000100 00000010100000000100000000001101 @@ -9804,97 +9864,97 @@ 01101100011101010110111000101000 00000000000000000010100101101100 00000000000000000000000000110000 -00011100000000000000100100101000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000100100111100 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000100011011000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000100101000100 -00011100000000000000100101100100 -00011100000000000001101000010000 -00011100000000000000100101011100 -00011100000000000000100101101100 -00011100000000000001101000010000 -00011100000000000000100111010100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000000100111011100 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000101101101000 -00011100000000000001101000010000 -00011100000000000000101001110100 -00011100000000000000101010101000 -00011100000000000000101101101000 -00011100000000000000101101101000 -00011100000000000000101101101000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000101000011100 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001010111111000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001011010101100 -00011100000000000001101000010000 -00011100000000000001011101001000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001011110110100 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000000101101101000 -00011100000000000001101000010000 -00011100000000000000101001110100 -00011100000000000000101010101100 -00011100000000000000101101101000 -00011100000000000000101101101000 -00011100000000000000101101101000 -00011100000000000000101000100100 -00011100000000000000101010101100 -00011100000000000000101001100100 -00011100000000000001101000010000 +00011100000000000000101000011000 +00011100000000000001101100000000 +00011100000000000001101100000000 +00011100000000000000101000101100 +00011100000000000001101100000000 +00011100000000000001101100000000 +00011100000000000001101100000000 +00011100000000000000100111001000 +00011100000000000001101100000000 +00011100000000000001101100000000 +00011100000000000000101000110100 +00011100000000000000101001010100 +00011100000000000001101100000000 00011100000000000000101001001100 -00011100000000000001101000010000 -00011100000000000001010110001100 -00011100000000000001010111111100 -00011100000000000001011001110000 -00011100000000000000101001100100 -00011100000000000001101000010000 -00011100000000000001011010101100 -00011100000000000000100100100000 -00011100000000000001011101001100 -00011100000000000001101000010000 -00011100000000000001101000010000 -00011100000000000001100000011000 -00011100000000000001101000010000 -00011100000000000000100100100000 +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 +00011100000000000000101110011100 +00011100000000000000110001011000 +00011100000000000000110001011000 +00011100000000000000110001011000 +00011100000000000000101100010100 +00011100000000000000101110011100 +00011100000000000000101101010100 +00011100000000000001101100000000 +00011100000000000000101100111100 +00011100000000000001101100000000 +00011100000000000001011001111100 +00011100000000000001011011101100 +00011100000000000001011101100000 +00011100000000000000101101010100 +00011100000000000001101100000000 +00011100000000000001011110011100 +00011100000000000000101000010000 +00011100000000000001100000111100 +00011100000000000001101100000000 +00011100000000000001101100000000 +00011100000000000001100100001000 +00011100000000000001101100000000 +00011100000000000000101000010000 00110000001100000011000000110000 00110000001100000011000000110000 00110000001100000011000000110000 @@ -10106,38 +10166,38 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -11111111111110000110011111101000 -11111111111110000110010110010100 -11111111111110000110011010010000 -11111111111110000110010111110000 -11111111111110000110011010010000 -11111111111110000110011110110000 -11111111111110000110011010010000 -11111111111110000110010111110000 -11111111111110000110010110010100 -11111111111110000110010110010100 -11111111111110000110011110110000 -11111111111110000110010111110000 -11111111111110000110011000000000 -11111111111110000110011000000000 -11111111111110000110011000000000 -11111111111110000110011111001000 -11111111111110000111001001111000 -11111111111110000111000001111000 -11111111111110000111000001111000 -11111111111110000111000001110100 -11111111111110000111000010000100 -11111111111110000111000010000100 -11111111111110000111001001000000 -11111111111110000111000001110100 -11111111111110000111000010000100 -11111111111110000111001001000000 -11111111111110000111000010000100 -11111111111110000111000001110100 -11111111111110000111001000111000 -11111111111110000111001000111000 -11111111111110000111001000111000 -11111111111110000111001001011000 +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 00000010000000100000000100000000 00000011000000110000001100000011 00000100000001000000010000000100 @@ -10266,8 +10326,8 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -00011100000000000101011100010100 -00011100000000000101011010110100 +00011100000000000101100000000100 +00011100000000000101011110100100 00000000000000000000000000000000 00011100000010000000100000101111 00011100000010000000011110101100 @@ -10307,17 +10367,17 @@ 00000000000000000000000000000000 00000000000000000000000000000000 00000000000000000000000000000000 -00011100000000000100101001001100 +00011100000000000100101100111100 00011100000010000000101010110000 00011100000010000000110010101100 00011100000010000000011011011000 -00011100000000000100111100100100 +00011100000000000101000000010100 00011100000010000000011010110000 -00011100000000000100110000101100 +00011100000000000100110100011100 00011100000010000000101010111100 -00011100000000000100101111001100 -00011100000000000100100111100100 -00011100000000000100101010101100 +00011100000000000100110010111100 +00011100000000000100101011010100 +00011100000000000100101110011100 00011100000011110000000000000000 00011100000010000000111001000000 00011100000010000000100110110000 diff --git a/sdk/fft.bin b/sdk/fft.bin new file mode 100755 index 0000000..a02d270 Binary files /dev/null and b/sdk/fft.bin differ diff --git a/sdk/fft_dma.bin b/sdk/fft_dma.bin new file mode 100755 index 0000000..06b7237 Binary files /dev/null and b/sdk/fft_dma.bin differ diff --git a/sdk/software/examples/asm/user-sample.c b/sdk/software/examples/asm/user-sample.c index 4029279..129e6a3 100644 --- a/sdk/software/examples/asm/user-sample.c +++ b/sdk/software/examples/asm/user-sample.c @@ -195,17 +195,6 @@ int main(void) 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); // 必须等待最后一组写回完成 - /* ── DEBUG: read back specific C elements from ExtRAM ─────── */ - #define C_WORD(g, elem, part) extram[DST_BASE_WORDS + (g)*48 + (elem)*3 + (part)] - printf("DBG g=0 C00=[%08lx %08lx %08lx] C11=[%08lx %08lx %08lx] C23=[%08lx %08lx %08lx]\n", - C_WORD(0,0,0),C_WORD(0,0,1),C_WORD(0,0,2), - C_WORD(0,5,0),C_WORD(0,5,1),C_WORD(0,5,2), - C_WORD(0,11,0),C_WORD(0,11,1),C_WORD(0,11,2)); - printf("DBG g=1 C00=[%08lx %08lx %08lx] C11=[%08lx %08lx %08lx] C23=[%08lx %08lx %08lx]\n", - C_WORD(1,0,0),C_WORD(1,0,1),C_WORD(1,0,2), - C_WORD(1,5,0),C_WORD(1,5,1),C_WORD(1,5,2), - C_WORD(1,11,0),C_WORD(1,11,1),C_WORD(1,11,2)); - /* ── CRC32 over result region ─────────────────────────────── */ crc = compute_crc32(extram); diff --git a/sdk/software/examples/fft/fft.c b/sdk/software/examples/fft/fft.c new file mode 100644 index 0000000..4476886 --- /dev/null +++ b/sdk/software/examples/fft/fft.c @@ -0,0 +1,14 @@ +#include "fft.h" +#include "common_func.h" + +void fft_start() { + RegWrite(FFT_CSR_REG, FFT_CTRL_START); +} + +void fft_wait() { + while ((RegRead(FFT_CSR_REG) & FFT_STAT_DONE) == 0) {} +} + +unsigned int fft_get_csr() { + return RegRead(FFT_CSR_REG); +} \ No newline at end of file diff --git a/sdk/software/examples/fft/fft.h b/sdk/software/examples/fft/fft.h new file mode 100644 index 0000000..dca7dec --- /dev/null +++ b/sdk/software/examples/fft/fft.h @@ -0,0 +1,16 @@ +#pragma once + +#define FFT_BASE 0xbf400000 +#define FFT_IN_RE_BASE (FFT_BASE + 0x1000) +#define FFT_IN_IM_BASE (FFT_BASE + 0x2000) +#define FFT_OUT_RE_BASE (FFT_BASE + 0x3000) +#define FFT_OUT_IM_BASE (FFT_BASE + 0x4000) +#define FFT_CSR_REG (FFT_BASE + 0xF000) +#define FFT_CTRL_START (1 << 4) +#define FFT_STAT_DONE (1 << 1) +#define FFT_STAT_BUSY (1 << 0) +#define FFT_POINT_NUM 1024 + +void fft_start(); +void fft_wait(); +unsigned int fft_get_csr(); \ No newline at end of file diff --git a/sdk/software/examples/fft_dma/dma.c b/sdk/software/examples/fft_dma/dma.c new file mode 100644 index 0000000..551b725 --- /dev/null +++ b/sdk/software/examples/fft_dma/dma.c @@ -0,0 +1,37 @@ +#include "dma.h" + +void dma_start_transfer(int ch_id, uint32_t src, uint32_t dst, uint32_t bytes, uint32_t tag) { + volatile dma_ch_regs_t* ch = DMA_CH(ch_id); + + // 检查通道是否空闲 防止覆盖正在运行的任务 + if (ch->STATUS & STATUS_BUSY_BIT) { + // printf("channel %d busy\n", ch_id); + return; // 通道正忙，处理报错或重试 + } + + // 写入基本地址和长度 + ch->SRC_ADDR = src; + ch->DST_ADDR = dst; + ch->LENGTH = bytes; + ch->TAG = tag; // 可选，填入任务ID + + // 置 Burst 属性并触发传输 + // AXI SIZE: 2 (代表 2^2 = 4 Bytes，与 32-bit 数据线匹配) + // AXI LEN: 15 (代表 16 beats 突发传输，最高效) + uint32_t ctrl_val = CTRL_BURST_SIZE(2) | CTRL_BURST_LEN(15); + + // 写入 CTRL 并拉高 Bit 0 (Start) + ch->CTRL = ctrl_val | CTRL_START_BIT; +} + +void dma_wait_polling(int ch_id) { + volatile dma_ch_regs_t* ch = DMA_CH(ch_id); + + // 死等 Done bit 置 1 + while (!(ch->STATUS & STATUS_DONE_BIT)) { + } + + // 清除 Done 标志位 (Write 1 to Clear Bit 1) + // 注意：写 1 清 0 的设计，所以我们对 bit 1 写入 1 + ch->STATUS = STATUS_DONE_BIT; +} \ No newline at end of file diff --git a/sdk/software/examples/fft_dma/dma.h b/sdk/software/examples/fft_dma/dma.h new file mode 100644 index 0000000..8187fb9 --- /dev/null +++ b/sdk/software/examples/fft_dma/dma.h @@ -0,0 +1,30 @@ +#pragma once + +#include + + +typedef struct { + volatile uint32_t SRC_ADDR; // 0x00: 源地址 + volatile uint32_t DST_ADDR; // 0x04: 目的地址 + volatile uint32_t LENGTH; // 0x08: 传输总字节数 + volatile uint32_t TAG; // 0x0C: 软件 Tag (硬件不处理，留给软件标记任务用) + volatile uint32_t CTRL; // 0x10: 控制寄存器 (配置 Burst 属性 + 启动) + volatile uint32_t STATUS; // 0x14: 状态寄存器 (Busy, Done) + volatile uint32_t RESV[10]; // 0x18 ~ 0x3C: 保留空间，凑齐 0x40 字节 +} dma_ch_regs_t; + +// DMA 控制器基地址 +#define CDMA_MUX_BASE 0xbf300000 +#define DMA_CH(i) ((volatile dma_ch_regs_t*)(CDMA_MUX_BASE + (i) * 0x40)) + +// CTRL 寄存器位定义 +#define CTRL_START_BIT (1 << 0) +#define CTRL_BURST_SIZE(x) (((x) & 0x7) << 3) // Bits [5:3]: AXI AxSIZE (0=1B, 1=2B, 2=4B, 3=8B) +#define CTRL_BURST_LEN(x) (((x) & 0xFF) << 6) // Bits [13:6]: AXI AxLEN (0=1 beat, 15=16 beats) + +// STATUS 寄存器位定义 +#define STATUS_BUSY_BIT (1 << 0) +#define STATUS_DONE_BIT (1 << 1) + +void dma_start_transfer(int ch_id, uint32_t src, uint32_t dst, uint32_t bytes, uint32_t tag); +void dma_wait_polling(int ch_id); \ No newline at end of file diff --git a/sdk/software/examples/fft_dma/fft.c b/sdk/software/examples/fft_dma/fft.c new file mode 100644 index 0000000..4476886 --- /dev/null +++ b/sdk/software/examples/fft_dma/fft.c @@ -0,0 +1,14 @@ +#include "fft.h" +#include "common_func.h" + +void fft_start() { + RegWrite(FFT_CSR_REG, FFT_CTRL_START); +} + +void fft_wait() { + while ((RegRead(FFT_CSR_REG) & FFT_STAT_DONE) == 0) {} +} + +unsigned int fft_get_csr() { + return RegRead(FFT_CSR_REG); +} \ No newline at end of file diff --git a/sdk/software/examples/fft_dma/fft.h b/sdk/software/examples/fft_dma/fft.h new file mode 100644 index 0000000..dca7dec --- /dev/null +++ b/sdk/software/examples/fft_dma/fft.h @@ -0,0 +1,16 @@ +#pragma once + +#define FFT_BASE 0xbf400000 +#define FFT_IN_RE_BASE (FFT_BASE + 0x1000) +#define FFT_IN_IM_BASE (FFT_BASE + 0x2000) +#define FFT_OUT_RE_BASE (FFT_BASE + 0x3000) +#define FFT_OUT_IM_BASE (FFT_BASE + 0x4000) +#define FFT_CSR_REG (FFT_BASE + 0xF000) +#define FFT_CTRL_START (1 << 4) +#define FFT_STAT_DONE (1 << 1) +#define FFT_STAT_BUSY (1 << 0) +#define FFT_POINT_NUM 1024 + +void fft_start(); +void fft_wait(); +unsigned int fft_get_csr(); \ No newline at end of file diff --git a/sdk/user-sample.bin b/sdk/user-sample.bin index c54743b..42cd779 100755 Binary files a/sdk/user-sample.bin and b/sdk/user-sample.bin differ