diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 23345b50..87e0763b 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -30,7 +30,8 @@ The full set of tests is only run for tagged releases. - all designs build under Vivado 2017.2 and 2018.3 - sys_w11a_as7 must be build under 2018.3 (due to MIG support constraints) - sys_w11a_arty runs only with 75 MHz under 2018.3 - - 2018.3 is slower and for w11a less efficient, so 2017.2 stays default +- 2018.3 is slower and for w11a less efficient, so 2017.2 stays default +- remove iist from Spartan-3,6 designs (will never be used on small FPGAs) ### New features - new systems diff --git a/rtl/ibus/ibdr_maxisys.vhd b/rtl/ibus/ibdr_maxisys.vhd index c6a629f8..947d100b 100644 --- a/rtl/ibus/ibdr_maxisys.vhd +++ b/rtl/ibus/ibdr_maxisys.vhd @@ -1,6 +1,6 @@ --- $Id: ibdr_maxisys.vhd 1056 2018-10-13 16:01:17Z mueller $ +-- $Id: ibdr_maxisys.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2009-2018 by Walter F.J. Mueller +-- Copyright 2009-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -32,7 +32,7 @@ -- ib_intmap24 -- Test bench: - -- Target Devices: generic --- Tool versions: ise 8.2-14.7; viv 2014.4-2018.2; ghdl 0.18-0.34 +-- Tool versions: ise 8.2-14.7; viv 2014.4-2018.3; ghdl 0.18-0.35 -- -- Synthesized: -- Date Rev ise Target flop lutl lutm slic t peri @@ -49,6 +49,7 @@ -- -- Revision History: -- Date Rev Version Comment +-- 2019-01-29 1108 1.5.1 move IIST signals into generate -- 2018-10-13 1055 1.5 add IDEC port, connect to EXTEVT of KW11P -- 2018-09-08 1043 1.4.2 add KW11P; -- 2017-01-29 847 1.4.1 add DEUNA; rename generic labels @@ -225,14 +226,13 @@ architecture syn of ibdr_maxisys is signal EI_ACK_PC11PTP : slbit := '0'; signal EI_ACK_LP11 : slbit := '0'; - signal IIST_BUS : iist_bus_type := iist_bus_init; - signal IIST_OUT_0 : iist_line_type := iist_line_init; - signal IIST_MREQ : iist_mreq_type := iist_mreq_init; - signal IIST_SRES : iist_sres_type := iist_sres_init; - begin IIST: if sys_conf_ibd_iist generate + signal IIST_BUS : iist_bus_type := iist_bus_init; + signal IIST_OUT_0 : iist_line_type := iist_line_init; + signal IIST_MREQ : iist_mreq_type := iist_mreq_init; + signal IIST_SRES : iist_sres_type := iist_sres_init; begin I0 : ibd_iist port map ( diff --git a/rtl/sys_gen/w11a/nexys2/sys_conf.vhd b/rtl/sys_gen/w11a/nexys2/sys_conf.vhd index daba0800..a499e839 100644 --- a/rtl/sys_gen/w11a/nexys2/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys2/sys_conf.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2010-2018 by Walter F.J. Mueller +-- Copyright 2010-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_n2 (for synthesis) -- -- Dependencies: - --- Tool versions: xst 11.4-14.7; ghdl 0.26-0.34 +-- Tool versions: xst 11.4-14.7; ghdl 0.26-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.6.6 drop iist -- 2018-09-22 1050 1.6.5 add sys_conf_dmpcnt -- 2018-09-08 1043 1.6.4 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.6.3 use sys_conf_dmcmon_awidth=8 (proper value) @@ -90,7 +91,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd index 4cd8b5a2..1941313a 100644 --- a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd +++ b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd @@ -1,6 +1,6 @@ --- $Id: sys_w11a_n2.vhd 1056 2018-10-13 16:01:17Z mueller $ +-- $Id: sys_w11a_n2.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2010-2018 by Walter F.J. Mueller +-- Copyright 2010-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -30,10 +30,11 @@ -- Test bench: tb/tb_sys_w11a_n2 -- -- Target Devices: generic --- Tool versions: xst 8.2-14.7; ghdl 0.26-0.34 +-- Tool versions: xst 8.2-14.7; ghdl 0.26-0.35 -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-01-27 1108 14.7 131013 xc3s1200e-4 2976 8101 510 5201 ok: -iist -- 2018-10-13 1055 14.7 131013 xc3s1200e-4 3097 8484 510 5471 ok: +dmpcnt -- 2018-09-15 1045 14.7 131013 xc3s1200e-4 2860 7983 446 5098 ok: +KW11P -- 2017-04-30 888 14.7 131013 xc3s1200e-4 2806 7865 446 5043 ok: +fx2dbg diff --git a/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd index d27cec0a..594bbead 100644 --- a/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys2/tb/sys_conf_sim.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf_sim.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf_sim.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2010-2018 by Walter F.J. Mueller +-- Copyright 2010-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_n2 (for simulation) -- -- Dependencies: - --- Tool versions: xst 11.4-14.7; ghdl 0.26-0.34 +-- Tool versions: xst 11.4-14.7; ghdl 0.26-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.6.5 drop iist -- 2018-09-22 1050 1.6.4 add sys_conf_dmpcnt -- 2018-09-08 1043 1.6.3 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.6.2 use sys_conf_dmcmon_awidth=8 (proper value) @@ -89,7 +90,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/nexys3/sys_conf.vhd b/rtl/sys_gen/w11a/nexys3/sys_conf.vhd index d5219797..a10a8aa0 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_conf.vhd +++ b/rtl/sys_gen/w11a/nexys3/sys_conf.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2011-2018 by Walter F.J. Mueller +-- Copyright 2011-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_n3 (for synthesis) -- -- Dependencies: - --- Tool versions: xst 13.1-14.7; ghdl 0.29-0.34 +-- Tool versions: xst 13.1-14.7; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.7.6 drop iist -- 2018-09-22 1050 1.7.5 add sys_conf_dmpcnt -- 2018-09-08 1043 1.7.4 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.7.3 use sys_conf_dmcmon_awidth=8 (proper value) @@ -95,7 +96,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd index 2d638684..66d9bd0d 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd +++ b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd @@ -1,6 +1,6 @@ --- $Id: sys_w11a_n3.vhd 1056 2018-10-13 16:01:17Z mueller $ +-- $Id: sys_w11a_n3.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2011-2018 by Walter F.J. Mueller +-- Copyright 2011-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -30,10 +30,11 @@ -- Test bench: tb/tb_sys_w11a_n3 -- -- Target Devices: generic --- Tool versions: xst 13.1-14.7; ghdl 0.29-0.34 +-- Tool versions: xst 13.1-14.7; ghdl 0.29-0.35 -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-01-27 1108 14.7 131013 xc6slx16-2 2979 5542 201 2018 ok: -iist 88% -- 2018-10-13 1055 14.7 131013 xc6slx16-2 3057 5822 201 2064 ok: +dmpcnt 90% -- 2018-09-15 1045 14.7 131013 xc6slx16-2 2851 5453 177 1932 ok: +KW11P 84% -- 2017-03-30 888 14.7 131013 xc6slx16-2 2790 5352 177 1943 ok: +fx2dbg 85% diff --git a/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd index d569cf91..b8474cfd 100644 --- a/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/nexys3/tb/sys_conf_sim.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf_sim.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf_sim.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2011-2018 by Walter F.J. Mueller +-- Copyright 2011-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_n3 (for simulation) -- -- Dependencies: - --- Tool versions: xst 13.1-14.7; ghdl 0.29-0.34 +-- Tool versions: xst 13.1-14.7; ghdl 0.29-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.7.5 drop iist -- 2018-09-22 1050 1.7.4 add sys_conf_dmpcnt -- 2018-09-08 1043 1.7.3 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.7.2 use sys_conf_dmcmon_awidth=8 (proper value) @@ -89,7 +90,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P -- derived constants ======================================================= diff --git a/rtl/sys_gen/w11a/s3board/sys_conf.vhd b/rtl/sys_gen/w11a/s3board/sys_conf.vhd index ed5d39e8..6db98413 100644 --- a/rtl/sys_gen/w11a/s3board/sys_conf.vhd +++ b/rtl/sys_gen/w11a/s3board/sys_conf.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2007-2018 by Walter F.J. Mueller +-- Copyright 2007-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_s3 (for synthesis) -- -- Dependencies: - --- Tool versions: xst 8.1-14.7; ghdl 0.18-0.34 +-- Tool versions: xst 8.1-14.7; ghdl 0.18-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.3.7 drop iist -- 2018-09-22 1050 1.3.6 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.5 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.3.4 use sys_conf_dmcmon_awidth=8 (proper value) @@ -73,7 +74,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P end package sys_conf; diff --git a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd index 59c30b5b..e1f8fa93 100644 --- a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd +++ b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd @@ -1,6 +1,6 @@ --- $Id: sys_w11a_s3.vhd 1056 2018-10-13 16:01:17Z mueller $ +-- $Id: sys_w11a_s3.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2007-2018 by Walter F.J. Mueller +-- Copyright 2007-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -29,10 +29,11 @@ -- Test bench: tb/tb_sys_w11a_s3 -- -- Target Devices: generic --- Tool versions: xst 8.2-14.7; ghdl 0.18-0.34 +-- Tool versions: xst 8.2-14.7; ghdl 0.18-0.35 -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-01-27 1108 14.7 131013 xc3s1000-4 2782 7873 446 4942 OK: -iist 64% -- 2018-10-13 1055 14.7 131013 xc3s1000-4 2890 8217 446 5177 OK: +dmpcnt 67% -- 2018-09-15 1045 14.7 131013 xc3s1000-4 2670 7721 382 4851 OK: +KP11P 63% -- 2017-03-04 858 14.7 131013 xc3s1000-4 2576 7471 382 4716 OK: +DEUNA 61% diff --git a/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd b/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd index a5504334..bed123b1 100644 --- a/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd +++ b/rtl/sys_gen/w11a/s3board/tb/sys_conf_sim.vhd @@ -1,6 +1,6 @@ --- $Id: sys_conf_sim.vhd 1050 2018-09-23 15:46:42Z mueller $ +-- $Id: sys_conf_sim.vhd 1108 2019-02-02 23:04:38Z mueller $ -- --- Copyright 2007-2018 by Walter F.J. Mueller +-- Copyright 2007-2019 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -16,9 +16,10 @@ -- Description: Definitions for sys_w11a_s3 (for simulation) -- -- Dependencies: - --- Tool versions: xst 8.1-14.7; ghdl 0.18-0.34 +-- Tool versions: xst 8.1-14.7; ghdl 0.18-0.35 -- Revision History: -- Date Rev Version Comment +-- 2019-01-27 1108 1.3.6 drop iist -- 2018-09-22 1050 1.3.5 add sys_conf_dmpcnt -- 2018-09-08 1043 1.3.4 add sys_conf_ibd_kw11p -- 2017-04-22 884 1.3.3 use sys_conf_dmcmon_awidth=8 (proper value) @@ -79,7 +80,7 @@ package sys_conf is constant sys_conf_ibd_tm11 : boolean := true; -- TM11 -- configure other devices - constant sys_conf_ibd_iist : boolean := true; -- IIST + constant sys_conf_ibd_iist : boolean := false; -- IIST constant sys_conf_ibd_kw11p : boolean := true; -- KW11P end package sys_conf;