diff --git a/logikbench/arithmetic/abs/abs.py b/logikbench/arithmetic/abs/abs.py index 66071f7..9e50d77 100644 --- a/logikbench/arithmetic/abs/abs.py +++ b/logikbench/arithmetic/abs/abs.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/absdiff/absdiff.py b/logikbench/arithmetic/absdiff/absdiff.py index 6ca8d32..d73db56 100644 --- a/logikbench/arithmetic/absdiff/absdiff.py +++ b/logikbench/arithmetic/absdiff/absdiff.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/absdiffs/absdiffs.py b/logikbench/arithmetic/absdiffs/absdiffs.py index 99822a5..c7f4cee 100644 --- a/logikbench/arithmetic/absdiffs/absdiffs.py +++ b/logikbench/arithmetic/absdiffs/absdiffs.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/add/add.py b/logikbench/arithmetic/add/add.py index 77591f8..c0c49d0 100755 --- a/logikbench/arithmetic/add/add.py +++ b/logikbench/arithmetic/add/add.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/addsub/addsub.py b/logikbench/arithmetic/addsub/addsub.py index 9a1c989..8912e31 100644 --- a/logikbench/arithmetic/addsub/addsub.py +++ b/logikbench/arithmetic/addsub/addsub.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/cmp/cmp.py b/logikbench/arithmetic/cmp/cmp.py index a53dd79..fbfe086 100644 --- a/logikbench/arithmetic/cmp/cmp.py +++ b/logikbench/arithmetic/cmp/cmp.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/counter/counter.py b/logikbench/arithmetic/counter/counter.py index 9a94d5d..a38c508 100644 --- a/logikbench/arithmetic/counter/counter.py +++ b/logikbench/arithmetic/counter/counter.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/csa32/csa32.py b/logikbench/arithmetic/csa32/csa32.py index 8a8f78d..df31319 100644 --- a/logikbench/arithmetic/csa32/csa32.py +++ b/logikbench/arithmetic/csa32/csa32.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/csa42/csa42.py b/logikbench/arithmetic/csa42/csa42.py index 6065d28..f0ada0f 100644 --- a/logikbench/arithmetic/csa42/csa42.py +++ b/logikbench/arithmetic/csa42/csa42.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/dec/dec.py b/logikbench/arithmetic/dec/dec.py index d4cac07..afd7989 100644 --- a/logikbench/arithmetic/dec/dec.py +++ b/logikbench/arithmetic/dec/dec.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/dotprod/dotprod.py b/logikbench/arithmetic/dotprod/dotprod.py index 99aa399..359f6c1 100644 --- a/logikbench/arithmetic/dotprod/dotprod.py +++ b/logikbench/arithmetic/dotprod/dotprod.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/inc/inc.py b/logikbench/arithmetic/inc/inc.py index 846a93f..76aa831 100644 --- a/logikbench/arithmetic/inc/inc.py +++ b/logikbench/arithmetic/inc/inc.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/log2/log2.py b/logikbench/arithmetic/log2/log2.py index da5098d..356e604 100644 --- a/logikbench/arithmetic/log2/log2.py +++ b/logikbench/arithmetic/log2/log2.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/mac/mac.py b/logikbench/arithmetic/mac/mac.py index 7fc59f9..3981325 100644 --- a/logikbench/arithmetic/mac/mac.py +++ b/logikbench/arithmetic/mac/mac.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/max/max.py b/logikbench/arithmetic/max/max.py index e5796cc..e2d2657 100644 --- a/logikbench/arithmetic/max/max.py +++ b/logikbench/arithmetic/max/max.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/min/min.py b/logikbench/arithmetic/min/min.py index 8cfe736..1b56e1b 100644 --- a/logikbench/arithmetic/min/min.py +++ b/logikbench/arithmetic/min/min.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/mul/mul.py b/logikbench/arithmetic/mul/mul.py index 6e53c2f..8248b5e 100755 --- a/logikbench/arithmetic/mul/mul.py +++ b/logikbench/arithmetic/mul/mul.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/muladd/muladd.py b/logikbench/arithmetic/muladd/muladd.py index 012df41..d9ce4ca 100755 --- a/logikbench/arithmetic/muladd/muladd.py +++ b/logikbench/arithmetic/muladd/muladd.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/muladdc/muladdc.py b/logikbench/arithmetic/muladdc/muladdc.py index 3b49b41..d0d9d44 100644 --- a/logikbench/arithmetic/muladdc/muladdc.py +++ b/logikbench/arithmetic/muladdc/muladdc.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/mulc/mulc.py b/logikbench/arithmetic/mulc/mulc.py index f09adcc..5649e10 100644 --- a/logikbench/arithmetic/mulc/mulc.py +++ b/logikbench/arithmetic/mulc/mulc.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/mulreg/mulreg.py b/logikbench/arithmetic/mulreg/mulreg.py index 24ff074..2ea1f22 100755 --- a/logikbench/arithmetic/mulreg/mulreg.py +++ b/logikbench/arithmetic/mulreg/mulreg.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/muls/muls.py b/logikbench/arithmetic/muls/muls.py index b95cafc..a13de89 100755 --- a/logikbench/arithmetic/muls/muls.py +++ b/logikbench/arithmetic/muls/muls.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/relu/relu.py b/logikbench/arithmetic/relu/relu.py index 44dc2a5..ed34e19 100644 --- a/logikbench/arithmetic/relu/relu.py +++ b/logikbench/arithmetic/relu/relu.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/round/round.py b/logikbench/arithmetic/round/round.py index 81066df..d9ca585 100644 --- a/logikbench/arithmetic/round/round.py +++ b/logikbench/arithmetic/round/round.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/shiftar/shiftar.py b/logikbench/arithmetic/shiftar/shiftar.py index eca70d7..4b1c43a 100644 --- a/logikbench/arithmetic/shiftar/shiftar.py +++ b/logikbench/arithmetic/shiftar/shiftar.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/shiftb/shiftb.py b/logikbench/arithmetic/shiftb/shiftb.py index eecedb2..07ec46e 100644 --- a/logikbench/arithmetic/shiftb/shiftb.py +++ b/logikbench/arithmetic/shiftb/shiftb.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/shiftl/shiftl.py b/logikbench/arithmetic/shiftl/shiftl.py index fb8e437..a23c8ba 100644 --- a/logikbench/arithmetic/shiftl/shiftl.py +++ b/logikbench/arithmetic/shiftl/shiftl.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/shiftr/shiftr.py b/logikbench/arithmetic/shiftr/shiftr.py index d7890a4..e5f93fc 100644 --- a/logikbench/arithmetic/shiftr/shiftr.py +++ b/logikbench/arithmetic/shiftr/shiftr.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/sine/sine.py b/logikbench/arithmetic/sine/sine.py index d0b97c0..634800c 100644 --- a/logikbench/arithmetic/sine/sine.py +++ b/logikbench/arithmetic/sine/sine.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/sqdiff/sqdiff.py b/logikbench/arithmetic/sqdiff/sqdiff.py index 7c20460..9a8079d 100644 --- a/logikbench/arithmetic/sqdiff/sqdiff.py +++ b/logikbench/arithmetic/sqdiff/sqdiff.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/sqrt/sqrt.py b/logikbench/arithmetic/sqrt/sqrt.py index 88f6482..08270d2 100644 --- a/logikbench/arithmetic/sqrt/sqrt.py +++ b/logikbench/arithmetic/sqrt/sqrt.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/sub/sub.py b/logikbench/arithmetic/sub/sub.py index 2dc2512..e7d02a2 100644 --- a/logikbench/arithmetic/sub/sub.py +++ b/logikbench/arithmetic/sub/sub.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/arithmetic/sum/sum.py b/logikbench/arithmetic/sum/sum.py index 0e5265a..6f9d23a 100644 --- a/logikbench/arithmetic/sum/sum.py +++ b/logikbench/arithmetic/sum/sum.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/arbiter/arbiter.py b/logikbench/basic/arbiter/arbiter.py index 4532d09..ff86075 100644 --- a/logikbench/basic/arbiter/arbiter.py +++ b/logikbench/basic/arbiter/arbiter.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/band/band.py b/logikbench/basic/band/band.py index c49bb45..405829b 100644 --- a/logikbench/basic/band/band.py +++ b/logikbench/basic/band/band.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bbuf/bbuf.py b/logikbench/basic/bbuf/bbuf.py index e40d31e..e995309 100644 --- a/logikbench/basic/bbuf/bbuf.py +++ b/logikbench/basic/bbuf/bbuf.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bin2gray/bin2gray.py b/logikbench/basic/bin2gray/bin2gray.py index 84a0763..9d66675 100644 --- a/logikbench/basic/bin2gray/bin2gray.py +++ b/logikbench/basic/bin2gray/bin2gray.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bin2prio/bin2prio.py b/logikbench/basic/bin2prio/bin2prio.py index 04c6b36..e9e54b1 100644 --- a/logikbench/basic/bin2prio/bin2prio.py +++ b/logikbench/basic/bin2prio/bin2prio.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/binv/binv.py b/logikbench/basic/binv/binv.py index 855c582..346c48a 100644 --- a/logikbench/basic/binv/binv.py +++ b/logikbench/basic/binv/binv.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bnand/bnand.py b/logikbench/basic/bnand/bnand.py index f72ec34..347d878 100644 --- a/logikbench/basic/bnand/bnand.py +++ b/logikbench/basic/bnand/bnand.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bnor/bnor.py b/logikbench/basic/bnor/bnor.py index beb8e9a..0609d29 100644 --- a/logikbench/basic/bnor/bnor.py +++ b/logikbench/basic/bnor/bnor.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bor/bor.py b/logikbench/basic/bor/bor.py index 6c3e7d6..abf3849 100644 --- a/logikbench/basic/bor/bor.py +++ b/logikbench/basic/bor/bor.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bxnor/bxnor.py b/logikbench/basic/bxnor/bxnor.py index 584ad9d..f5ed7d2 100644 --- a/logikbench/basic/bxnor/bxnor.py +++ b/logikbench/basic/bxnor/bxnor.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/bxor/bxor.py b/logikbench/basic/bxor/bxor.py index 20bc890..d95116d 100644 --- a/logikbench/basic/bxor/bxor.py +++ b/logikbench/basic/bxor/bxor.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/crossbar/crossbar.py b/logikbench/basic/crossbar/crossbar.py index cda36f3..54ec278 100644 --- a/logikbench/basic/crossbar/crossbar.py +++ b/logikbench/basic/crossbar/crossbar.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/dffasync/dffasync.py b/logikbench/basic/dffasync/dffasync.py index bef9cc4..279ed45 100644 --- a/logikbench/basic/dffasync/dffasync.py +++ b/logikbench/basic/dffasync/dffasync.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/dffsync/dffsync.py b/logikbench/basic/dffsync/dffsync.py index ca22c2a..bb5b247 100644 --- a/logikbench/basic/dffsync/dffsync.py +++ b/logikbench/basic/dffsync/dffsync.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/gray2bin/gray2bin.py b/logikbench/basic/gray2bin/gray2bin.py index 0b48841..16a403b 100644 --- a/logikbench/basic/gray2bin/gray2bin.py +++ b/logikbench/basic/gray2bin/gray2bin.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/mux/mux.py b/logikbench/basic/mux/mux.py index a6d12f7..87fce90 100644 --- a/logikbench/basic/mux/mux.py +++ b/logikbench/basic/mux/mux.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/muxcase/muxcase.py b/logikbench/basic/muxcase/muxcase.py index 4baed43..1f49f56 100644 --- a/logikbench/basic/muxcase/muxcase.py +++ b/logikbench/basic/muxcase/muxcase.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/muxhot/muxhot.py b/logikbench/basic/muxhot/muxhot.py index 8dc1a8e..ea03208 100755 --- a/logikbench/basic/muxhot/muxhot.py +++ b/logikbench/basic/muxhot/muxhot.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/muxpri/muxpri.py b/logikbench/basic/muxpri/muxpri.py index 371474f..8a7660d 100644 --- a/logikbench/basic/muxpri/muxpri.py +++ b/logikbench/basic/muxpri/muxpri.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/onehot/onehot.py b/logikbench/basic/onehot/onehot.py index 5f0c335..1419dd9 100644 --- a/logikbench/basic/onehot/onehot.py +++ b/logikbench/basic/onehot/onehot.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/pipeline/pipeline.py b/logikbench/basic/pipeline/pipeline.py index 5e07e58..a8d2835 100644 --- a/logikbench/basic/pipeline/pipeline.py +++ b/logikbench/basic/pipeline/pipeline.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/basic/shiftreg/shiftreg.py b/logikbench/basic/shiftreg/shiftreg.py index c834c5b..c376e01 100644 --- a/logikbench/basic/shiftreg/shiftreg.py +++ b/logikbench/basic/shiftreg/shiftreg.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/aes/aes.py b/logikbench/blocks/aes/aes.py index 3b91e74..e88d675 100755 --- a/logikbench/blocks/aes/aes.py +++ b/logikbench/blocks/aes/aes.py @@ -13,7 +13,7 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' @@ -23,7 +23,7 @@ def __init__(self): 'rtl/aes_key_expand_128.v', 'rtl/aes_rcon.v', 'rtl/aes_sbox.v'): - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/apbregs/apbregs.py b/logikbench/blocks/apbregs/apbregs.py index f4df7b5..c1f5dad 100644 --- a/logikbench/blocks/apbregs/apbregs.py +++ b/logikbench/blocks/apbregs/apbregs.py @@ -13,16 +13,17 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module - self.set_topmodule(name, fileset) + self.set_topmodule('apbdev', fileset) + if __name__ == "__main__": - d = Apbdev() - d.write_fileset(f"{d.name()}.f", fileset="rtl") + d = Apbregs() + d.write_fileset(f"{d.name()}.f", fileset="rtl") diff --git a/logikbench/blocks/axicrossbar/axicrossbar.py b/logikbench/blocks/axicrossbar/axicrossbar.py index 6b00473..501685d 100644 --- a/logikbench/blocks/axicrossbar/axicrossbar.py +++ b/logikbench/blocks/axicrossbar/axicrossbar.py @@ -20,12 +20,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(topmodule, fileset) diff --git a/logikbench/blocks/ethmac/ethmac.py b/logikbench/blocks/ethmac/ethmac.py index fcef0f9..53f5209 100755 --- a/logikbench/blocks/ethmac/ethmac.py +++ b/logikbench/blocks/ethmac/ethmac.py @@ -13,7 +13,7 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' @@ -22,7 +22,7 @@ def __init__(self): 'rtl/axis_gmii_rx.v', 'rtl/axis_gmii_tx.v', 'rtl/eth_lfsr.v'): - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/fft/fft.py b/logikbench/blocks/fft/fft.py index 1708214..180f558 100644 --- a/logikbench/blocks/fft/fft.py +++ b/logikbench/blocks/fft/fft.py @@ -14,12 +14,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/firfix/firfix.py b/logikbench/blocks/firfix/firfix.py index 34b00af..633fb04 100755 --- a/logikbench/blocks/firfix/firfix.py +++ b/logikbench/blocks/firfix/firfix.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/firprog/firprog.py b/logikbench/blocks/firprog/firprog.py index 284621f..551b19c 100755 --- a/logikbench/blocks/firprog/firprog.py +++ b/logikbench/blocks/firprog/firprog.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/fpu32/fpu32.py b/logikbench/blocks/fpu32/fpu32.py index 67d3078..fda077f 100644 --- a/logikbench/blocks/fpu32/fpu32.py +++ b/logikbench/blocks/fpu32/fpu32.py @@ -19,12 +19,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(topmodule, fileset) diff --git a/logikbench/blocks/fpu64/fpu64.py b/logikbench/blocks/fpu64/fpu64.py index 360f518..58f2c72 100644 --- a/logikbench/blocks/fpu64/fpu64.py +++ b/logikbench/blocks/fpu64/fpu64.py @@ -26,12 +26,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(topmodule, fileset) diff --git a/logikbench/blocks/i2c/i2c.py b/logikbench/blocks/i2c/i2c.py index bc2b929..dfccdb2 100644 --- a/logikbench/blocks/i2c/i2c.py +++ b/logikbench/blocks/i2c/i2c.py @@ -16,15 +16,15 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # include files - self.add_idir('rtl', fileset, package=root) + self.add_idir('rtl', fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/ialu/ialu.py b/logikbench/blocks/ialu/ialu.py index f6f3858..713f92a 100644 --- a/logikbench/blocks/ialu/ialu.py +++ b/logikbench/blocks/ialu/ialu.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/lfsr/lfsr.py b/logikbench/blocks/lfsr/lfsr.py index b1b66e1..e28edbf 100644 --- a/logikbench/blocks/lfsr/lfsr.py +++ b/logikbench/blocks/lfsr/lfsr.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/picorv32/picorv32.py b/logikbench/blocks/picorv32/picorv32.py index 7c9300f..eb31a76 100755 --- a/logikbench/blocks/picorv32/picorv32.py +++ b/logikbench/blocks/picorv32/picorv32.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/serv/serv.py b/logikbench/blocks/serv/serv.py index 38d1208..29479b8 100644 --- a/logikbench/blocks/serv/serv.py +++ b/logikbench/blocks/serv/serv.py @@ -31,12 +31,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(topmodule, fileset) diff --git a/logikbench/blocks/uart/uart.py b/logikbench/blocks/uart/uart.py index 5de3867..328de43 100755 --- a/logikbench/blocks/uart/uart.py +++ b/logikbench/blocks/uart/uart.py @@ -19,15 +19,15 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # include files - self.add_idir('rtl', fileset, package=root) + self.add_idir('rtl', fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/blocks/umiregs/umiregs.py b/logikbench/blocks/umiregs/umiregs.py index dcd634a..fa20a63 100644 --- a/logikbench/blocks/umiregs/umiregs.py +++ b/logikbench/blocks/umiregs/umiregs.py @@ -13,19 +13,20 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # idir - self.add_idir('rtl', fileset, package=root) + self.add_idir('rtl', fileset, dataroot=root) # top module - self.set_topmodule(name, fileset) + self.set_topmodule('umidev', fileset) + if __name__ == "__main__": - d = Umidev() - d.write_fileset(f"{d.name()}.f", fileset="rtl") + d = Umiregs() + d.write_fileset(f"{d.name()}.f", fileset="rtl") diff --git a/logikbench/epfl/adder/adder.py b/logikbench/epfl/adder/adder.py index 0069a19..bb28b7b 100644 --- a/logikbench/epfl/adder/adder.py +++ b/logikbench/epfl/adder/adder.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/arbiter/arbiter.py b/logikbench/epfl/arbiter/arbiter.py index c82b7af..3e74c21 100644 --- a/logikbench/epfl/arbiter/arbiter.py +++ b/logikbench/epfl/arbiter/arbiter.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/bar/bar.py b/logikbench/epfl/bar/bar.py index a31fc34..0e3e108 100644 --- a/logikbench/epfl/bar/bar.py +++ b/logikbench/epfl/bar/bar.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/cavlc/cavlc.py b/logikbench/epfl/cavlc/cavlc.py index 0c57837..7239c9c 100644 --- a/logikbench/epfl/cavlc/cavlc.py +++ b/logikbench/epfl/cavlc/cavlc.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/dec/dec.py b/logikbench/epfl/dec/dec.py index d4cac07..afd7989 100644 --- a/logikbench/epfl/dec/dec.py +++ b/logikbench/epfl/dec/dec.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/epfl/div/div.py b/logikbench/epfl/div/div.py index 2c7cee5..732a123 100644 --- a/logikbench/epfl/div/div.py +++ b/logikbench/epfl/div/div.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/hyp/hyp.py b/logikbench/epfl/hyp/hyp.py index 8e7179f..c56e245 100644 --- a/logikbench/epfl/hyp/hyp.py +++ b/logikbench/epfl/hyp/hyp.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/i2c/i2c.py b/logikbench/epfl/i2c/i2c.py index 459e6f4..e2e3b73 100644 --- a/logikbench/epfl/i2c/i2c.py +++ b/logikbench/epfl/i2c/i2c.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/epfl/int2float/int2float.py b/logikbench/epfl/int2float/int2float.py index 5fe7bb5..f2cfc7f 100644 --- a/logikbench/epfl/int2float/int2float.py +++ b/logikbench/epfl/int2float/int2float.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/log2/log2.py b/logikbench/epfl/log2/log2.py index cab052b..8699cf4 100644 --- a/logikbench/epfl/log2/log2.py +++ b/logikbench/epfl/log2/log2.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/max/max.py b/logikbench/epfl/max/max.py index d495fa0..01a6966 100644 --- a/logikbench/epfl/max/max.py +++ b/logikbench/epfl/max/max.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/mem_ctrl/mem_ctrl.py b/logikbench/epfl/mem_ctrl/mem_ctrl.py index 0bc8d73..1686d5f 100644 --- a/logikbench/epfl/mem_ctrl/mem_ctrl.py +++ b/logikbench/epfl/mem_ctrl/mem_ctrl.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/epfl/multiplier/multiplier.py b/logikbench/epfl/multiplier/multiplier.py index b947c8a..588abd9 100644 --- a/logikbench/epfl/multiplier/multiplier.py +++ b/logikbench/epfl/multiplier/multiplier.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/priority/priority.py b/logikbench/epfl/priority/priority.py index 78f3233..9bba593 100644 --- a/logikbench/epfl/priority/priority.py +++ b/logikbench/epfl/priority/priority.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/router/router.py b/logikbench/epfl/router/router.py index ce8e65f..d22b7f5 100644 --- a/logikbench/epfl/router/router.py +++ b/logikbench/epfl/router/router.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/sin/sin.py b/logikbench/epfl/sin/sin.py index 63dcd3f..325f42f 100644 --- a/logikbench/epfl/sin/sin.py +++ b/logikbench/epfl/sin/sin.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/sqrt/sqrt.py b/logikbench/epfl/sqrt/sqrt.py index 8d69e78..63b7228 100644 --- a/logikbench/epfl/sqrt/sqrt.py +++ b/logikbench/epfl/sqrt/sqrt.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/square/square.py b/logikbench/epfl/square/square.py index 5ee7750..c1c175f 100644 --- a/logikbench/epfl/square/square.py +++ b/logikbench/epfl/square/square.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/epfl/voter/voter.py b/logikbench/epfl/voter/voter.py index 02771ca..49b04fa 100644 --- a/logikbench/epfl/voter/voter.py +++ b/logikbench/epfl/voter/voter.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule("top", fileset) diff --git a/logikbench/memory/axiram/axiram.py b/logikbench/memory/axiram/axiram.py index 60f9383..72bcf6c 100755 --- a/logikbench/memory/axiram/axiram.py +++ b/logikbench/memory/axiram/axiram.py @@ -14,12 +14,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(topmodule, fileset) diff --git a/logikbench/memory/cache/cache.py b/logikbench/memory/cache/cache.py index 5103a13..698fae9 100644 --- a/logikbench/memory/cache/cache.py +++ b/logikbench/memory/cache/cache.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/fifoasync/fifoasync.py b/logikbench/memory/fifoasync/fifoasync.py index c7cb66b..038f76c 100644 --- a/logikbench/memory/fifoasync/fifoasync.py +++ b/logikbench/memory/fifoasync/fifoasync.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/fifosync/fifosync.py b/logikbench/memory/fifosync/fifosync.py index c887103..bea9581 100644 --- a/logikbench/memory/fifosync/fifosync.py +++ b/logikbench/memory/fifosync/fifosync.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/ramasync/ramasync.py b/logikbench/memory/ramasync/ramasync.py index 7ba84fb..cf8e76f 100644 --- a/logikbench/memory/ramasync/ramasync.py +++ b/logikbench/memory/ramasync/ramasync.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/rambit/rambit.py b/logikbench/memory/rambit/rambit.py index 42e886c..6f9413d 100644 --- a/logikbench/memory/rambit/rambit.py +++ b/logikbench/memory/rambit/rambit.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/rambyte/rambyte.py b/logikbench/memory/rambyte/rambyte.py index c91a3f5..ac17b39 100644 --- a/logikbench/memory/rambyte/rambyte.py +++ b/logikbench/memory/rambyte/rambyte.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/ramdp/ramdp.py b/logikbench/memory/ramdp/ramdp.py index ab4a65a..6e04db5 100644 --- a/logikbench/memory/ramdp/ramdp.py +++ b/logikbench/memory/ramdp/ramdp.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/ramsdp/ramsdp.py b/logikbench/memory/ramsdp/ramsdp.py index 2b2ebc0..d71dbf7 100755 --- a/logikbench/memory/ramsdp/ramsdp.py +++ b/logikbench/memory/ramsdp/ramsdp.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/ramsp/ramsp.py b/logikbench/memory/ramsp/ramsp.py index 2883c22..0408afc 100755 --- a/logikbench/memory/ramsp/ramsp.py +++ b/logikbench/memory/ramsp/ramsp.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/ramspnc/ramspnc.py b/logikbench/memory/ramspnc/ramspnc.py index 3f8b36c..44190e3 100644 --- a/logikbench/memory/ramspnc/ramspnc.py +++ b/logikbench/memory/ramspnc/ramspnc.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/regfile/regfile.py b/logikbench/memory/regfile/regfile.py index 5a7d85b..3b6f6f6 100644 --- a/logikbench/memory/regfile/regfile.py +++ b/logikbench/memory/regfile/regfile.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset) diff --git a/logikbench/memory/rom/rom.py b/logikbench/memory/rom/rom.py index 1541bf4..da71e66 100644 --- a/logikbench/memory/rom/rom.py +++ b/logikbench/memory/rom/rom.py @@ -13,12 +13,12 @@ def __init__(self): super().__init__(name) # set data home directory - self.register_package(root, dirname(abspath(__file__))) + self.set_dataroot(root, dirname(abspath(__file__))) # rtl files fileset = 'rtl' for item in source: - self.add_file(item, fileset, package=root) + self.add_file(item, fileset, dataroot=root) # top module self.set_topmodule(name, fileset)