From 5b7f6b95afa7572b4c70b325212290c94de5c9b4 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:09:57 -0700 Subject: [PATCH 1/6] 012-clbn5ffmux: use gen_sites() Signed-off-by: John McMaster --- fuzzers/012-clbn5ffmux/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/012-clbn5ffmux/top.py b/fuzzers/012-clbn5ffmux/top.py index 657df90a..68013175 100644 --- a/fuzzers/012-clbn5ffmux/top.py +++ b/fuzzers/012-clbn5ffmux/top.py @@ -2,33 +2,16 @@ import random random.seed(0) import os import re - - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - +from prjxray import util CLBN = 40 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 8 From 31650d8777301d6f0d46e34bfc2db4349028b056 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:13:18 -0700 Subject: [PATCH 2/6] 015-clbnffmux: use gen_sites() Signed-off-by: John McMaster --- fuzzers/015-clbnffmux/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/015-clbnffmux/top.py b/fuzzers/015-clbnffmux/top.py index 1c0b1343..c3a21fda 100644 --- a/fuzzers/015-clbnffmux/top.py +++ b/fuzzers/015-clbnffmux/top.py @@ -2,33 +2,16 @@ import random random.seed(0) import os import re - - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - +from prjxray import util CLBN = 400 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 8 From 4a4a91a1b63a8a1bfcad1f88c8319250746dfa74 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:17:56 -0700 Subject: [PATCH 3/6] 011-ffconfig: use gen_sites() Signed-off-by: John McMaster --- fuzzers/011-ffconfig/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/011-ffconfig/top.py b/fuzzers/011-ffconfig/top.py index 5cd402fd..717f2bbf 100644 --- a/fuzzers/011-ffconfig/top.py +++ b/fuzzers/011-ffconfig/top.py @@ -2,28 +2,11 @@ import random random.seed(0) import os import re +from prjxray import util from prims import * - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - - CLBN = 600 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) f = open("top.txt", "w") @@ -31,9 +14,9 @@ f.write("i,prim,loc,bel,init\n") def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 4 From 5ae13d9cd875b47dcc74f922f2d976a2f5d05da3 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:18:39 -0700 Subject: [PATCH 4/6] 013-clbncy0: use gen_sites() Signed-off-by: John McMaster --- fuzzers/013-clbncy0/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/013-clbncy0/top.py b/fuzzers/013-clbncy0/top.py index 174385c3..531372c1 100644 --- a/fuzzers/013-clbncy0/top.py +++ b/fuzzers/013-clbncy0/top.py @@ -2,33 +2,16 @@ import random random.seed(0) import os import re - - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - +from prjxray import util CLBN = 400 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 8 From 53770ff569185e8410964b5748a1bf435713d7eb Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:22:04 -0700 Subject: [PATCH 5/6] 016-clbnoutmux: use gen_sites() Signed-off-by: John McMaster --- fuzzers/016-clbnoutmux/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/016-clbnoutmux/top.py b/fuzzers/016-clbnoutmux/top.py index f0079d66..bb5bbbe4 100644 --- a/fuzzers/016-clbnoutmux/top.py +++ b/fuzzers/016-clbnoutmux/top.py @@ -2,33 +2,16 @@ import random random.seed(0) import os import re - - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - +from prjxray import util CLBN = 400 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 8 From f677b94566801298e4d6312d1efbd693ef34a405 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 17 Oct 2018 21:25:39 -0700 Subject: [PATCH 6/6] 014-ffsrcemux: use gen_sites() Signed-off-by: John McMaster --- fuzzers/014-ffsrcemux/top.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/fuzzers/014-ffsrcemux/top.py b/fuzzers/014-ffsrcemux/top.py index 115c02cc..398faf4f 100644 --- a/fuzzers/014-ffsrcemux/top.py +++ b/fuzzers/014-ffsrcemux/top.py @@ -2,33 +2,16 @@ import random random.seed(0) import os import re - - -def slice_xy(): - '''Return (X1, X2), (Y1, Y2) from XRAY_ROI, exclusive end (for xrange)''' - # SLICE_X12Y100:SLICE_X27Y149 - # Note XRAY_ROI_GRID_* is something else - m = re.match( - r'SLICE_X([0-9]*)Y([0-9]*):SLICE_X([0-9]*)Y([0-9]*)', - os.getenv('XRAY_ROI')) - ms = [int(m.group(i + 1)) for i in range(4)] - return ((ms[0], ms[2] + 1), (ms[1], ms[3] + 1)) - +from prjxray import util CLBN = 600 -SLICEX, SLICEY = slice_xy() -# 800 -SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) -print('//SLICEX: %s' % str(SLICEX)) -print('//SLICEY: %s' % str(SLICEY)) -print('//SLICEN: %s' % str(SLICEN)) print('//Requested CLBs: %s' % str(CLBN)) def gen_slices(): - for slicey in range(*SLICEY): - for slicex in range(*SLICEX): - yield "SLICE_X%dY%d" % (slicex, slicey) + for _tile_name, site_name, _site_type in util.gen_sites(['SLICEL', + 'SLICEM']): + yield site_name DIN_N = CLBN * 4