Commit Graph

260 Commits

Author SHA1 Message Date
Alessandro Comodi 29fbdf595f 005-fuzzer: fix Makefile
The Makefile now correctly adds the ps7 dependency when zynq7
environment is selected.

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
2019-01-09 14:31:42 +01:00
Alessandro Comodi 7a0b819f50 ps7/top.py: format fix
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
2019-01-09 00:55:42 +01:00
Alessandro Comodi dc36103f5c sp7/top.py: format fix
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
2019-01-08 19:19:55 +01:00
Alessandro Comodi 1c510c2388 ps7: 005-tilegrid added ps7 fuzzer
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
2019-01-08 19:04:47 +01:00
Alessandro Comodi 645cd8e6ab 005-tilegrid: change Makefile
different build dependencies depending on the device part

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
2019-01-08 19:03:44 +01:00
John McMaster 5acda63b46 xadc: tilegrid support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-29 17:07:18 +01:00
Felix Held 0d6e327229 introduce vivado wrapper
This fixes the problem that when sourcing the vivado settings file the
library search path is modified resulting in non-vivado binaries not working
due to being dynamically linked against the vivado libraries instead of the
system ones.

Signed-off-by: Felix Held <felix-github@felixheld.de>
2018-12-28 19:05:49 +01:00
John McMaster ffad776162 fuzzers: consolidate common gitignores
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-19 18:56:32 -08:00
John McMaster dde83ebadb tilegrid: pll/mmcm entire major address until resolved
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 17:12:13 -08:00
John McMaster 3b1b587fcf tilegrid pll: basic support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 16:06:53 -08:00
John McMaster b84d9a2535 tilegrid: basic mmcm support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 15:42:23 -08:00
John McMaster cecba098fc tilegrid: params on fuzzaddr/generate.py
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 15:41:23 -08:00
John McMaster 6177c4c58d tilegrid iob: factor out generic code
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 13:20:57 -08:00
John McMaster 923eddb2ea tilegrid: /bin/dash compatibility
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 12:54:41 -08:00
John McMaster a17c8b8d1d tilegrid iob: use XRAY_DATABASE_ROOT
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 18:39:17 -08:00
John McMaster 358876463e tilegrid: clean iob dir
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 18:38:49 -08:00
John McMaster fbb464d5ba tilegrid:tilegrid_basic.json => dir/tilegrid.json for XRAY_DATABASE_ROOT
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 18:38:10 -08:00
Tim 'mithro' Ansell 8d3e95cd1a Move xjson / xyaml to utils instead of prjxray.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-12-17 17:03:19 -08:00
Tim 'mithro' Ansell fb2d809659 Use xjson.pprint instead of json.dump for output.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-12-17 17:03:19 -08:00
John McMaster b501c10fa2 tilegrid iob: generate addresses automatically
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 16:38:25 -08:00
John McMaster 54dcdf1f2e tcl: reformat existing code
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-05 16:52:56 -08:00
John McMaster 15c62ba3a0 tilegrid: propagate iob addresses across column
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-04 21:03:31 -08:00
John McMaster bb2cdac49f tilegrid: remove obsolete comments, long line readability
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-04 21:03:19 -08:00
John McMaster 9b779d659d tilegrid: fix IBUF define
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-04 20:59:37 -08:00
John McMaster efddb6df52 tilegrid: fix iob height
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 19:10:14 -08:00
John McMaster 37128508eb tilegrid: remove iob CENTER_INT from segment
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 18:56:26 -08:00
John McMaster 2d82438461 iob: LIOB33_SIGN => LIOB33_SING, cleanup func names
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 18:48:05 -08:00
John McMaster 48a6967adb tilegrid: ROI fixes
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 18:27:03 -08:00
John McMaster 49aa56712f tilegrid: merge in KR WIP IOB
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 17:49:08 -08:00
John McMaster 621ad8a575 tilegrid: add note about potential issue
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 17:47:40 -08:00
John McMaster 23f7d939da tilegrid makefile: correct delta dep
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 17:47:12 -08:00
John McMaster 70b9adb933 tilegrid: generating iob deltas
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 17:14:04 -08:00
John McMaster e5cae1f55e tilegrid: iob WIP
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 16:44:33 -08:00
John McMaster 7ad9dc8c63 tilegrid: tcl cleanup
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 16:05:46 -08:00
John McMaster 9537b108d0 tilegrid: import KR WIP IOB tcl
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 13:52:09 -08:00
John McMaster 2a38512720 tilegrid: separate tilegrid and address generation
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 12:09:18 -08:00
John McMaster a77f7bd12e tilegrid: generate products in parallel
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-03 12:00:56 -08:00
John McMaster 0cca27fed1 tilegrid: use dedicated ROI var
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-13 13:26:45 -08:00
John McMaster a019eb4148 tilegrid: BRAM use site, not bel, for better stability
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-06 16:41:35 -08:00
Keith Rothman 7ef9f737ba make format
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-30 13:15:15 -07:00
Keith Rothman b2672b2884 Automatically detect weird columns.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-30 13:13:52 -07:00
Keith Rothman afeafa30c7 Assorted fixes.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-29 22:08:05 -07:00
Keith Rothman b9031e0aeb Expand ROI to whole chip.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-29 21:05:14 -07:00
Keith Rothman 206a7b4b27 Allow INT_LR copying to happen on INT tiles without a functional tile.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-29 17:58:03 -07:00
Keith Rothman ab23cd1d3c Larger ROI.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-29 13:47:24 -07:00
John McMaster 671a55705f tilegrid: fix BRAM CLB_IO_CLK height
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -07:00
John McMaster 540ae800fe tilegrid: makefile build dir workflow
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:21:44 -07:00
Keith Rothman d1799deb86 Make 005-tilegrid emit entire part, and have 074-dump_all not overwrite 005-tilegrid.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-24 07:10:16 -07:00
John McMaster 7a4f425a92 tilegrid: remove dead code
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:44:22 -07:00
John McMaster 59a4681564 tilegrid: fix BRAM height
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster 0403a23c8f tilegrid: always add height
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster 39167f12c4 pep8
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 18:01:44 -07:00
John McMaster 3d55b76b34 tilegrid: fix help message
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:48:51 -07:00
John McMaster 62d89d6776 tilegrid: add segment for tilegrid, glob deltas by default
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 0a6aa3c374 tilegrid: always add bits field
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 8763438cff tilegrid: consolidate setting frames, words, heights
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 833fa503c0 tilegrid: add comments
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster b99ed31ba1 tilegrid: BRAM loosely working, needs real offsets
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 9e664fa5bd tilegrid BRAM: base BLOCK_RAM entry
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 9f3443a8a0 tilegrid: misc cleanup
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster e62d722003 tilegrid generate.tcl: more debug output, consistent tab/space
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 2070c94e68 tilegrid generate: simplify if / tables
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 7c84e3ccc9 tilegrid: BRAM partial support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 7053663aa6 tilegrid: split make_database()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster d682523456 tilegrid: clean up load_tiles()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster f7a3d8bf94 tilegrid: move tile_baseaddr closer to where its created
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 38df1bad48 tilegrid: add_segment() explicit keys
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster fd03be7868 tilegrid: cleanup make_segments, bug fixes
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 875081dbc2 tilegrid: break into functions, add main()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 63d872d539 tilegrid: quote consistency
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 209e59f9a9 tilegrid: database["segments"] => segments
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 9ac71a0442 tilegrid: add some debug output on failure
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-08 17:38:19 -07:00
Keith Rothman f77755ea5d Add TODO to remove hack.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 09:34:45 -07:00
Keith Rothman fcac3aa05c Lighter hack.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 09:31:45 -07:00
Keith Rothman dba45f30fa Hack thinks to work (for now).
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 09:09:38 -07:00
Davide 7f6f50f3d8 Merge remote-tracking branch 'upstream/master'
Signed-off-by: Davide <davide.toldo@stud.tu-darmstadt.de>
2018-02-18 03:07:34 +01:00
Davide 7e47ae4a51 Fixed Bullet Point Lists in README.md files
Signed-off-by: Davide <davide.toldo@stud.tu-darmstadt.de>
2018-02-18 03:02:33 +01:00
Clifford Wolf d2979d77eb
Merge pull request #92 from SymbiFlow/tilegrid-ng
Tilegrid changes for BRAM and DSP tiles
2018-02-15 14:38:52 +01:00
Clifford Wolf 5b74b282c2 Merge branch 'master' of github.com:SymbiFlow/prjxray into tilegrid-ng 2018-02-14 13:38:39 +01:00
Davide 73b1e27f78 Added tags for headers, subheaders and structured README files a bit
Signed-off-by: Davide <davide.toldo@stud.tu-darmstadt.de>
2018-02-14 12:24:18 +01:00
Clifford Wolf 78c8f6b4ce Remove now obsolete "segment" attribute in tile objects in tilegrid
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-13 17:14:28 +01:00
Davide 46c1eef15b renamed all README.txt files to README.md
Signed-off-by: Davide <davide.toldo@stud.tu-darmstadt.de>
2018-02-13 17:00:04 +01:00
Clifford Wolf 0f67fcf1d2 Make tilegrid["tiles"] the tilegrid top-level object
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-06 20:12:50 +01:00
Clifford Wolf 5c527e89ba Add run.ok files to .gitignore
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-06 17:57:52 +01:00
Clifford Wolf ff56e49dfe Add baseaddr, offset, and height to tiles in tilegrid.json
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-05 12:48:22 +01:00
Rick Altherr 43e51dd5c1 Reformat existing Python files with yapf
Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
2018-01-09 14:50:06 -08:00
Rick Altherr 67c7914a2c Revert "Autopep8 on all existing sources"
This reverts commit 925885c2cc.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
2018-01-09 14:49:57 -08:00
Rick Altherr 925885c2cc Autopep8 on all existing sources
Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
2018-01-08 17:23:42 -08:00
Clifford Wolf 77933f7212 Add fuzzers top-level "make clean"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-01-04 16:31:31 +01:00
Clifford Wolf 6c352f5a30 Add "make run" to fuzzers that did not have it yet
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-01-04 13:49:50 +01:00
Clifford Wolf f1faa6e5f1 Fix minor bug in 005-tilegrid/generate.py
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 23:28:39 +01:00
Clifford Wolf d80b037849 Fix number of words in a BRAM/DSP segment
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 23:28:39 +01:00
Clifford Wolf 3cfe5dab46 Set tcl.collectionResultDisplayLimit to unlimited in all fuzzers
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 23:28:39 +01:00
Clifford Wolf b602904ee2 Reduce size of HCLK segments to 26 frames
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 17:37:36 +01:00
Clifford Wolf 206364020c Add tilegrid BRAM and DSP segment support
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 17:24:27 +01:00
John McMaster 99a968cb14 tilegrid fuzzer: document better
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2017-12-21 18:04:19 -08:00
Clifford Wolf 24beaef67a Add hclk_l/hclk_r databases
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Clifford Wolf c8cf7e45f5 Add frame tiles to tilegrid
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
John McMaster 5c83125687 gitignore cleanup
Signed-off-by: John McMaster <JohnDMcMaster@gmail.com>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Rick Altherr abe5c1c2ae fuzzers/005-tilegrid: Fix tools references
Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Rick Altherr c815d4b1a5 Set tool and script paths project-wide
utils/environment.sh determines its absolute path and then creates
environment variables to each of the prjxray tools.  This allows moving
the tools around in the code base without touching every script.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Rick Altherr 4f74941fcd Avoid combined flags in bitread invocations.
Combined flags (i.e. -zy) are not universally supported.  Switch to
individual flags (-z -y) in existing scripts to prepare for move to
gflags.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Clifford Wolf 9b61d5bd85 Large refactoring (mostly for separate left/right DBs)
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Clifford Wolf 73c5f22931 Use decimal numbers in bit labels, some other cleanups
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Clifford Wolf 85f366bac9 Some refactoring
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-12-20 22:46:39 +01:00
Clifford Wolf 16584e8fa4 Require settings.sh to be already in environment
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-10-17 23:35:14 +02:00
Clifford Wolf 2ba55ff84c Database progress
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-10-17 23:31:08 +02:00
Clifford Wolf 1fc9871346 Finish tilegrid fuzzer
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-10-17 13:20:40 +02:00
Clifford Wolf 9e80cadfcc Add bitread PGM support
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-10-16 02:35:12 +02:00
Clifford Wolf 6a2965caa2 Add fuzzers/005-tilegrid/
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
2017-10-16 01:20:16 +02:00