Merge pull request #143 from azonenberg/master

Fixed several techmapping issues irelated to greenpak flipflops
This commit is contained in:
Clifford Wolf 2016-04-01 09:13:52 +02:00
commit 7a4dd27b1b
3 changed files with 9 additions and 3 deletions

View File

@ -5,7 +5,7 @@ module GP_DFFS(input D, CLK, nSET, output reg Q);
.SRMODE(1'b1), .SRMODE(1'b1),
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .D(D),
.CLK(C), .CLK(CLK),
.nSR(nSET), .nSR(nSET),
.Q(Q) .Q(Q)
); );
@ -18,7 +18,7 @@ module GP_DFFR(input D, CLK, nRST, output reg Q);
.SRMODE(1'b0), .SRMODE(1'b0),
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .D(D),
.CLK(C), .CLK(CLK),
.nSR(nRST), .nSR(nRST),
.Q(Q) .Q(Q)
); );

View File

@ -1,7 +1,7 @@
/* /*
* yosys -- Yosys Open SYnthesis Suite * yosys -- Yosys Open SYnthesis Suite
* *
* Copyright (C) 2012 Clifford Wolf <clifford@clifford.at> * Copyright (C) 2016 Clifford Wolf <clifford@clifford.at>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -102,6 +102,9 @@ struct SynthGreenPAK4Pass : public Pass {
log(" dfflibmap -liberty +/greenpak4/gp_dff.lib\n"); log(" dfflibmap -liberty +/greenpak4/gp_dff.lib\n");
log(" techmap -map +/greenpak4/cells_map.v\n"); log(" techmap -map +/greenpak4/cells_map.v\n");
log(" dffinit -ff GP_DFF Q INIT\n"); log(" dffinit -ff GP_DFF Q INIT\n");
log(" dffinit -ff GP_DFFR Q INIT\n");
log(" dffinit -ff GP_DFFS Q INIT\n");
log(" dffinit -ff GP_DFFSR Q INIT\n");
log(" clean\n"); log(" clean\n");
log("\n"); log("\n");
log(" check:\n"); log(" check:\n");
@ -214,6 +217,9 @@ struct SynthGreenPAK4Pass : public Pass {
Pass::call(design, "dfflibmap -liberty +/greenpak4/gp_dff.lib"); Pass::call(design, "dfflibmap -liberty +/greenpak4/gp_dff.lib");
Pass::call(design, "techmap -map +/greenpak4/cells_map.v"); Pass::call(design, "techmap -map +/greenpak4/cells_map.v");
Pass::call(design, "dffinit -ff GP_DFF Q INIT"); Pass::call(design, "dffinit -ff GP_DFF Q INIT");
Pass::call(design, "dffinit -ff GP_DFFR Q INIT");
Pass::call(design, "dffinit -ff GP_DFFS Q INIT");
Pass::call(design, "dffinit -ff GP_DFFSR Q INIT");
Pass::call(design, "clean"); Pass::call(design, "clean");
} }