From 3f77043458b2581f3a5ae94c0ffab3f03474aafc Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 16:56:06 -0700 Subject: [PATCH 1/5] BRAM: 101 => 025 fuzzer number, add to fuzzers Makefile Signed-off-by: John McMaster --- fuzzers/{101-bram-config => 025-bram-config}/.gitignore | 0 fuzzers/{101-bram-config => 025-bram-config}/Makefile | 0 fuzzers/{101-bram-config => 025-bram-config}/README.md | 0 fuzzers/{101-bram-config => 025-bram-config}/generate.py | 0 fuzzers/{101-bram-config => 025-bram-config}/generate.sh | 0 fuzzers/{101-bram-config => 025-bram-config}/generate.tcl | 0 .../{101-bram-config => 025-bram-config}/minitest/.gitignore | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/Makefile | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/README.md | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/diff.mk | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/env.sh | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/runme.sh | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/runme.tcl | 0 fuzzers/{101-bram-config => 025-bram-config}/minitest/top.v | 0 fuzzers/{101-bram-config => 025-bram-config}/top.py | 0 fuzzers/{102-bram-data => 026-bram-data}/.gitignore | 0 fuzzers/{102-bram-data => 026-bram-data}/Makefile | 0 fuzzers/{102-bram-data => 026-bram-data}/README.md | 0 fuzzers/{102-bram-data => 026-bram-data}/generate.py | 0 fuzzers/{102-bram-data => 026-bram-data}/generate.sh | 0 fuzzers/{102-bram-data => 026-bram-data}/generate.tcl | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/.gitignore | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/Makefile | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/diff.mk | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/runme.sh | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/runme.tcl | 0 fuzzers/{102-bram-data => 026-bram-data}/minitest/top.v | 0 fuzzers/{102-bram-data => 026-bram-data}/top.py | 0 fuzzers/Makefile | 2 ++ 29 files changed, 2 insertions(+) rename fuzzers/{101-bram-config => 025-bram-config}/.gitignore (100%) rename fuzzers/{101-bram-config => 025-bram-config}/Makefile (100%) rename fuzzers/{101-bram-config => 025-bram-config}/README.md (100%) rename fuzzers/{101-bram-config => 025-bram-config}/generate.py (100%) rename fuzzers/{101-bram-config => 025-bram-config}/generate.sh (100%) rename fuzzers/{101-bram-config => 025-bram-config}/generate.tcl (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/.gitignore (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/Makefile (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/README.md (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/diff.mk (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/env.sh (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/runme.sh (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/runme.tcl (100%) rename fuzzers/{101-bram-config => 025-bram-config}/minitest/top.v (100%) rename fuzzers/{101-bram-config => 025-bram-config}/top.py (100%) rename fuzzers/{102-bram-data => 026-bram-data}/.gitignore (100%) rename fuzzers/{102-bram-data => 026-bram-data}/Makefile (100%) rename fuzzers/{102-bram-data => 026-bram-data}/README.md (100%) rename fuzzers/{102-bram-data => 026-bram-data}/generate.py (100%) rename fuzzers/{102-bram-data => 026-bram-data}/generate.sh (100%) rename fuzzers/{102-bram-data => 026-bram-data}/generate.tcl (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/.gitignore (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/Makefile (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/diff.mk (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/runme.sh (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/runme.tcl (100%) rename fuzzers/{102-bram-data => 026-bram-data}/minitest/top.v (100%) rename fuzzers/{102-bram-data => 026-bram-data}/top.py (100%) diff --git a/fuzzers/101-bram-config/.gitignore b/fuzzers/025-bram-config/.gitignore similarity index 100% rename from fuzzers/101-bram-config/.gitignore rename to fuzzers/025-bram-config/.gitignore diff --git a/fuzzers/101-bram-config/Makefile b/fuzzers/025-bram-config/Makefile similarity index 100% rename from fuzzers/101-bram-config/Makefile rename to fuzzers/025-bram-config/Makefile diff --git a/fuzzers/101-bram-config/README.md b/fuzzers/025-bram-config/README.md similarity index 100% rename from fuzzers/101-bram-config/README.md rename to fuzzers/025-bram-config/README.md diff --git a/fuzzers/101-bram-config/generate.py b/fuzzers/025-bram-config/generate.py similarity index 100% rename from fuzzers/101-bram-config/generate.py rename to fuzzers/025-bram-config/generate.py diff --git a/fuzzers/101-bram-config/generate.sh b/fuzzers/025-bram-config/generate.sh similarity index 100% rename from fuzzers/101-bram-config/generate.sh rename to fuzzers/025-bram-config/generate.sh diff --git a/fuzzers/101-bram-config/generate.tcl b/fuzzers/025-bram-config/generate.tcl similarity index 100% rename from fuzzers/101-bram-config/generate.tcl rename to fuzzers/025-bram-config/generate.tcl diff --git a/fuzzers/101-bram-config/minitest/.gitignore b/fuzzers/025-bram-config/minitest/.gitignore similarity index 100% rename from fuzzers/101-bram-config/minitest/.gitignore rename to fuzzers/025-bram-config/minitest/.gitignore diff --git a/fuzzers/101-bram-config/minitest/Makefile b/fuzzers/025-bram-config/minitest/Makefile similarity index 100% rename from fuzzers/101-bram-config/minitest/Makefile rename to fuzzers/025-bram-config/minitest/Makefile diff --git a/fuzzers/101-bram-config/minitest/README.md b/fuzzers/025-bram-config/minitest/README.md similarity index 100% rename from fuzzers/101-bram-config/minitest/README.md rename to fuzzers/025-bram-config/minitest/README.md diff --git a/fuzzers/101-bram-config/minitest/diff.mk b/fuzzers/025-bram-config/minitest/diff.mk similarity index 100% rename from fuzzers/101-bram-config/minitest/diff.mk rename to fuzzers/025-bram-config/minitest/diff.mk diff --git a/fuzzers/101-bram-config/minitest/env.sh b/fuzzers/025-bram-config/minitest/env.sh similarity index 100% rename from fuzzers/101-bram-config/minitest/env.sh rename to fuzzers/025-bram-config/minitest/env.sh diff --git a/fuzzers/101-bram-config/minitest/runme.sh b/fuzzers/025-bram-config/minitest/runme.sh similarity index 100% rename from fuzzers/101-bram-config/minitest/runme.sh rename to fuzzers/025-bram-config/minitest/runme.sh diff --git a/fuzzers/101-bram-config/minitest/runme.tcl b/fuzzers/025-bram-config/minitest/runme.tcl similarity index 100% rename from fuzzers/101-bram-config/minitest/runme.tcl rename to fuzzers/025-bram-config/minitest/runme.tcl diff --git a/fuzzers/101-bram-config/minitest/top.v b/fuzzers/025-bram-config/minitest/top.v similarity index 100% rename from fuzzers/101-bram-config/minitest/top.v rename to fuzzers/025-bram-config/minitest/top.v diff --git a/fuzzers/101-bram-config/top.py b/fuzzers/025-bram-config/top.py similarity index 100% rename from fuzzers/101-bram-config/top.py rename to fuzzers/025-bram-config/top.py diff --git a/fuzzers/102-bram-data/.gitignore b/fuzzers/026-bram-data/.gitignore similarity index 100% rename from fuzzers/102-bram-data/.gitignore rename to fuzzers/026-bram-data/.gitignore diff --git a/fuzzers/102-bram-data/Makefile b/fuzzers/026-bram-data/Makefile similarity index 100% rename from fuzzers/102-bram-data/Makefile rename to fuzzers/026-bram-data/Makefile diff --git a/fuzzers/102-bram-data/README.md b/fuzzers/026-bram-data/README.md similarity index 100% rename from fuzzers/102-bram-data/README.md rename to fuzzers/026-bram-data/README.md diff --git a/fuzzers/102-bram-data/generate.py b/fuzzers/026-bram-data/generate.py similarity index 100% rename from fuzzers/102-bram-data/generate.py rename to fuzzers/026-bram-data/generate.py diff --git a/fuzzers/102-bram-data/generate.sh b/fuzzers/026-bram-data/generate.sh similarity index 100% rename from fuzzers/102-bram-data/generate.sh rename to fuzzers/026-bram-data/generate.sh diff --git a/fuzzers/102-bram-data/generate.tcl b/fuzzers/026-bram-data/generate.tcl similarity index 100% rename from fuzzers/102-bram-data/generate.tcl rename to fuzzers/026-bram-data/generate.tcl diff --git a/fuzzers/102-bram-data/minitest/.gitignore b/fuzzers/026-bram-data/minitest/.gitignore similarity index 100% rename from fuzzers/102-bram-data/minitest/.gitignore rename to fuzzers/026-bram-data/minitest/.gitignore diff --git a/fuzzers/102-bram-data/minitest/Makefile b/fuzzers/026-bram-data/minitest/Makefile similarity index 100% rename from fuzzers/102-bram-data/minitest/Makefile rename to fuzzers/026-bram-data/minitest/Makefile diff --git a/fuzzers/102-bram-data/minitest/diff.mk b/fuzzers/026-bram-data/minitest/diff.mk similarity index 100% rename from fuzzers/102-bram-data/minitest/diff.mk rename to fuzzers/026-bram-data/minitest/diff.mk diff --git a/fuzzers/102-bram-data/minitest/runme.sh b/fuzzers/026-bram-data/minitest/runme.sh similarity index 100% rename from fuzzers/102-bram-data/minitest/runme.sh rename to fuzzers/026-bram-data/minitest/runme.sh diff --git a/fuzzers/102-bram-data/minitest/runme.tcl b/fuzzers/026-bram-data/minitest/runme.tcl similarity index 100% rename from fuzzers/102-bram-data/minitest/runme.tcl rename to fuzzers/026-bram-data/minitest/runme.tcl diff --git a/fuzzers/102-bram-data/minitest/top.v b/fuzzers/026-bram-data/minitest/top.v similarity index 100% rename from fuzzers/102-bram-data/minitest/top.v rename to fuzzers/026-bram-data/minitest/top.v diff --git a/fuzzers/102-bram-data/top.py b/fuzzers/026-bram-data/top.py similarity index 100% rename from fuzzers/102-bram-data/top.py rename to fuzzers/026-bram-data/top.py diff --git a/fuzzers/Makefile b/fuzzers/Makefile index e386bcb8..b20e3c70 100644 --- a/fuzzers/Makefile +++ b/fuzzers/Makefile @@ -18,6 +18,8 @@ $(eval $(call fuzzer,016-clbnoutmux,005-tilegrid)) $(eval $(call fuzzer,017-clbprecyinit,005-tilegrid)) $(eval $(call fuzzer,018-clbram,005-tilegrid)) $(eval $(call fuzzer,019-ndi1mux,005-tilegrid)) +$(eval $(call fuzzer,025-bram-config,005-tilegrid)) +$(eval $(call fuzzer,026-bram-data,005-tilegrid)) $(eval $(call fuzzer,050-intpips,005-tilegrid)) $(eval $(call fuzzer,051-imuxlout,050-intpips)) $(eval $(call fuzzer,052-clkin,050-intpips)) From 2cffb2987e3340e11f7307ff61a590939f782150 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 17:47:18 -0700 Subject: [PATCH 2/5] bram: minor cleanup Signed-off-by: John McMaster --- fuzzers/025-bram-config/top.py | 14 ++++---------- fuzzers/026-bram-data/minitest/runme.tcl | 2 +- fuzzers/026-bram-data/top.py | 3 +-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/fuzzers/025-bram-config/top.py b/fuzzers/025-bram-config/top.py index c030673e..4425454d 100644 --- a/fuzzers/025-bram-config/top.py +++ b/fuzzers/025-bram-config/top.py @@ -32,15 +32,7 @@ def gen_brams(): ''' Correctly assign a site to either bram36 or 2x bram18 ''' - # FIXME - #yield ('RAMBFIFO36E1', "RAMB36_X0Y20") - #return - - #for _tile_name, site_name, _site_type in util.get_roi().gen_tiles(): - - #for site in gen_bram36(): - # yield ('RAMBFIFO36E1', site) - + # XXX: mix 18 and 36? for site in gen_bram18(): yield ('RAMB18E1', site) @@ -100,6 +92,7 @@ for loci, (site_type, site) in enumerate(brams): return ('my_RAMB18E1', ports, params) + ''' def place_bram36(): ports = { 'clk': 'clk', @@ -121,10 +114,11 @@ for loci, (site_type, site) in enumerate(brams): 'WRITE_MODE_B': '"WRITE_FIRST"', } return ('my_RAMB36E1', ports, params) + ''' modname, ports, params = { 'RAMB18E1': place_bram18, - 'RAMBFIFO36E1': place_bram36, + #'RAMBFIFO36E1': place_bram36, }[site_type]() verilog.instance(modname, 'inst_%u' % loci, ports, params=params) diff --git a/fuzzers/026-bram-data/minitest/runme.tcl b/fuzzers/026-bram-data/minitest/runme.tcl index 6aa1f9eb..83db6f9b 100644 --- a/fuzzers/026-bram-data/minitest/runme.tcl +++ b/fuzzers/026-bram-data/minitest/runme.tcl @@ -9,7 +9,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/026-bram-data/top.py b/fuzzers/026-bram-data/top.py index 6b029c0c..4adc8c9f 100644 --- a/fuzzers/026-bram-data/top.py +++ b/fuzzers/026-bram-data/top.py @@ -9,13 +9,12 @@ import sys def gen_bram36(): - #yield "RAMB36_X%dY%d" % (x, y) for _tile_name, site_name, _site_type in util.get_roi().gen_sites( ['RAMBFIFO36E1']): yield site_name -DUTN = 10 +DUTN = len(list(gen_bram36())) DIN_N = DUTN * 8 DOUT_N = DUTN * 8 From 5dd62085e273a5ba292fb710c5e337c5f28d0380 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 18:50:05 -0700 Subject: [PATCH 3/5] bram: remove segmaker verbose Signed-off-by: John McMaster --- fuzzers/025-bram-config/generate.py | 2 +- fuzzers/026-bram-data/generate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fuzzers/025-bram-config/generate.py b/fuzzers/025-bram-config/generate.py index cb17c458..9c0dfe5b 100644 --- a/fuzzers/025-bram-config/generate.py +++ b/fuzzers/025-bram-config/generate.py @@ -86,7 +86,7 @@ def write_mode_tags(segmk, ps, site): def run(): - segmk = Segmaker("design.bits", verbose=True) + segmk = Segmaker("design.bits") #segmk.set_def_bt('BLOCK_RAM') print("Loading tags") diff --git a/fuzzers/026-bram-data/generate.py b/fuzzers/026-bram-data/generate.py index 3c75c3c0..402b0564 100644 --- a/fuzzers/026-bram-data/generate.py +++ b/fuzzers/026-bram-data/generate.py @@ -6,7 +6,7 @@ from prjxray.segmaker import Segmaker c2i = {'0': 0, '1': 1} -segmk = Segmaker("design.bits", verbose=True) +segmk = Segmaker("design.bits") segmk.set_def_bt('BLOCK_RAM') print("Loading tags") From 08d38f7dc4926dda57e3d02738ad8b0039f1c698 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 18:50:28 -0700 Subject: [PATCH 4/5] bram config: push to db correctly Signed-off-by: John McMaster --- fuzzers/025-bram-config/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuzzers/025-bram-config/Makefile b/fuzzers/025-bram-config/Makefile index 6fb1f91c..6f0526aa 100644 --- a/fuzzers/025-bram-config/Makefile +++ b/fuzzers/025-bram-config/Makefile @@ -4,11 +4,11 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/seg_bramx.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.segbits - ${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.segbits + ${XRAY_MERGEDB} bram_l build/seg_bramx.segbits + ${XRAY_MERGEDB} bram_r build/seg_bramx.segbits build: mkdir build From bdfef88608b8da7fe8eb7267db52abf260c4f2ef Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 18:51:47 -0700 Subject: [PATCH 5/5] bram config: update gitignore Signed-off-by: John McMaster --- fuzzers/025-bram-config/.gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fuzzers/025-bram-config/.gitignore b/fuzzers/025-bram-config/.gitignore index 932efba0..378eac25 100644 --- a/fuzzers/025-bram-config/.gitignore +++ b/fuzzers/025-bram-config/.gitignore @@ -1,2 +1 @@ -/specimen_[0-9][0-9][0-9]/ -/seg_clbl[lm].segbits +build