diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2019-03-19 08:52:31 -0700 | 
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2019-03-19 08:52:31 -0700 | 
| commit | 02e8dc7ad2e13a43a310d311302c6db8168e6c11 (patch) | |
| tree | af43bf9735fe47b09dbd8807c63fe451eb82aaba /techlibs/intel | |
| parent | 3e89cf68bdc4e9eeb55bd9450121f421bcdc554a (diff) | |
| parent | 61f37706f93042c2d1f093dd9bfa717390911eb3 (diff) | |
| download | yosys-02e8dc7ad2e13a43a310d311302c6db8168e6c11.tar.gz yosys-02e8dc7ad2e13a43a310d311302c6db8168e6c11.tar.bz2 yosys-02e8dc7ad2e13a43a310d311302c6db8168e6c11.zip  | |
Merge https://github.com/YosysHQ/yosys into read_aiger
Diffstat (limited to 'techlibs/intel')
| -rw-r--r-- | techlibs/intel/cycloneive/arith_map.v | 10 | ||||
| -rw-r--r-- | techlibs/intel/cyclonev/cells_map.v | 4 | 
2 files changed, 7 insertions, 7 deletions
diff --git a/techlibs/intel/cycloneive/arith_map.v b/techlibs/intel/cycloneive/arith_map.v index b3a11272b..49e36aa25 100644 --- a/techlibs/intel/cycloneive/arith_map.v +++ b/techlibs/intel/cycloneive/arith_map.v @@ -32,7 +32,7 @@ module fa     wire   VCC;     assign VCC = 1'b1; -    +     cycloneiv_lcell_comb gen_sum_0 (.combout(sum_x),                                     .dataa(a_c),                                     .datab(b_c), @@ -40,7 +40,7 @@ module fa                                     .datad(VCC));     defparam syn__05_.lut_mask = 16'b1001011010010110;     defparam syn__05_.sum_lutc_input = "datac"; -    +     cycloneiv_lcell_comb gen_cout_0 (.combout(cout_t),                                      .dataa(cin_c),                                      .datab(b_c), @@ -48,11 +48,11 @@ module fa                                      .datad(VCC));     defparam syn__06_.lut_mask = 16'b1110000011100000;     defparam syn__06_.sum_lutc_input = "datac"; -    +  endmodule // fa  module f_stage(); -    +  endmodule // f_stage  module f_end(); @@ -88,7 +88,7 @@ module _80_cycloneive_alu (A, B, CI, BI, X, Y, CO);            .cin_c(C[0]),            .cout_t(C0[1]),            .sum_x(Y[0])); -    +     genvar i;     generate for (i = 1; i < Y_WIDTH; i = i + 1) begin:slice        cycloneive_lcell_comb #(.lut_mask(16'b0101_1010_0101_0000), .sum_lutc_input("cin")) arith_cell (.combout(Y[i]), .cout(CO[i]), .dataa(BB[i]), .datab(1'b1), .datac(1'b1), .datad(1'b1), .cin(C[i])); diff --git a/techlibs/intel/cyclonev/cells_map.v b/techlibs/intel/cyclonev/cells_map.v index bd60d4e17..f8d142bc9 100644 --- a/techlibs/intel/cyclonev/cells_map.v +++ b/techlibs/intel/cyclonev/cells_map.v @@ -76,7 +76,7 @@ module \$lut (A, Y);     wire              VCC;     wire              GND;     assign {VCC,GND} = {1'b1,1'b0}; -    +     generate        if (WIDTH == 1) begin  	 assign Y = ~A[0]; // Not need to spend 1 logic cell for such an easy function @@ -151,7 +151,7 @@ module \$lut (A, Y);                      TODO: There's not a just 7-input function on Cyclone V, see the following note:                      **Extended LUT Mode**                      Use extended LUT mode to implement a specific set of 7-input functions. The set must -                    be a 2-to-1 multiplexer fed by two arbitrary 5-input functions sharing four inputs.  +                    be a 2-to-1 multiplexer fed by two arbitrary 5-input functions sharing four inputs.                      [source](Device Interfaces and Integration Basics for Cyclone V Devices).                    end*/                    else  | 
