Add hclk db entries

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Clifford Wolf 2017-12-01 16:08:39 +00:00 committed by Tim 'mithro' Ansell
parent 6a34fe54ce
commit b4aa4e3fe0
4 changed files with 14 additions and 8 deletions

View File

@ -1 +1,2 @@
/specimen_*/
/seg_hclk_[lr].segbits

View File

@ -4,20 +4,20 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK)
# ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS))
# ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS))
${XRAY_SEGMATCH} -o seg_hclk_l.segbits $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS))
${XRAY_SEGMATCH} -o seg_hclk_r.segbits $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS))
pushdb:
# ${XRAY_MERGEDB} int_l seg_int_l.segbits
# ${XRAY_MERGEDB} int_r seg_int_r.segbits
# ${XRAY_DBFIXUP}
${XRAY_MERGEDB} hclk_l seg_hclk_l.segbits
${XRAY_MERGEDB} hclk_r seg_hclk_r.segbits
${XRAY_DBFIXUP}
$(SPECIMENS_OK):
bash generate.sh $(subst /OK,,$@)
touch $@
clean:
rm -rf specimen_[0-9][0-9][0-9]/
rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].segbits
.PHONY: database pushdb clean

View File

@ -15,7 +15,7 @@ for arg in sys.argv[1:]:
_, pip = pip.split("/")
tile_type, pip = pip.split(".")
src, dst = pip.split("->>")
tag = "%s.%s.%s" % (tile_type, dst, src)
tag = "%s.%s" % (dst, src)
tags[tag] = dst
for arg in sys.argv[1:]:
@ -32,7 +32,7 @@ for arg in sys.argv[1:]:
_, pip = pip.split("/")
tile_type, pip = pip.split(".")
src, dst = pip.split("->>")
tag = "%s.%s.%s" % (tile_type, dst, src)
tag = "%s.%s" % (dst, src)
segmk.addtag(tile, tag, 1)
for tag, tag_dst in tags.items():
if tag_dst != dst:

View File

@ -32,6 +32,11 @@ case "$1" in
int_r)
sed < "$2" > "$tmp1" -e 's/^INT\./INT_R./' ;;
hclk_l)
sed < "$2" > "$tmp1" -e 's/^HCLK\./HCLK_L./' ;;
hclk_r)
sed < "$2" > "$tmp1" -e 's/^HCLK\./HCLK_R./' ;;
mask_*)
db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/$1.db
cp "$2" "$tmp1" ;;