Commit Graph

390 Commits

Author SHA1 Message Date
John McMaster d93547ed4b segprint: remove outdated comment
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
John McMaster 87792c00a8 segprint: remove dead code
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
John McMaster 483be8e769 bits2fasm: remove some verbose output
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
John McMaster 697f83c97a fasm2frames env fix
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster d5fd573d30 python3, formatting
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 98300b801e Remove obsolete test_segprint2fasm
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 3588f278c1 fasm2bits -> fasm2frames
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster c8ee9d4f16 fasm2bits: working
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster e7e010179b fasm2frame => fasm2bits
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 178c76f74d bits2fasm: format enums correctly
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster e3cd270e16 segprint2fasm -> bits2fasm
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 7998b77ee3 segprint: include all tile memory spaces, not just IO
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 5e2164f4b1 Move tools .py files to utils to be consistent
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 86fce0fee3 segprint: cleanup, fix
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster a5c281a4db segmaker: assert segment definitions are consistent
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster e851f41407 segmaker: tilegrid fixes
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 7cfd30483f segmaker: split site / tile tags
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 255f9b01bb
Merge pull request #143 from mcmasterg/segmaker_debug
Segmaker debug
2018-10-09 16:46:17 -07:00
John McMaster 867853076d
Merge pull request #126 from mcmasterg/timfuz_site
timing site fuzzer
2018-10-09 16:45:45 -07:00
John McMaster ac8891d865 segmaker: add assertions, comments, split into functions
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-08 17:42:22 -07:00
Keith Rothman ed584aa8f2 Add ROI annotations and update some missing tilegrid changes.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 18:26:24 -07:00
Keith Rothman 4fe294df19 Run make format.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 09:36:33 -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
Keith Rothman c38cac8b69 Handle new grid format and merge with segment info.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-05 09:09:38 -07:00
John McMaster 409dd72f3b genheader.sh: add extra check for when script is sourced
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
Clifford Wolf 1ec9706398 Update python script formatting
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-14 13:41:24 +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 09e6426533 Fix dsp and bram mask generation
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-06 17:57:52 +01:00
Clifford Wolf 93d61a3297 Transition segmaker and fuzzers to new tilegrid format
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-02-05 12:48:28 +01:00
Rick Altherr 612c1e3eec OpenOCD board configuration for basys3
Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
2018-01-24 13:55:49 -08: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 5e66675c12 Add tileconnloops.py script
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-01-05 14:04:32 +01:00
Clifford Wolf 36b16c8e0b Add tileconnwire.py utils script
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-01-04 17:30:36 +01:00
Clifford Wolf 9f9c348bfd Add roi_tiles TCL helper function, remove XRAY_HCLK_[LR]
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-24 19:39:23 +01:00
Clifford Wolf 36e9270371 Add dbfixup update_mask lines for BRAMs and DSPs
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 23:28:39 +01:00
Clifford Wolf 533bb83f45 Fix dbfixup.py for incomplete databases
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 17:28:39 +01:00
Clifford Wolf c04f33ff3a Hotfix in mergedb.sh for "grep" vs "set -e"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-22 16:19:41 +01:00
Clifford Wolf ffa7ede780 Fix segmaker for segments without known base address
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2017-12-21 02:07:58 +01:00
Rick Altherr 90ebf28cef utils: update XRAY_BITREAD to specify part YAML flag
bitread now requires a part YAML file as part of the rewrite to use
libprjxray.  Instead of changing every invocation directly, just add the
flag to the existing environment variable as it is needed for all
invocations.

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
John McMaster d0458bca71 vtemplate improvements
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
John McMaster 534c2930c7 dbfixup: duplicate line workaround
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
John McMaster 8618dfb035 Revert "017-clbprecyinit: push db"
This reverts commit 033d9de8649b36cd9be52d9bbef1e18e28b82190.

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
John McMaster 0cd9bc59cd 017-clbprecyinit: push db
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
John McMaster 6abb5547b8 vtemplate update
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
John McMaster bb606bf791 vtemplate script
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
Clifford Wolf 58a5f37164 Add CLBL?_?.SLICE?_X?.?MUX to database
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 169fb7b862 Add CLBL?_?.SLICE?_X?.?FF.DMUX database entries
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 7d4ca0858f Improvements related to HCLK database
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 bbe620abb4 Fix hclk database entries
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 b4aa4e3fe0 Add hclk db entries
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 339fd235bc Update tools to correctly handle ECC mask (ECC is only 13 LSB bits in word 50)
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 1b21d3a064 Add "segprint -b"
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 f79def34be Databse 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 2801c7f77f Add fuzzers/057-bipips
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 34c29d08c0 Update database
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 4df3a9bce7 Update database
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 fb474660b2 segprint +x
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
Clifford Wolf e51535ddbf Add 051-intpips2 fuzzer
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 2fd3beb510 Add support for !<bit> to segprint.py
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 3f6ba4b94e Add explicit zero bits to DB format, some 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 b6e77bc285 Update segprint.py for new database
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 9bbadc2a39 Add maskmerge script
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 b569760629 Major refactoring of database organisation
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 f4f801b1c7 Add consistent sorting order to segprint
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 f04450be66 Improve segprint.py
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
Rick Altherr 6d2de4dc68 utils/mergedb: fix tools paths
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 559eb4176a Export XRAY_* during environment setup
Since some of the tools need to be found by make and other environments,
build the paths when database/<database>/settings.sh is sourced and
export them into the shell environment.

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 fedf33b5ce tools: build with CMake
Building with CMake makes it a lot easier to bring in other libraries
such as gflags and abseil.

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
Clifford Wolf c8188315f7 Add lvb_long_mux minitest
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 2bfd460bca Add nodes_wires_list minitests
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 316824542c Add tile_wire_pairs utility function
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 f2214a4917 Improve/fix 013-intpips
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 08a6c0234c Change dbcheck exceptions to warnings
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 d7b03d7ef4 Add mask 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 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 67d461a1ed Add dbcheck.py, split seg_int.segbits
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 fea6a9efb0 Add seg_int database
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 919888dc9e Add randplace_pblock TCL function
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 61c51d6a15 Add segprint.py, use in switchboxes minitest
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 1ce90e7f21 Add routing test to switchboxes minitest
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 6f88afe92a Add utils.tcl, minor edits to switchboxes minitests
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 8ca8b2ff57 Add segmaker suport for per-tile bits
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 988acdf4b5 Add utils .gitignore
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 1871aea240 Add segmaker library, Refactor lutinit and ffconfig generate.py
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