Make Segmaker db_root be implicit.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>

experiments/clbpips/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags from design.txt.")
 with open("design.txt", "r") as f:

experiments/gndvcc/generate.py

@@ -3,9 +3,8 @@
 import re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

experiments/pipsroute/generate.py

@@ -3,14 +3,13 @@
 import sys, re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
 pipdata = dict()
 ignpip = set()
 
 
 def handle_design(prefix, second_pass):
-    segmk = Segmaker(util.get_db_root(), prefix + ".bits")
+    segmk = Segmaker(prefix + ".bits")
 
     tiledata = dict()
     nlines = 0

fuzzers/010-lutinit/generate.py

@@ -3,9 +3,8 @@
 import sys
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "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

@@ -11,9 +11,8 @@ LDPE Primitive: Transparent Data Latch with Asynchronous Preset and Gate Enable
 from prims import *
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 
 def ones(l):

fuzzers/012-clbn5ffmux/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags")
 '''

fuzzers/013-clbncy0/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags")
 '''

fuzzers/014-ffsrcemux/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags")
 '''

fuzzers/015-clbnffmux/generate.py

@@ -3,7 +3,7 @@
 from prjxray.segmaker import Segmaker
 from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 cache = dict()
 
 print("Loading tags")

fuzzers/016-clbnoutmux/generate.py

@@ -3,7 +3,7 @@
 from prjxray.segmaker import Segmaker
 from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 cache = dict()
 
 print("Loading tags")

fuzzers/017-clbprecyinit/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags")
 f = open('params.csv', 'r')

fuzzers/018-clbram/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 # Can fit 4 per CLB
 # BELable

fuzzers/019-ndi1mux/generate.py

@@ -6,9 +6,8 @@
 WA7USED = 0
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 print("Loading tags")
 '''

fuzzers/050-intpips/generate.py

@@ -3,9 +3,8 @@
 import re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/051-imuxlout/generate.py

@@ -3,9 +3,8 @@
 import re, os
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/052-clkin/generate.py

@@ -3,9 +3,8 @@
 import os, re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/053-ctrlin/generate.py

@@ -3,9 +3,8 @@
 import os, re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/054-gfan/generate.py

@@ -3,9 +3,8 @@
 import re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/055-gnd/generate.py

@@ -3,9 +3,8 @@
 import re
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/056-rempips/generate.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = dict()

fuzzers/057-bipips/generate.py

@@ -3,9 +3,8 @@
 import os
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design.bits")
+segmk = Segmaker("design.bits")
 
 tiledata = dict()
 pipdata = set()

fuzzers/058-hclkpips/generate.py

@@ -3,7 +3,6 @@
 import sys
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
 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(util.get_db_root(), arg + ".bits")
+    segmk = Segmaker(arg + ".bits")
 
     tiledata = dict()
     pipdata = dict()

fuzzers/100-dsp-mskpat/generate.py

@@ -3,9 +3,8 @@
 import sys
 
 from prjxray.segmaker import Segmaker
-from prjxray import util
 
-segmk = Segmaker(util.get_db_root(), "design_%s.bits" % sys.argv[1])
+segmk = Segmaker("design_%s.bits" % sys.argv[1])
 
 pipdata = dict()
 ignpip = set()

prjxray/segmaker.py

@@ -14,6 +14,7 @@ tilegrid.json provides tile addresses
 '''
 
 import os, json, re
+from prjxray import util
 
 BLOCK_TYPES = set(('CLB_IO_CLK', 'BLOCK_RAM', 'CFG_CLB'))
 
@@ -38,8 +39,11 @@ def json_hex2i(s):
 
 
 class Segmaker:
-    def __init__(self, db_root, bitsfile, verbose=None):
+    def __init__(self, bitsfile, verbose=None, db_root=None):
         self.db_root = db_root
+        if self.db_root is None:
+            self.db_root = util.get_db_root()
+
         self.verbose = verbose if verbose is not None else os.getenv(
             'VERBOSE', 'N') == 'Y'
         self.load_grid()