From 9b960b0ccd0ac1e1156bdbe8e464c9d0e427dbe7 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 19 Dec 2018 18:46:51 -0800 Subject: [PATCH 1/2] hclkpips: build dir Signed-off-by: John McMaster --- fuzzers/058-hclkpips/.gitignore | 6 ++---- fuzzers/058-hclkpips/Makefile | 24 ++++++++++++------------ fuzzers/058-hclkpips/generate.sh | 4 ++-- fuzzers/058-hclkpips/generate.tcl | 6 +++--- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/fuzzers/058-hclkpips/.gitignore b/fuzzers/058-hclkpips/.gitignore index 83e2d310..9482bcd3 100644 --- a/fuzzers/058-hclkpips/.gitignore +++ b/fuzzers/058-hclkpips/.gitignore @@ -1,4 +1,2 @@ -/specimen_*/ -/seg_hclk_[lr].segbits -/mask_hclk_[lr].segbits -/ppips_hclk_[lr].txt +build +run.ok diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile index 9586990a..6a88ea55 100644 --- a/fuzzers/058-hclkpips/Makefile +++ b/fuzzers/058-hclkpips/Makefile @@ -1,24 +1,24 @@ N := 2 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) +SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o segbits_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -o segbits_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/segbits_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/segbits_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) ${XRAY_MASKMERGE} mask_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) ${XRAY_MASKMERGE} mask_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) - grep CK_INOUT segbits_hclk_l.db | sed 's, .*, always,' > ppips_hclk_l.txt - grep CK_INOUT segbits_hclk_r.db | sed 's, .*, always,' > ppips_hclk_r.txt + grep CK_INOUT segbits_hclk_l.db | sed 's, .*, always,' > build/ppips_hclk_l.txt + grep CK_INOUT segbits_hclk_r.db | sed 's, .*, always,' > build/ppips_hclk_r.txt pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} hclk_l segbits_hclk_l.db - ${XRAY_MERGEDB} hclk_r segbits_hclk_r.db - ${XRAY_MERGEDB} mask_hclk_l mask_hclk_l.db - ${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.db - cp ppips_hclk_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_l.db - cp ppips_hclk_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_r.db + ${XRAY_MERGEDB} hclk_l build/segbits_hclk_l.db + ${XRAY_MERGEDB} hclk_r build/segbits_hclk_r.db + ${XRAY_MERGEDB} mask_hclk_l build/mask_hclk_l.db + ${XRAY_MERGEDB} mask_hclk_r build/mask_hclk_r.db + cp build/ppips_hclk_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_l.db + cp build/ppips_hclk_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_r.db $(SPECIMENS_OK): bash generate.sh $(subst /OK,,$@) @@ -30,7 +30,7 @@ run: $(MAKE) pushdb clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].db mask_hclk_[lr].segbits ppips_hclk_[lr].txt run.ok + rm -rf build run.ok .PHONY: database pushdb run clean diff --git a/fuzzers/058-hclkpips/generate.sh b/fuzzers/058-hclkpips/generate.sh index 9088b14a..34a820fe 100644 --- a/fuzzers/058-hclkpips/generate.sh +++ b/fuzzers/058-hclkpips/generate.sh @@ -2,11 +2,11 @@ source ${XRAY_GENHEADER} -vivado -mode batch -source ../generate.tcl +vivado -mode batch -source $FUZDIR/generate.tcl for x in design_*.bit; do ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y ${x} done -python3 ../generate.py $(ls design_*.bit | cut -f1 -d.) +python3 $FUZDIR/generate.py $(ls design_*.bit | cut -f1 -d.) diff --git a/fuzzers/058-hclkpips/generate.tcl b/fuzzers/058-hclkpips/generate.tcl index 6a346c30..40a07d95 100644 --- a/fuzzers/058-hclkpips/generate.tcl +++ b/fuzzers/058-hclkpips/generate.tcl @@ -1,6 +1,8 @@ +source "$::env(XRAY_DIR)/utils/utils.tcl" + create_project -force -part $::env(XRAY_PART) design design -read_verilog ../top.v +read_verilog $::env(FUZDIR)/top.v synth_design -top top set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports i] @@ -19,8 +21,6 @@ route_design write_checkpoint -force design.dcp -source ../../../utils/utils.tcl - if [regexp "_001$" [pwd]] {set tile [lindex [filter [roi_tiles] {TILE_TYPE == HCLK_L}] 0]} if [regexp "_002$" [pwd]] {set tile [lindex [filter [roi_tiles] {TILE_TYPE == HCLK_R}] 0]} From ffad77616237e237d6adc0d003d1df3986adcaaf Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 19 Dec 2018 18:52:07 -0800 Subject: [PATCH 2/2] fuzzers: consolidate common gitignores Signed-off-by: John McMaster --- fuzzers/.gitignore | 4 ++-- fuzzers/005-tilegrid/.gitignore | 1 - fuzzers/007-timing/.gitignore | 2 -- fuzzers/007-timing/minitest/test_unique/.gitignore | 3 --- fuzzers/007-timing/timgrid/.gitignore | 1 - fuzzers/010-lutinit/.gitignore | 2 -- fuzzers/011-ffconfig/.gitignore | 2 -- fuzzers/012-clbn5ffmux/.gitignore | 2 -- fuzzers/013-clbncy0/.gitignore | 1 - fuzzers/014-ffsrcemux/.gitignore | 1 - fuzzers/015-clbnffmux/.gitignore | 1 - fuzzers/016-clbnoutmux/.gitignore | 2 -- fuzzers/017-clbprecyinit/.gitignore | 2 -- fuzzers/018-clbram/.gitignore | 1 - fuzzers/019-ndi1mux/.gitignore | 1 - fuzzers/025-bram-config/.gitignore | 1 - fuzzers/025-bram-config/minitest/.gitignore | 1 - fuzzers/026-bram-data/.gitignore | 1 - fuzzers/026-bram-data/minitest/.gitignore | 1 - fuzzers/030-iob/.gitignore | 1 - fuzzers/030-iob/minitest/.gitignore | 1 - fuzzers/031-mmcm/.gitignore | 1 - fuzzers/032-pll/.gitignore | 1 - fuzzers/050-intpips/.gitignore | 2 -- fuzzers/051-imuxlout/.gitignore | 2 -- fuzzers/052-clkin/.gitignore | 2 -- fuzzers/053-ctrlin/.gitignore | 2 -- fuzzers/054-gfan/.gitignore | 2 -- fuzzers/055-gnd/.gitignore | 2 -- fuzzers/056-rempips/.gitignore | 2 -- fuzzers/057-bipips/.gitignore | 2 -- fuzzers/100-dsp-mskpat/.gitignore | 2 -- 32 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 fuzzers/005-tilegrid/.gitignore delete mode 100644 fuzzers/007-timing/.gitignore delete mode 100644 fuzzers/007-timing/minitest/test_unique/.gitignore delete mode 100644 fuzzers/007-timing/timgrid/.gitignore delete mode 100644 fuzzers/010-lutinit/.gitignore delete mode 100644 fuzzers/011-ffconfig/.gitignore delete mode 100644 fuzzers/012-clbn5ffmux/.gitignore delete mode 100644 fuzzers/013-clbncy0/.gitignore delete mode 100644 fuzzers/014-ffsrcemux/.gitignore delete mode 100644 fuzzers/015-clbnffmux/.gitignore delete mode 100644 fuzzers/016-clbnoutmux/.gitignore delete mode 100644 fuzzers/017-clbprecyinit/.gitignore delete mode 100644 fuzzers/018-clbram/.gitignore delete mode 100644 fuzzers/019-ndi1mux/.gitignore delete mode 100644 fuzzers/025-bram-config/.gitignore delete mode 100644 fuzzers/025-bram-config/minitest/.gitignore delete mode 100644 fuzzers/026-bram-data/.gitignore delete mode 100644 fuzzers/026-bram-data/minitest/.gitignore delete mode 100644 fuzzers/030-iob/.gitignore delete mode 100644 fuzzers/030-iob/minitest/.gitignore delete mode 100644 fuzzers/031-mmcm/.gitignore delete mode 100644 fuzzers/032-pll/.gitignore delete mode 100644 fuzzers/050-intpips/.gitignore delete mode 100644 fuzzers/051-imuxlout/.gitignore delete mode 100644 fuzzers/052-clkin/.gitignore delete mode 100644 fuzzers/053-ctrlin/.gitignore delete mode 100644 fuzzers/054-gfan/.gitignore delete mode 100644 fuzzers/055-gnd/.gitignore delete mode 100644 fuzzers/056-rempips/.gitignore delete mode 100644 fuzzers/057-bipips/.gitignore delete mode 100644 fuzzers/100-dsp-mskpat/.gitignore diff --git a/fuzzers/.gitignore b/fuzzers/.gitignore index 01a18a08..9482bcd3 100644 --- a/fuzzers/.gitignore +++ b/fuzzers/.gitignore @@ -1,2 +1,2 @@ -timing3.csv -timing3.txt +build +run.ok diff --git a/fuzzers/005-tilegrid/.gitignore b/fuzzers/005-tilegrid/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/005-tilegrid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/007-timing/.gitignore b/fuzzers/007-timing/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/fuzzers/007-timing/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/fuzzers/007-timing/minitest/test_unique/.gitignore b/fuzzers/007-timing/minitest/test_unique/.gitignore deleted file mode 100644 index 374eddc2..00000000 --- a/fuzzers/007-timing/minitest/test_unique/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -specimen_* -build - diff --git a/fuzzers/007-timing/timgrid/.gitignore b/fuzzers/007-timing/timgrid/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/007-timing/timgrid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/010-lutinit/.gitignore b/fuzzers/010-lutinit/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/010-lutinit/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/011-ffconfig/.gitignore b/fuzzers/011-ffconfig/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/fuzzers/011-ffconfig/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/fuzzers/012-clbn5ffmux/.gitignore b/fuzzers/012-clbn5ffmux/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/fuzzers/012-clbn5ffmux/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/fuzzers/013-clbncy0/.gitignore b/fuzzers/013-clbncy0/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/013-clbncy0/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/014-ffsrcemux/.gitignore b/fuzzers/014-ffsrcemux/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/014-ffsrcemux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/015-clbnffmux/.gitignore b/fuzzers/015-clbnffmux/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/015-clbnffmux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/016-clbnoutmux/.gitignore b/fuzzers/016-clbnoutmux/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/fuzzers/016-clbnoutmux/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/fuzzers/017-clbprecyinit/.gitignore b/fuzzers/017-clbprecyinit/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/fuzzers/017-clbprecyinit/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/fuzzers/018-clbram/.gitignore b/fuzzers/018-clbram/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/018-clbram/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/019-ndi1mux/.gitignore b/fuzzers/019-ndi1mux/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/019-ndi1mux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/025-bram-config/.gitignore b/fuzzers/025-bram-config/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/025-bram-config/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/025-bram-config/minitest/.gitignore b/fuzzers/025-bram-config/minitest/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/025-bram-config/minitest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/026-bram-data/.gitignore b/fuzzers/026-bram-data/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/026-bram-data/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/026-bram-data/minitest/.gitignore b/fuzzers/026-bram-data/minitest/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/026-bram-data/minitest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/030-iob/.gitignore b/fuzzers/030-iob/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/030-iob/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/030-iob/minitest/.gitignore b/fuzzers/030-iob/minitest/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/030-iob/minitest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/031-mmcm/.gitignore b/fuzzers/031-mmcm/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/031-mmcm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/032-pll/.gitignore b/fuzzers/032-pll/.gitignore deleted file mode 100644 index 378eac25..00000000 --- a/fuzzers/032-pll/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/fuzzers/050-intpips/.gitignore b/fuzzers/050-intpips/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/050-intpips/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/051-imuxlout/.gitignore b/fuzzers/051-imuxlout/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/051-imuxlout/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/052-clkin/.gitignore b/fuzzers/052-clkin/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/052-clkin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/053-ctrlin/.gitignore b/fuzzers/053-ctrlin/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/053-ctrlin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/054-gfan/.gitignore b/fuzzers/054-gfan/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/054-gfan/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/055-gnd/.gitignore b/fuzzers/055-gnd/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/055-gnd/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/056-rempips/.gitignore b/fuzzers/056-rempips/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/056-rempips/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/057-bipips/.gitignore b/fuzzers/057-bipips/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/057-bipips/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok diff --git a/fuzzers/100-dsp-mskpat/.gitignore b/fuzzers/100-dsp-mskpat/.gitignore deleted file mode 100644 index 9482bcd3..00000000 --- a/fuzzers/100-dsp-mskpat/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -run.ok