riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abc9: cleanup

This commit is contained in:
Eddie Hung 2020-02-10 10:17:23 -08:00
parent d4ff5b2d00
commit c244b27b6d
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passes/techmap/abc9_exe.cc
View File

@ -362,7 +362,7 @@ struct Abc9ExePass : public Pass {
} }
void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE
{ {
log_header(design, "Executing ABC9_MAP pass (technology mapping using ABC9).\n"); log_header(design, "Executing ABC9_EXE pass (technology mapping using ABC9).\n");
#ifdef ABCEXTERNAL #ifdef ABCEXTERNAL
std::string exe_file = ABCEXTERNAL; std::string exe_file = ABCEXTERNAL;

80
techlibs/xilinx/abc9_map.v
View File

@ -215,11 +215,11 @@ module FDCE (output Q, (* techmap_autopurge *) input C, CE, D, CLR);
.IS_PRE_INVERTED(IS_CLR_INVERTED) .IS_PRE_INVERTED(IS_CLR_INVERTED)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(~D), .Q($Q), .C(C), .CE(CE), .PRE(CLR) .D(~D), .Q($Q), .C(C), .CE(CE), .PRE(CLR)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC1 below // $__ABC9_ASYNC1 below
); );
// Since this is an async flop, async behaviour is dealt with here // Since this is an async flop, async behaviour is dealt with here
$__ABC9_ASYNC1 abc_async (.A($QQ), .S(CLR ^ IS_CLR_INVERTED), .Y(QQ)); $__ABC9_ASYNC1 abc_async (.A($QQ), .S(CLR ^ IS_CLR_INVERTED), .Y(QQ));
@ -233,11 +233,11 @@ module FDCE (output Q, (* techmap_autopurge *) input C, CE, D, CLR);
.IS_CLR_INVERTED(IS_CLR_INVERTED) .IS_CLR_INVERTED(IS_CLR_INVERTED)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .Q($Q), .C(C), .CE(CE), .CLR(CLR) .D(D), .Q($Q), .C(C), .CE(CE), .CLR(CLR)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC0 below // $__ABC9_ASYNC0 below
); );
// Since this is an async flop, async behaviour is dealt with here // Since this is an async flop, async behaviour is dealt with here
$__ABC9_ASYNC0 abc_async (.A($QQ), .S(CLR ^ IS_CLR_INVERTED), .Y(QQ)); $__ABC9_ASYNC0 abc_async (.A($QQ), .S(CLR ^ IS_CLR_INVERTED), .Y(QQ));
@ -258,11 +258,11 @@ module FDCE_1 (output Q, (* techmap_autopurge *) input C, CE, D, CLR);
.INIT(1'b0) .INIT(1'b0)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(~D), .Q($Q), .C(C), .CE(CE), .PRE(CLR) .D(~D), .Q($Q), .C(C), .CE(CE), .PRE(CLR)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC1 below // $__ABC9_ASYNC1 below
); );
$__ABC9_ASYNC1 abc_async (.A($QQ), .S(CLR), .Y(QQ)); $__ABC9_ASYNC1 abc_async (.A($QQ), .S(CLR), .Y(QQ));
end end
@ -272,11 +272,11 @@ module FDCE_1 (output Q, (* techmap_autopurge *) input C, CE, D, CLR);
.INIT(1'b0) .INIT(1'b0)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .Q($Q), .C(C), .CE(CE), .CLR(CLR) .D(D), .Q($Q), .C(C), .CE(CE), .CLR(CLR)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC0 below // $__ABC9_ASYNC0 below
); );
$__ABC9_ASYNC0 abc_async (.A($QQ), .S(CLR), .Y(QQ)); $__ABC9_ASYNC0 abc_async (.A($QQ), .S(CLR), .Y(QQ));
end endgenerate end endgenerate
@ -303,11 +303,11 @@ module FDPE (output Q, (* techmap_autopurge *) input C, CE, D, PRE);
.IS_CLR_INVERTED(IS_PRE_INVERTED), .IS_CLR_INVERTED(IS_PRE_INVERTED),
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(~D), .Q($Q), .C(C), .CE(CE), .CLR(PRE) .D(~D), .Q($Q), .C(C), .CE(CE), .CLR(PRE)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC0 below // $__ABC9_ASYNC0 below
); );
$__ABC9_ASYNC0 abc_async (.A($QQ), .S(PRE ^ IS_PRE_INVERTED), .Y(QQ)); $__ABC9_ASYNC0 abc_async (.A($QQ), .S(PRE ^ IS_PRE_INVERTED), .Y(QQ));
end end
@ -320,11 +320,11 @@ module FDPE (output Q, (* techmap_autopurge *) input C, CE, D, PRE);
.IS_PRE_INVERTED(IS_PRE_INVERTED), .IS_PRE_INVERTED(IS_PRE_INVERTED),
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .Q($Q), .C(C), .CE(CE), .PRE(PRE) .D(D), .Q($Q), .C(C), .CE(CE), .PRE(PRE)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC1 below // $__ABC9_ASYNC1 below
); );
$__ABC9_ASYNC1 abc_async (.A($QQ), .S(PRE ^ IS_PRE_INVERTED), .Y(QQ)); $__ABC9_ASYNC1 abc_async (.A($QQ), .S(PRE ^ IS_PRE_INVERTED), .Y(QQ));
end endgenerate end endgenerate
@ -344,11 +344,11 @@ module FDPE_1 (output Q, (* techmap_autopurge *) input C, CE, D, PRE);
.INIT(1'b0) .INIT(1'b0)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(~D), .Q($Q), .C(C), .CE(CE), .CLR(PRE) .D(~D), .Q($Q), .C(C), .CE(CE), .CLR(PRE)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC0 below // $__ABC9_ASYNC0 below
); );
$__ABC9_ASYNC0 abc_async (.A($QQ), .S(PRE), .Y(QQ)); $__ABC9_ASYNC0 abc_async (.A($QQ), .S(PRE), .Y(QQ));
end end
@ -358,11 +358,11 @@ module FDPE_1 (output Q, (* techmap_autopurge *) input C, CE, D, PRE);
.INIT(1'b0) .INIT(1'b0)
) _TECHMAP_REPLACE_ ( ) _TECHMAP_REPLACE_ (
.D(D), .Q($Q), .C(C), .CE(CE), .PRE(PRE) .D(D), .Q($Q), .C(C), .CE(CE), .PRE(PRE)
// ^^^ Note that async // ^^^ Note that async
// control is not directly // control is not directly
// supported by abc9 but its // supported by abc9 but its
// behaviour is captured by // behaviour is captured by
// $__ABC9_ASYNC1 below // $__ABC9_ASYNC1 below
); );
$__ABC9_ASYNC1 abc_async (.A($QQ), .S(PRE), .Y(QQ)); $__ABC9_ASYNC1 abc_async (.A($QQ), .S(PRE), .Y(QQ));
end endgenerate end endgenerate