Commit Graph

229 Commits

Author SHA1 Message Date
John McMaster 1f431903e2 groupmask utility
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2019-01-08 15:49:30 +01:00
John McMaster 06347fdd3a addrwidth utility
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2019-01-08 11:44:24 +01:00
John McMaster 069f9f5ff4
Merge pull request #445 from antmicro/443_broken_segprint
utils: segprint: Fix issue #443 with segprint -b
2019-01-07 23:23:03 +01:00
Tomasz Michalak f0f7661fbb utils: segprint: Fix issue #443 with segprint -b
Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
2019-01-07 18:09:43 +01:00
John McMaster 80e140b278 top_generate.sh => top_generate.mk
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2019-01-07 17:38:35 +01:00
John McMaster d7efa3bc81 vivado: assert expected version
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2019-01-06 17:24:23 +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
Tim 'mithro' Ansell 1b48dfd1aa Fixes #403.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-12-27 12:02:33 +01:00
John McMaster b8840ae9ff rempips: try a few times to solve on failures
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-19 15:43:04 -08:00
John McMaster c68ee2f004
Merge pull request #364 from mcmasterg/dbfixup_fix
Dbfixup fix
2018-12-19 15:22:19 -08:00
John McMaster b979eafae1 dbfixup: drop bad entries instead of asserting when strict=0
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-19 15:14:56 -08:00
John McMaster f084026ed9 genheader: set FUZDIR instead of per project
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 17:40:25 -08:00
John McMaster 535769ad04 utils: chmod +x *.py
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-18 13:29:22 -08:00
Tim 'mithro' Ansell 8d0983aedd Source Python environment in settings.sh
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-12-17 19:13:45 -08:00
John McMaster 7acefbb2bb dbfixup: fix zero enums
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 18:14:08 -08:00
John McMaster c4f49106b7
Merge pull request #328 from mithro/master
JSON improvements
2018-12-17 18:13:30 -08:00
John McMaster bce9837aee mergedb: liob33 support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-17 17:54:30 -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 23c435aa6e Improve `make format`.
* Use `yapf` from environment if it exists.
 * Better way to generate exclude.
 * Make TCL formatting work.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-12-13 18:31:10 -08:00
John McMaster 962dcc78d0 parsedb: more verbose on duplicate bits
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-11 11:55:51 -08:00
John McMaster 20db34836f genheader: export SPECDIR
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 16:42:06 -08:00
John McMaster 77c5261130 checkdb: print in standard address format
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:58:14 -08:00
John McMaster 96ee4ac449 checkdb: check tile overlap
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:58:14 -08:00
John McMaster 5060dae1be checkdb: check all .db files
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:57:58 -08:00
John McMaster 34464f80f6 parsedb: better help
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:56:23 -08:00
John McMaster 04053f4d31 mergedb.sh: verify consistency earlier
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:56:23 -08:00
John McMaster 2bb5677d44 parsedb: merge in dbcheck
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-10 14:56:06 -08:00
John McMaster 3dd449e430
Merge pull request #290 from mcmasterg/dbfixup_msg
dbfixup: more verbose bit index message
2018-12-05 18:27:45 -08:00
John McMaster 5e8a50fe37 dbfixup: more verbose bit index message
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-05 17:51:41 -08:00
John McMaster f38309230e reformat.tcl: move to third party
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-05 17:01:00 -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 c7aacd521b tcl: reformat tool
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-05 16:52:56 -08:00
John McMaster 9971c143bd route_via: loop check
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-12-05 16:08:24 -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 b07ea0a3a1 rempips: build dir
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-28 13:50:07 -08:00
John McMaster bef4a1184d dbfixup: quick hacks to make 050 happy
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 18:09:04 -08:00
John McMaster a3980ff738 dbfixup: handle always mode
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 17:37:50 -08:00
John McMaster c1069aa1c0 parsedb: support "always" mode
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 17:37:50 -08:00
John McMaster 5ecf3a3f45 parsedb: ignore mask lines
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 17:37:50 -08:00
John McMaster 8753ac3b67 mergedb: more aggressively delete temp files
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 17:37:50 -08:00
John McMaster eb7c1cc589 parsedb: more verbose duplicate tag message
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-14 17:37:30 -08:00
John McMaster 72dc4ec27b
Merge pull request #256 from mcmasterg/dbfixup_update_masks
dbfixup: missing arg on --clb-int
2018-11-13 15:01:47 -08:00
John McMaster 5d1396e667 dbfixup: missing arg on --clb-int
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-13 14:33:13 -08:00
John McMaster c22995bf6c environment.sh: fix PYTHONPATH
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-13 14:05:55 -08:00
John McMaster d31c5af8ce dbfixup: bits frozenset => set
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 15:47:14 -08:00
John McMaster 59603f069b mergedb: use parsedb to validate merges
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 15:44:13 -08:00
John McMaster 7f95ce3996 parsedb: tool to validate database
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 15:44:13 -08:00
John McMaster 5c3083d1a4 dbfixup: move parse_db_line() to util
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 15:44:13 -08:00
John McMaster 4516a00665 --db_root => --db-root
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 14:37:01 -08:00
John McMaster bcaf5c207d dbfixup: more verbose const assertion
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-12 10:57:46 -08:00
John McMaster dbf2c3b4b2 dbfixup: const0 support
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 20:04:54 -08:00
John McMaster e43e433550 dbfixup: zero_range() only on clb-int, assert on zero db size mismatch
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 17:30:03 -08:00
John McMaster 8f172bccf2 dbfixup: apply patches per project instead of globally
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 14:28:31 -08:00
John McMaster b6ba7e96a6 dbfixup: patch local files instead of central db
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 14:28:31 -08:00
John McMaster a790148ed0 dbfixup: generic file load args
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 14:28:31 -08:00
John McMaster d713c1e306 dbfixup: functions, comments, argparse
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 14:28:31 -08:00
John McMaster 3220cdc1ee dbfixup: db_root arg
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-07 14:28:31 -08:00
John McMaster aefe1a9534 segprint: ignore hint pips
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-06 12:07:29 -08:00
John McMaster 334f28a9a4 segprint: decode bits shared by overlapping tiles
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-11-06 12:05:23 -08:00
Keith Rothman de5c8a44a3 Pass configuration from top of utility, rather than implicit variables.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-11-01 16:18:32 -07:00
John McMaster b44e9dd49f segprint: use prjxray.db lib
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-31 18:54:05 -07:00
John McMaster 5532adac5b segprint: grid => tiles, segments
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-31 18:53:59 -07:00
litghost 26b95fb46e
Merge pull request #205 from litghost/larger_roi
Expand ROI to all of CMT X0Y2.
2018-10-30 17:16:43 -05:00
Keith Rothman d0c1efbfc2 Fix fasm_assembler for partial tile usage.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-30 11:08:24 -07:00
John McMaster 8171030058 segprint: move load_bitdata into lib
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-30 10:47:33 -07:00
John McMaster 6d24fdbaff bram-config: baseline workflow
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -07:00
John McMaster 8a68fe70c2
Merge pull request #193 from mcmasterg/genheader_seedn
genheader.sh: export SEEDN when deterministic seed is required
2018-10-24 17:25:07 -07:00
John McMaster c7004ed41b genheader.sh: export SEEDN when deterministic seed is required
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:20:13 -07:00
John McMaster 57b000529c utils: consistently mark +x
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:15:17 -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 d1bf397787 blockwidth: shrink minor address print
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 19:54:45 -07:00
John McMaster ac7fc054e9 blockwidth: tool to print minor address groups
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 19:44:20 -07:00
John McMaster 38c4d3c9ab bram: write to database/*/segbits_bram_*.block_ram.db
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster 20ff9b7752 genheader: clean up variable name
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster a920efa071 genheader.sh: export SEED variable
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
Keith Rothman c7ff5238f0 Run make format.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 13:19:22 -07:00
Keith Rothman d9fc687524 Address review comments.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 13:09:38 -07:00
Keith Rothman 42addd98a2 Run make format.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 12:32:42 -07:00
Keith Rothman 1d7738271a Address comments.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 12:31:15 -07:00
Keith Rothman 7eadae4ded Assorted fixes.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 09:08:34 -07:00
Keith Rothman e7370d6fdc Run make format.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-19 16:19:22 -07:00
Keith Rothman b22001a645 Add tool for outputing canonical prjxray FASM.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-19 14:24:02 -07:00
Keith Rothman 41d9ede26a Working bits2fasm using prjxray and fasm library.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-19 13:54:18 -07:00
Keith Rothman 6dd9626cfc Move all use of getenv into prjxray.util and behind a function.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-18 21:13:14 -07:00
Keith Rothman 3edbde3fe2 Add FASM library to prjxray path.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-18 18:26:34 -07:00
John McMaster 16edeffaaf segmaker.py: move to prjxray, class segmaker => Segmaker
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 19:03:16 -07:00
John McMaster a931e999b6 segprint: add note
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
John McMaster 717afdde64 bits2fasm: separate int and segment loading
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
John McMaster 50c295efb5 misc utils: process_db() w/ load file on or exists, not and
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 17:49:01 -07:00
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