Commit Graph

365 Commits

Author SHA1 Message Date
litghost 9e7c1a60dc Don't copy tilegrid.json anymore
Fixes #197

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-25 19:53:33 -07:00
John McMaster f2b0093d11 bram: DO_REG, SRVAL, INIT
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 18:30:59 -07:00
John McMaster bcd299fd35 102-bram-data: move products to build dir
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:57:27 -07:00
John McMaster a58b2fefb4 bram config: basic working on Y1 but not Y0
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -07:00
John McMaster aec874de92 bram config: bram36 sort of working, needs to be bram18 based
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -07:00
John McMaster aa9386b6c1 bram-confg: write all products to build
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -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 6d24fdbaff bram-config: baseline workflow
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-24 17:38:32 -07:00
John McMaster 136221fa6f 102-bram-data: cleanup
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 e3b300765e fuzzers: replace inline verilog with top_harnesS()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 14:27:08 -07:00
John McMaster 7e6785de99 bram: fix README
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:46:10 -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 1360ae7746 bram: remove obsolete file
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:24:59 -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 0740fce8a3 bram-data: .segbits.BLOCK_RAM, N=8
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -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 f853f6312e 102-bram-data: fuzzer sort of working (interleave issue)
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster 1978370c7a bram: use prjxray lib
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 e1085a555f bram: rename config to 102 since delayed for tilegrid
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster e6775216fa bram: move verbose printing to segmaker
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster dc84f6aedb bram: increase BRAM ROI to include BRAM
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster bd65d57441 bram ROI: env.sh enhancements
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
John McMaster c6bbfd8fe4 bram: old local files
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-23 13:23:50 -07:00
Keith Rothman 47cc2b0acb Fix indirection.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-23 09:33:37 -07:00
John McMaster 683817460f Allow empty segement generation on select fuzzers that loop
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-22 14:57:03 -07:00
John McMaster 2b19547541
Merge pull request #167 from litghost/fasm_refactor3
Refactor FASM handling to use new FASM library.
2018-10-22 14:09:58 -07:00
Keith Rothman 99704740a3 Make Segmaker db_root be implicit.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
2018-10-22 12:04:55 -07:00
Tim 'mithro' Ansell feb1a2ca7b Remove 070-tileconn fuzzer from top level Makefile.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-10-22 16:14:29 +00: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 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
John McMaster 183c60bd66 fuzzers: remove db assert where possible
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 22:47:08 -07:00
John McMaster f677b94566 014-ffsrcemux: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:26:11 -07:00
John McMaster 53770ff569 016-clbnoutmux: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:26:06 -07:00
John McMaster 5ae13d9cd8 013-clbncy0: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:18:39 -07:00
John McMaster 4a4a91a1b6 011-ffconfig: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:17:56 -07:00
John McMaster 31650d8777 015-clbnffmux: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:13:18 -07:00
John McMaster 5b7f6b95af 012-clbn5ffmux: use gen_sites()
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 21:11:44 -07:00
John McMaster d77674147e 019-ndi1mux: query SLICEM instead of guessing
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 20:55:04 -07:00
John McMaster 9d6406ecf7 018-clbram: query SLICEM instead of guessing
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 20:46:01 -07:00
John Mcmaster edb041671c
Merge pull request #161 from mcmasterg/segmaker_prjxray
segmaker.py: move to prjxray, class segmaker => Segmaker
2018-10-17 20:45:29 -07:00
John McMaster 37c446b255 fuzzers: fix addtag regression
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 20:39:37 -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 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 7cfd30483f segmaker: split site / tile tags
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-17 14:31:59 -07:00
John McMaster 538344f192 Remove 070-tileconn, favoring 074-dump_all
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
Tim 'mithro' Ansell 0a9e24373e Missing closing of if.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-10-12 07:03:37 -07:00
Tim 'mithro' Ansell da10b35d0f Don't fail it output dir doesn't exist.
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
2018-10-12 07:03:37 -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 2c1fc70d65 timfuz: switch default to easy project until disk/memory issues are resolved
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-09 16:39:25 -07:00
John McMaster 6bafa960cf timfuz: pep8 fix
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-09 16:37:47 -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
John McMaster 0d8c5aaa29 timfuz: handle passthrough lut bel_pin
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-08 11:12:50 -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 dd88616a88 timfuz project.tcl: better print statement message
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 18:21:55 -07:00
John McMaster 5f43accedf timfuz timing_txt2icsv.py: stream instead of loading all data
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 18:21:36 -07:00
John McMaster fd5bfceb7a timfuz: delete timing4.txt after processing to save disk space
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 85862394ce timfuz: remove nodes from timing4.txt
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 0a7c68b5a0 timfuz stats: site wires report solved in addition to covered
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 8d5a1611d3 timfuz: BEL multiple output pin test script
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 0fcd6958d8 timfuz: linprog simple example
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster d7e972f83d timfuz: move tests to minitest dir
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster f4faa27243 timfuz: timing.txt "," delim, line_net procs (cleanup + bug fix)
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster f023e0dcf0 solve_leastsq.py:mkestimate(): ignore 0 delay rows, assert non-trivial seed
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 7f61ff99fd timing_txt2scsv.py: remove dead code
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 6df3b2b364 timfuz corner.mk: remove unused --sub-json invocations obsoleted by grouped.csv
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster b95eaba1f5 timfuz: site delay cleanup
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster 6f32de407e timfuz: project.tcl cleanup
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:47:02 -07:00
John McMaster e1e7c8005f timfuz: project.tcl rewrite W I P
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 17:46:55 -07:00
John McMaster 882257ea3d timfuz: s/write_info3/write_info4 for timing4.txt
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 16:33:57 -07:00
John McMaster 649daab2a2 timfuz: site alpha
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 16:33:57 -07:00
John McMaster 2c6c3487a4 timfuz: timing4 format w/ site/bel info
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 16:33:57 -07:00
John McMaster 9e8f6ea3e4 timfuz: timing3.csv => timing3i.csv (interconnect)
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-10-03 16:33:57 -07:00