module AdderTree_G(
    input [7:0] w1,
    input [7:0] w2,
    input [7:0] w3,
    input [7:0] w4,
    input [7:0] w5,
    input [7:0] w6,
    input [7:0] w7,
    input [7:0] w8,
    input [7:0] w9,
    input [7:0] w10,
    input [7:0] w11,
    input [7:0] w12,
    input [7:0] w13,
    input [7:0] w14,
    input [7:0] w15,
    input [7:0] w16,
    input clk,
    input enable,
    input [2:0] filter,
    output reg signed [20:0] result
);
 
    reg signed [16:0] a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16; //Changed from 16-bit to 17-bit
    wire signed [7:0] z1, z2, z3, z4, z5, z6, z7, z8, z9, z10, z11, z12, z13, z14, z15, z16;
    wire signed [8:0] o1, o2, o3, o4, o5, o6, o7, o8, o9, o10, o11, o12, o13, o14, o15, o16;
    reg signed [17:0] s1, s2, s3, s4, s5, s6, s7, s8;                                          //Changed from 17-bit to 18-bit
    reg signed [18:0] s9, s10, s11, s12;                                                        //Changed from 18-bit to 19-bit
    reg signed [19:0] s13, s14;   
    wire [127:0] weights;
    //reg [2:0] addr = 0;
    
    WeightsRAM_G weightRAM( .clk(clk), .enable(enable), .addr(filter), .weights(weights) );

   assign z16 = weights [7:0];  //z's order is reversed
   assign z15 = weights [15:8];
   assign z14 = weights [23:16];
   assign z13 = weights [31:24];
   assign z12 = weights [39:32];
   assign z11 = weights [47:40];
   assign z10 = weights [55:48];
   assign z9  = weights [63:56];
   assign z8  = weights [71:64];
   assign z7  = weights [79:72];
   assign z6  = weights [87:80];
   assign z5  = weights [95:88];
   assign z4  = weights [103:96];
   assign z3  = weights [111:104];
   assign z2  = weights [119:112];
   assign z1  = weights [127:120];
   
   assign o1 =  { 1'b0, w1  };
   assign o2 =  { 1'b0, w2  };
   assign o3 =  { 1'b0, w3  };
   assign o4 =  { 1'b0, w4  };
   assign o5 =  { 1'b0, w5  };
   assign o6 =  { 1'b0, w6  };
   assign o7 =  { 1'b0, w7  };
   assign o8 =  { 1'b0, w8  };
   assign o9 =  { 1'b0, w9  };
   assign o10 = { 1'b0, w10 };
   assign o11 = { 1'b0, w11 };
   assign o12 = { 1'b0, w12 };
   assign o13 = { 1'b0, w13 };
   assign o14 = { 1'b0, w14 };
   assign o15 = { 1'b0, w15 };
   assign o16 = { 1'b0, w16 }; 
   
    always @(posedge clk)
    begin
        /*if( count_done && (addr != 3'd7) )
        begin
            addr <= addr + 1;
        end else if( count_done && (addr == 3'd7) ) addr <= 0;
        else addr <= addr;*/
        
        a1 <=   o1  * z1;
        a2 <=   o2  * z2;
        a3 <=   o3  * z3;
        a4 <=   o4  * z4;
        a5 <=   o5  * z5;
        a6 <=   o6  * z6;
        a7 <=   o7  * z7;
        a8 <=   o8  * z8;
        a9 <=   o9  * z9;
        a10 <=  o10 * z10;
        a11 <=  o11 * z11;
        a12 <=  o12 * z12;
        a13 <=  o13 * z13;
        a14 <=  o14 * z14;
        a15 <=  o15 * z15;
        a16 <=  o16 * z16;
    
        s1 <= a1 + a2;
        s2 <= a3 + a4;
        s3 <= a5 + a6;
        s4 <= a7 + a8;
        s5 <= a9 + a10;
        s6 <= a11 + a12;
        s7 <= a13 + a14;
        s8 <= a15 + a16;
        s9 <= s1 + s2;
        s10 <= s3 + s4;
        s11 <= s5 + s6;
        s12 <= s7 + s8;
        s13 <= s9 + s10;
        s14 <= s11 + s12;
        result <= s13 + s14;
    end
    
   /* always @ ( count_done or addr )
    begin
        if( count_done && (addr != 3'd7) )
        begin
            addr <= addr + 1;
        end else if( count_done && (addr == 3'd7) ) addr <= 0;
        else addr <= addr;
    end*/
/*
    MULT_MACRO #(
          .DEVICE("7SERIES"), // Target Device: "7SERIES" 
          .LATENCY(3),        // Desired clock cycle latency, 0-4
          .WIDTH_A(8),       // Multiplier A-input bus width, 1-25
          .WIDTH_B(8)        // Multiplier B-input bus width, 1-18
       ) MULT_MACRO_inst (
          .P(a1),     // Multiplier output bus, width determined by WIDTH_P parameter 
          .A(w1),     // Multiplier input A bus, width determined by WIDTH_A parameter 
          .B(weights [7:0]),     // Multiplier input B bus, width determined by WIDTH_B parameter 
          .CE(1),   // 1-bit active high input clock enable
          .CLK(clk), // 1-bit positive edge clock input
          .RST(0)  // 1-bit input active high reset
       );
       
   MULT_MACRO #( .DEVICE("7SERIES"), .LATENCY(3), .WIDTH_A(8), .WIDTH_B(8)) 
   MULT_MACRO_inst2 ( .P(a2), .A(w2),.B(weights [15:8]),.CE(1),.CLK(clk),.RST(0));    
   MULT_MACRO #( .DEVICE("7SERIES"), .LATENCY(3), .WIDTH_A(8), .WIDTH_B(8)) 
   MULT_MACRO_inst3 ( .P(a3), .A(w3),.B(weights [23:16]),.CE(1),.CLK(clk),.RST(0));
   MULT_MACRO #( .DEVICE("7SERIES"), .LATENCY(3), .WIDTH_A(8), .WIDTH_B(8))
   MULT_MACRO_inst4 ( .P(a2), .A(w2),.B(weights [15:8]),.CE(1),.CLK(clk),.RST(0));    
   MULT_MACRO #( .DEVICE("7SERIES"), .LATENCY(3), .WIDTH_A(8), .WIDTH_B(8)) 
   MULT_MACRO_inst5 ( .P(a3), .A(w3),.B(weights [23:16]),.CE(1),.CLK(clk),.RST(0));
   */

endmodule