diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-04-12 14:57:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 14:57:36 +0200 |
| commit | 9d6586b4e131b058dc4fddf9d9d44968887af91b (patch) | |
| tree | ec83fd2aec5614b3de0e5ad47af67bfb07d0c7c9 | |
| parent | 48bc203653f10e0081f646f03c20f598f7420855 (diff) | |
| parent | 643ae9bfc534c20444dfcd33083c6c188c2f1ec8 (diff) | |
| download | yosys-9d6586b4e131b058dc4fddf9d9d44968887af91b.tar.gz yosys-9d6586b4e131b058dc4fddf9d9d44968887af91b.tar.bz2 yosys-9d6586b4e131b058dc4fddf9d9d44968887af91b.zip | |
Merge pull request #933 from dh73/master
Fixing issues in CycloneV cell sim
| -rw-r--r-- | techlibs/intel/cyclonev/cells_sim.v | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/techlibs/intel/cyclonev/cells_sim.v b/techlibs/intel/cyclonev/cells_sim.v index fa27c2c8e..9b2a10e72 100644 --- a/techlibs/intel/cyclonev/cells_sim.v +++ b/techlibs/intel/cyclonev/cells_sim.v @@ -85,7 +85,7 @@ module cyclonev_lcell_comb begin upper_lut_value = lut4(mask[31:16], dataa, datab, datac, datad); lower_lut_value = lut4(mask[15:0], dataa, datab, datac, datad); - lut5 = (datae) ? upper_mask_value : lower_mask_value; + lut5 = (datae) ? upper_lut_value : lower_lut_value; end endfunction // lut5 @@ -95,15 +95,16 @@ module cyclonev_lcell_comb input dataa, datab, datac, datad, datae, dataf; reg upper_lut_value; reg lower_lut_value; + reg out_0, out_1, out_2, out_3; begin upper_lut_value = lut5(mask[63:32], dataa, datab, datac, datad, datae); lower_lut_value = lut5(mask[31:0], dataa, datab, datac, datad, datae); - lut6 = (dataf) ? upper_mask_value : lower_mask_value; + lut6 = (dataf) ? upper_lut_value : lower_lut_value; end endfunction // lut6 assign {mask_a, mask_b, mask_c, mask_d} = {lut_mask[15:0], lut_mask[31:16], lut_mask[47:32], lut_mask[63:48]}; - +`ifdef ADVANCED_ALM always @(*) begin if(extended_lut == "on") shared_lut_alm = datag; @@ -115,6 +116,11 @@ module cyclonev_lcell_comb out_2 = lut4(mask_c, dataa, datab, datac, datad); out_3 = lut4(mask_d, dataa, datab, shared_lut_alm, datad); end +`else + `ifdef DEBUG + initial $display("Advanced ALM lut combine is not implemented yet"); + `endif +`endif endmodule // cyclonev_lcell_comb |