From 687f9f858d3530f7dd78aaa26effd3758ef3d1cf Mon Sep 17 00:00:00 2001 From: John McMaster Date: Thu, 7 Dec 2017 12:43:32 -0800 Subject: [PATCH] top.py hard coded ROIs to env derrived Signed-off-by: John McMaster Signed-off-by: Tim 'mithro' Ansell --- fuzzers/011-ffconfig/top.py | 20 +++++++++++++------- fuzzers/012-clbn5ffmux/top.py | 16 +++++++++++----- fuzzers/013-clbncy0/top.py | 16 +++++++++++----- fuzzers/014-ffsrcemux/top.py | 16 +++++++++++----- fuzzers/015-clbnffmux/top.py | 16 +++++++++++----- fuzzers/016-clbnoutmux/top.py | 16 +++++++++++----- 6 files changed, 68 insertions(+), 32 deletions(-) diff --git a/fuzzers/011-ffconfig/top.py b/fuzzers/011-ffconfig/top.py index dbf90b1d..9f78e0b0 100644 --- a/fuzzers/011-ffconfig/top.py +++ b/fuzzers/011-ffconfig/top.py @@ -1,14 +1,20 @@ +import random +random.seed(0) +import os +import re + from prims import * -import random - -random.seed(0) +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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX)) diff --git a/fuzzers/012-clbn5ffmux/top.py b/fuzzers/012-clbn5ffmux/top.py index 62ea8fb8..e1032bad 100644 --- a/fuzzers/012-clbn5ffmux/top.py +++ b/fuzzers/012-clbn5ffmux/top.py @@ -1,12 +1,18 @@ 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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 = 40 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX)) diff --git a/fuzzers/013-clbncy0/top.py b/fuzzers/013-clbncy0/top.py index cc3eed76..fa307753 100644 --- a/fuzzers/013-clbncy0/top.py +++ b/fuzzers/013-clbncy0/top.py @@ -1,12 +1,18 @@ 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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 = 400 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX)) diff --git a/fuzzers/014-ffsrcemux/top.py b/fuzzers/014-ffsrcemux/top.py index 96a2c7f9..a76897be 100644 --- a/fuzzers/014-ffsrcemux/top.py +++ b/fuzzers/014-ffsrcemux/top.py @@ -1,12 +1,18 @@ 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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX)) diff --git a/fuzzers/015-clbnffmux/top.py b/fuzzers/015-clbnffmux/top.py index 0ca2029e..1d0e19e0 100644 --- a/fuzzers/015-clbnffmux/top.py +++ b/fuzzers/015-clbnffmux/top.py @@ -1,12 +1,18 @@ 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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 = 400 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX)) diff --git a/fuzzers/016-clbnoutmux/top.py b/fuzzers/016-clbnoutmux/top.py index cd13373f..2b34e385 100644 --- a/fuzzers/016-clbnoutmux/top.py +++ b/fuzzers/016-clbnoutmux/top.py @@ -1,12 +1,18 @@ 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(.*)Y(.*):SLICE_X(.*)Y(.*)', 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 = 400 -# SLICE_X12Y100 -# SLICE_X27Y149 -SLICEX = (12, 28) -SLICEY = (100, 150) +SLICEX, SLICEY = slice_xy() # 800 SLICEN = (SLICEY[1] - SLICEY[0]) * (SLICEX[1] - SLICEX[0]) print('//SLICEX: %s' % str(SLICEX))