diff --git a/experiments/clbpips/generate.py b/experiments/clbpips/generate.py index c07273ff..1a625365 100644 --- a/experiments/clbpips/generate.py +++ b/experiments/clbpips/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags from design.txt.") with open("design.txt", "r") as f: diff --git a/experiments/gndvcc/generate.py b/experiments/gndvcc/generate.py index f358974d..3f814358 100644 --- a/experiments/gndvcc/generate.py +++ b/experiments/gndvcc/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/experiments/pipsroute/generate.py b/experiments/pipsroute/generate.py index bd91f039..aa131cae 100644 --- a/experiments/pipsroute/generate.py +++ b/experiments/pipsroute/generate.py @@ -2,15 +2,14 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker pipdata = dict() ignpip = set() def handle_design(prefix, second_pass): - segmk = segmaker(prefix + ".bits") + segmk = Segmaker(prefix + ".bits") tiledata = dict() nlines = 0 diff --git a/fuzzers/010-lutinit/generate.py b/fuzzers/010-lutinit/generate.py index 4b92c86d..bcf8c3ac 100644 --- a/fuzzers/010-lutinit/generate.py +++ b/fuzzers/010-lutinit/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design_%s.bits" % sys.argv[1]) +segmk = Segmaker("design_%s.bits" % sys.argv[1]) print("Loading tags from design_%s.txt." % sys.argv[1]) with open("design_%s.txt" % sys.argv[1], "r") as f: diff --git a/fuzzers/011-ffconfig/generate.py b/fuzzers/011-ffconfig/generate.py index 3510e0f9..32489cb2 100644 --- a/fuzzers/011-ffconfig/generate.py +++ b/fuzzers/011-ffconfig/generate.py @@ -12,10 +12,9 @@ from prims import * import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") def ones(l): diff --git a/fuzzers/012-clbn5ffmux/generate.py b/fuzzers/012-clbn5ffmux/generate.py index e2e5a7d9..36731949 100644 --- a/fuzzers/012-clbn5ffmux/generate.py +++ b/fuzzers/012-clbn5ffmux/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags") ''' diff --git a/fuzzers/013-clbncy0/generate.py b/fuzzers/013-clbncy0/generate.py index b3703363..f495e6b9 100644 --- a/fuzzers/013-clbncy0/generate.py +++ b/fuzzers/013-clbncy0/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags") ''' diff --git a/fuzzers/014-ffsrcemux/generate.py b/fuzzers/014-ffsrcemux/generate.py index befda57c..54cf7b86 100644 --- a/fuzzers/014-ffsrcemux/generate.py +++ b/fuzzers/014-ffsrcemux/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags") ''' diff --git a/fuzzers/015-clbnffmux/generate.py b/fuzzers/015-clbnffmux/generate.py index 79b49912..f67ed95b 100644 --- a/fuzzers/015-clbnffmux/generate.py +++ b/fuzzers/015-clbnffmux/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") cache = dict() print("Loading tags") diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clbnoutmux/generate.py index ede555f0..06317501 100644 --- a/fuzzers/016-clbnoutmux/generate.py +++ b/fuzzers/016-clbnoutmux/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") cache = dict() print("Loading tags") diff --git a/fuzzers/017-clbprecyinit/generate.py b/fuzzers/017-clbprecyinit/generate.py index 5da0f0b9..411c291a 100644 --- a/fuzzers/017-clbprecyinit/generate.py +++ b/fuzzers/017-clbprecyinit/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags") f = open('params.csv', 'r') diff --git a/fuzzers/018-clbram/generate.py b/fuzzers/018-clbram/generate.py index 88b99c81..828f8fb4 100644 --- a/fuzzers/018-clbram/generate.py +++ b/fuzzers/018-clbram/generate.py @@ -2,10 +2,9 @@ import sys, re, os -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") # Can fit 4 per CLB # BELable diff --git a/fuzzers/019-ndi1mux/generate.py b/fuzzers/019-ndi1mux/generate.py index 84738272..64fb4a26 100644 --- a/fuzzers/019-ndi1mux/generate.py +++ b/fuzzers/019-ndi1mux/generate.py @@ -7,10 +7,9 @@ WA7USED = 0 import sys, re, os -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") print("Loading tags") ''' diff --git a/fuzzers/050-intpips/generate.py b/fuzzers/050-intpips/generate.py index 4e6f261f..5752b3b7 100644 --- a/fuzzers/050-intpips/generate.py +++ b/fuzzers/050-intpips/generate.py @@ -2,10 +2,9 @@ import sys, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/051-imuxlout/generate.py b/fuzzers/051-imuxlout/generate.py index 36b63abc..9f8dcf11 100644 --- a/fuzzers/051-imuxlout/generate.py +++ b/fuzzers/051-imuxlout/generate.py @@ -2,10 +2,9 @@ import sys, re, os -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/052-clkin/generate.py b/fuzzers/052-clkin/generate.py index 45088648..e4d872dd 100644 --- a/fuzzers/052-clkin/generate.py +++ b/fuzzers/052-clkin/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/053-ctrlin/generate.py b/fuzzers/053-ctrlin/generate.py index b428fc6c..783d879f 100644 --- a/fuzzers/053-ctrlin/generate.py +++ b/fuzzers/053-ctrlin/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/054-gfan/generate.py b/fuzzers/054-gfan/generate.py index 943102d4..cb4be182 100644 --- a/fuzzers/054-gfan/generate.py +++ b/fuzzers/054-gfan/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/055-gnd/generate.py b/fuzzers/055-gnd/generate.py index f358974d..3f814358 100644 --- a/fuzzers/055-gnd/generate.py +++ b/fuzzers/055-gnd/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/056-rempips/generate.py b/fuzzers/056-rempips/generate.py index 5304ec88..f9b67cc2 100644 --- a/fuzzers/056-rempips/generate.py +++ b/fuzzers/056-rempips/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/057-bipips/generate.py b/fuzzers/057-bipips/generate.py index e27b57a1..cba62115 100644 --- a/fuzzers/057-bipips/generate.py +++ b/fuzzers/057-bipips/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design.bits") +segmk = Segmaker("design.bits") tiledata = dict() pipdata = set() diff --git a/fuzzers/058-hclkpips/generate.py b/fuzzers/058-hclkpips/generate.py index c51d1a52..a1775e91 100644 --- a/fuzzers/058-hclkpips/generate.py +++ b/fuzzers/058-hclkpips/generate.py @@ -2,8 +2,7 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker tags = dict() en_tags = dict() @@ -24,7 +23,7 @@ for arg in sys.argv[1:]: for arg in sys.argv[1:]: print("Processing %s." % arg) - segmk = segmaker(arg + ".bits") + segmk = Segmaker(arg + ".bits") tiledata = dict() pipdata = dict() diff --git a/fuzzers/100-dsp-mskpat/generate.py b/fuzzers/100-dsp-mskpat/generate.py index 989ade12..b57464ae 100644 --- a/fuzzers/100-dsp-mskpat/generate.py +++ b/fuzzers/100-dsp-mskpat/generate.py @@ -2,10 +2,9 @@ import sys, os, re -sys.path.append("../../../utils/") -from segmaker import segmaker +from prjxray.segmaker import Segmaker -segmk = segmaker("design_%s.bits" % sys.argv[1]) +segmk = Segmaker("design_%s.bits" % sys.argv[1]) pipdata = dict() ignpip = set() diff --git a/utils/segmaker.py b/prjxray/segmaker.py similarity index 99% rename from utils/segmaker.py rename to prjxray/segmaker.py index dc85541b..8cd8ee41 100644 --- a/utils/segmaker.py +++ b/prjxray/segmaker.py @@ -40,7 +40,7 @@ def json_hex2i(s): return int(s[2:], 16) -class segmaker: +class Segmaker: def __init__(self, bitsfile, verbose=None): self.verbose = verbose if verbose is not None else os.getenv( 'VERBOSE', 'N') == 'Y'