diff options
| author | Andrew Zonenberg <azonenberg@drawersteak.com> | 2016-04-01 21:18:29 -0700 |
|---|---|---|
| committer | Andrew Zonenberg <azonenberg@drawersteak.com> | 2016-04-01 21:18:29 -0700 |
| commit | 2386885f228ebecccf4987ac81bde11df56dae38 (patch) | |
| tree | 3cb1f031f18eba3f09fa7fd2087a58f6ddfb3220 | |
| parent | b0a28c793cebcd1a7317b63b215151ce9ace3a42 (diff) | |
| download | yosys-2386885f228ebecccf4987ac81bde11df56dae38.tar.gz yosys-2386885f228ebecccf4987ac81bde11df56dae38.tar.bz2 yosys-2386885f228ebecccf4987ac81bde11df56dae38.zip | |
Added GreenPak inverter support
| -rw-r--r-- | techlibs/greenpak4/cells_map.v | 9 | ||||
| -rw-r--r-- | techlibs/greenpak4/cells_sim.v | 4 | ||||
| -rw-r--r-- | techlibs/greenpak4/synth_greenpak4.cc | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/techlibs/greenpak4/cells_map.v b/techlibs/greenpak4/cells_map.v index ce517d94b..1bc0bcda4 100644 --- a/techlibs/greenpak4/cells_map.v +++ b/techlibs/greenpak4/cells_map.v @@ -33,8 +33,13 @@ module \$lut (A, Y); generate if (WIDTH == 1) begin - GP_2LUT #(.INIT({2'b00, LUT})) _TECHMAP_REPLACE_ (.OUT(Y), - .IN0(A[0]), .IN1(1'b0)); + if(LUT == 2'b01) begin + GP_INV _TECHMAP_REPLACE_ (.OUT(Y), .IN(A[0]) ); + end + else begin + GP_2LUT #(.INIT({2'b00, LUT})) _TECHMAP_REPLACE_ (.OUT(Y), + .IN0(A[0]), .IN1(1'b0)); + end end else if (WIDTH == 2) begin GP_2LUT #(.INIT(LUT)) _TECHMAP_REPLACE_ (.OUT(Y), diff --git a/techlibs/greenpak4/cells_sim.v b/techlibs/greenpak4/cells_sim.v index 2727d9246..4ea576960 100644 --- a/techlibs/greenpak4/cells_sim.v +++ b/techlibs/greenpak4/cells_sim.v @@ -40,6 +40,10 @@ module GP_DFFSR(input D, CLK, nSR, output reg Q); end endmodule +module GP_INV(input IN, output OUT); + assign OUT = ~IN; +endmodule + module GP_2LUT(input IN0, IN1, output OUT); parameter [3:0] INIT = 0; assign OUT = INIT[{IN1, IN0}]; diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc index 25150ec56..8900d8d78 100644 --- a/techlibs/greenpak4/synth_greenpak4.cc +++ b/techlibs/greenpak4/synth_greenpak4.cc @@ -207,8 +207,8 @@ struct SynthGreenPAK4Pass : public Pass { if (check_label(active, run_from, run_to, "map_luts")) { if (part == "SLG46140V") Pass::call(design, "nlutmap -luts 0,6,8,2"); - if (part == "SLG46620V") Pass::call(design, "nlutmap -luts 0,8,16,2"); - if (part == "SLG46621V") Pass::call(design, "nlutmap -luts 0,8,16,2"); + if (part == "SLG46620V") Pass::call(design, "nlutmap -luts 2,8,16,2"); + if (part == "SLG46621V") Pass::call(design, "nlutmap -luts 2,8,16,2"); Pass::call(design, "clean"); } |