diff --git a/experiments/clbpips/generate.py b/experiments/clbpips/generate.py index 58824df8..b2fe2a2c 100644 --- a/experiments/clbpips/generate.py +++ b/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: diff --git a/experiments/gndvcc/generate.py b/experiments/gndvcc/generate.py index f0200544..366db065 100644 --- a/experiments/gndvcc/generate.py +++ b/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() diff --git a/experiments/pipsroute/generate.py b/experiments/pipsroute/generate.py index c58c8298..aa131cae 100644 --- a/experiments/pipsroute/generate.py +++ b/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 diff --git a/fuzzers/010-lutinit/generate.py b/fuzzers/010-lutinit/generate.py index 4e53630c..ea6ceae3 100644 --- a/fuzzers/010-lutinit/generate.py +++ b/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: diff --git a/fuzzers/011-ffconfig/generate.py b/fuzzers/011-ffconfig/generate.py index 169a6c1b..d27a3497 100644 --- a/fuzzers/011-ffconfig/generate.py +++ b/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): diff --git a/fuzzers/012-clbn5ffmux/generate.py b/fuzzers/012-clbn5ffmux/generate.py index 521e4d03..aae15bcf 100644 --- a/fuzzers/012-clbn5ffmux/generate.py +++ b/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") ''' diff --git a/fuzzers/013-clbncy0/generate.py b/fuzzers/013-clbncy0/generate.py index 333c4aa0..d1124ba5 100644 --- a/fuzzers/013-clbncy0/generate.py +++ b/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") ''' diff --git a/fuzzers/014-ffsrcemux/generate.py b/fuzzers/014-ffsrcemux/generate.py index d3618ff8..a936f8a8 100644 --- a/fuzzers/014-ffsrcemux/generate.py +++ b/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") ''' diff --git a/fuzzers/015-clbnffmux/generate.py b/fuzzers/015-clbnffmux/generate.py index f2d60d1d..3fa520ad 100644 --- a/fuzzers/015-clbnffmux/generate.py +++ b/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") diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clbnoutmux/generate.py index d463f64b..ada2425b 100644 --- a/fuzzers/016-clbnoutmux/generate.py +++ b/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") diff --git a/fuzzers/017-clbprecyinit/generate.py b/fuzzers/017-clbprecyinit/generate.py index 6035d675..6fa1265b 100644 --- a/fuzzers/017-clbprecyinit/generate.py +++ b/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') diff --git a/fuzzers/018-clbram/generate.py b/fuzzers/018-clbram/generate.py index 74e4154a..2a62bdde 100644 --- a/fuzzers/018-clbram/generate.py +++ b/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 diff --git a/fuzzers/019-ndi1mux/generate.py b/fuzzers/019-ndi1mux/generate.py index 03317dd4..71a8fe61 100644 --- a/fuzzers/019-ndi1mux/generate.py +++ b/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") ''' diff --git a/fuzzers/050-intpips/generate.py b/fuzzers/050-intpips/generate.py index 13573664..ad9dc1a3 100644 --- a/fuzzers/050-intpips/generate.py +++ b/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() diff --git a/fuzzers/051-imuxlout/generate.py b/fuzzers/051-imuxlout/generate.py index 66c23414..a8638ee2 100644 --- a/fuzzers/051-imuxlout/generate.py +++ b/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() diff --git a/fuzzers/052-clkin/generate.py b/fuzzers/052-clkin/generate.py index fa5f9463..4d39578c 100644 --- a/fuzzers/052-clkin/generate.py +++ b/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() diff --git a/fuzzers/053-ctrlin/generate.py b/fuzzers/053-ctrlin/generate.py index 70d82ad2..d58c6f86 100644 --- a/fuzzers/053-ctrlin/generate.py +++ b/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() diff --git a/fuzzers/054-gfan/generate.py b/fuzzers/054-gfan/generate.py index a05df06b..6a882d91 100644 --- a/fuzzers/054-gfan/generate.py +++ b/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() diff --git a/fuzzers/055-gnd/generate.py b/fuzzers/055-gnd/generate.py index 04f38579..5bc37073 100644 --- a/fuzzers/055-gnd/generate.py +++ b/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() diff --git a/fuzzers/056-rempips/generate.py b/fuzzers/056-rempips/generate.py index 56e761f8..ad7f4584 100644 --- a/fuzzers/056-rempips/generate.py +++ b/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() diff --git a/fuzzers/057-bipips/generate.py b/fuzzers/057-bipips/generate.py index 903f2162..d22412fe 100644 --- a/fuzzers/057-bipips/generate.py +++ b/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() diff --git a/fuzzers/058-hclkpips/generate.py b/fuzzers/058-hclkpips/generate.py index 72a4dab7..f32fb121 100644 --- a/fuzzers/058-hclkpips/generate.py +++ b/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() diff --git a/fuzzers/100-dsp-mskpat/generate.py b/fuzzers/100-dsp-mskpat/generate.py index 870daf03..c1b2accc 100644 --- a/fuzzers/100-dsp-mskpat/generate.py +++ b/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() diff --git a/prjxray/segmaker.py b/prjxray/segmaker.py index 887e2951..1be40cb4 100644 --- a/prjxray/segmaker.py +++ b/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()