Refactored synth_greenpak4 to use iopadmap for mapping GP_IOBUF/GP_OBUFT cells instea...

diff --git a/techlibs/greenpak4/Makefile.inc b/techlibs/greenpak4/Makefile.inc
index 4e8e9415c57db7f2bd12cf56641572d383094bc5..969b7c80d63191162cf745d678eac27cc3087c46 100644 (file)
--- a/techlibs/greenpak4/Makefile.inc
+++ b/techlibs/greenpak4/Makefile.inc
@@ -2,7 +2,6 @@
 OBJS += techlibs/greenpak4/synth_greenpak4.o
 OBJS += techlibs/greenpak4/greenpak4_counters.o
 
-$(eval $(call add_share_file,share/greenpak4,techlibs/greenpak4/cells_extract.v))
 $(eval $(call add_share_file,share/greenpak4,techlibs/greenpak4/cells_map.v))
 $(eval $(call add_share_file,share/greenpak4,techlibs/greenpak4/cells_sim.v))
 $(eval $(call add_share_file,share/greenpak4,techlibs/greenpak4/gp_dff.lib))

diff --git a/techlibs/greenpak4/cells_extract.v b/techlibs/greenpak4/cells_extract.v
deleted file mode 100644 (file)
index 96feb73..0000000
--- a/techlibs/greenpak4/cells_extract.v
+++ /dev/null
@@ -1,15 +0,0 @@
-//Wrapper module to patch up output of iopadmap
-module GP_IOBUF(input IN, output OUT, input OE, inout IO);
-
-       GP_IBUF ibuf(
-               .IN(IO),
-               .OUT(OUT)
-       );
-       
-       $_TBUF_ tbuf(
-               .A(IN),
-               .E(OE),
-               .Y(OUT)
-       );
-
-endmodule

diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc
index 55412ea2b3d976c31d7e89247c8a5b6203445a2e..fd7a8567a05c9e2b5aa4cb954ab10548fc3980f0 100644 (file)
--- a/techlibs/greenpak4/synth_greenpak4.cc
+++ b/techlibs/greenpak4/synth_greenpak4.cc
@@ -176,8 +176,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
                if (check_label("map_cells"))
                {
                        run("shregmap -tech greenpak4");
-                       run("iopadmap -bits -inpad GP_IBUF OUT:IN -outpad GP_OBUF IN:OUT -inoutpad GP_IBUF OUT:IN");
-                       run("extract -map +/greenpak4/cells_extract.v -verbose");
+                       run("iopadmap -bits -inpad GP_IBUF OUT:IN -outpad GP_OBUF IN:OUT -inoutpad GP_OBUF OUT:IN -toutpad GP_OBUFT OE:IN:OUT -tinoutpad GP_IOBUF OE:OUT:IN:IO");
                        run("dfflibmap -liberty +/greenpak4/gp_dff.lib");
                        run("techmap -map +/greenpak4/cells_map.v");
                        run("dffinit -ff GP_DFF Q INIT");