segmaker.py: move to prjxray, class segmaker => Segmaker

Signed-off-by: John McMaster <johndmcmaster@gmail.com>

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:

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()

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

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:

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):

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")
 '''

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")
 '''

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")
 '''

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")

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")

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')

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

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")
 '''

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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'