luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #371 from mcmasterg/build_dir 

hclkpips: build dir
This commit is contained in:
John McMaster 2018-12-19 19:01:47 -08:00 committed by GitHub
parent d2cd93917b ffad776162
commit 84a290c1e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 21 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzzers/.gitignore vendored
View File

@ -1,2 +1,2 @@
timing3.csv build
timing3.txt run.ok

1
fuzzers/005-tilegrid/.gitignore vendored
View File

@ -1 +0,0 @@
build

2
fuzzers/007-timing/.gitignore vendored
View File

@ -1,2 +0,0 @@
build

3
fuzzers/007-timing/minitest/test_unique/.gitignore vendored
View File

@ -1,3 +0,0 @@
specimen_*
build

1
fuzzers/007-timing/timgrid/.gitignore vendored
View File

@ -1 +0,0 @@
build

2
fuzzers/010-lutinit/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/011-ffconfig/.gitignore vendored
View File

@ -1,2 +0,0 @@
build

2
fuzzers/012-clbn5ffmux/.gitignore vendored
View File

@ -1,2 +0,0 @@
build

1
fuzzers/013-clbncy0/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/014-ffsrcemux/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/015-clbnffmux/.gitignore vendored
View File

@ -1 +0,0 @@
build

2
fuzzers/016-clbnoutmux/.gitignore vendored
View File

@ -1,2 +0,0 @@
build

2
fuzzers/017-clbprecyinit/.gitignore vendored
View File

@ -1,2 +0,0 @@
build

1
fuzzers/018-clbram/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/019-ndi1mux/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/025-bram-config/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/025-bram-config/minitest/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/026-bram-data/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/026-bram-data/minitest/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/030-iob/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/030-iob/minitest/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/031-mmcm/.gitignore vendored
View File

@ -1 +0,0 @@
build

1
fuzzers/032-pll/.gitignore vendored
View File

@ -1 +0,0 @@
build

2
fuzzers/050-intpips/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/051-imuxlout/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/052-clkin/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/053-ctrlin/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/054-gfan/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/055-gnd/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/056-rempips/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

2
fuzzers/057-bipips/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok

6
fuzzers/058-hclkpips/.gitignore vendored
View File

@ -1,4 +1,2 @@
/specimen_*/ build
/seg_hclk_[lr].segbits run.ok
/mask_hclk_[lr].segbits
/ppips_hclk_[lr].txt

24
fuzzers/058-hclkpips/Makefile
View File

@ -1,24 +1,24 @@
N := 2 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)) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK) database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o segbits_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) ${XRAY_SEGMATCH} -o build/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_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_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS))
${XRAY_MASKMERGE} mask_hclk_r.db $(addsuffix /segdata_hclk_r_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_l.db | sed 's, .*, always,' > build/ppips_hclk_l.txt
grep CK_INOUT segbits_hclk_r.db | sed 's, .*, always,' > ppips_hclk_r.txt grep CK_INOUT segbits_hclk_r.db | sed 's, .*, always,' > build/ppips_hclk_r.txt
pushdb: pushdb:
${XRAY_DBFIXUP} --db-root . --clb-int ${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} hclk_l segbits_hclk_l.db ${XRAY_MERGEDB} hclk_l build/segbits_hclk_l.db
${XRAY_MERGEDB} hclk_r segbits_hclk_r.db ${XRAY_MERGEDB} hclk_r build/segbits_hclk_r.db
${XRAY_MERGEDB} mask_hclk_l mask_hclk_l.db ${XRAY_MERGEDB} mask_hclk_l build/mask_hclk_l.db
${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.db ${XRAY_MERGEDB} mask_hclk_r build/mask_hclk_r.db
cp ppips_hclk_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_l.db cp build/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 cp build/ppips_hclk_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_r.db
$(SPECIMENS_OK): $(SPECIMENS_OK):
bash generate.sh $(subst /OK,,$@) bash generate.sh $(subst /OK,,$@)
@ -30,7 +30,7 @@ run:
$(MAKE) pushdb $(MAKE) pushdb
clean: 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 .PHONY: database pushdb run clean

4
fuzzers/058-hclkpips/generate.sh
View File

@ -2,11 +2,11 @@
source ${XRAY_GENHEADER} source ${XRAY_GENHEADER}
vivado -mode batch -source ../generate.tcl vivado -mode batch -source $FUZDIR/generate.tcl
for x in design_*.bit; do for x in design_*.bit; do
${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y ${x} ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y ${x}
done done
python3 ../generate.py $(ls design_*.bit | cut -f1 -d.) python3 $FUZDIR/generate.py $(ls design_*.bit | cut -f1 -d.)

6
fuzzers/058-hclkpips/generate.tcl
View File

@ -1,6 +1,8 @@
source "$::env(XRAY_DIR)/utils/utils.tcl"
create_project -force -part $::env(XRAY_PART) design design create_project -force -part $::env(XRAY_PART) design design
read_verilog ../top.v read_verilog $::env(FUZDIR)/top.v
synth_design -top top synth_design -top top
set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_00) IOSTANDARD LVCMOS33" [get_ports i] 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 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 "_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]} if [regexp "_002$" [pwd]] {set tile [lindex [filter [roi_tiles] {TILE_TYPE == HCLK_R}] 0]}

2
fuzzers/100-dsp-mskpat/.gitignore vendored
View File

@ -1,2 +0,0 @@
build
run.ok