From b912f289a6f7dfd5ffbfa93d53ed2c26015a6679 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Tue, 27 Nov 2018 12:02:53 -0800 Subject: [PATCH] Remove extra X in instance names --- compiler/modules/dff_array.py | 4 ++-- compiler/modules/dff_buf_array.py | 2 +- compiler/modules/dff_inv_array.py | 4 ++-- compiler/modules/hierarchical_predecode.py | 4 ++-- compiler/modules/write_driver_array.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/modules/dff_array.py b/compiler/modules/dff_array.py index 97e82e24..52c79473 100644 --- a/compiler/modules/dff_array.py +++ b/compiler/modules/dff_array.py @@ -59,7 +59,7 @@ class dff_array(design.design): self.dff_insts={} for row in range(self.rows): for col in range(self.columns): - name = "Xdff_r{0}_c{1}".format(row,col) + name = "dff_r{0}_c{1}".format(row,col) self.dff_insts[row,col]=self.add_inst(name=name, mod=self.dff) self.connect_inst([self.get_din_name(row,col), @@ -71,7 +71,7 @@ class dff_array(design.design): def place_dff_array(self): for row in range(self.rows): for col in range(self.columns): - name = "Xdff_r{0}_c{1}".format(row,col) + name = "dff_r{0}_c{1}".format(row,col) if (row % 2 == 0): base = vector(col*self.dff.width,row*self.dff.height) mirror = "R0" diff --git a/compiler/modules/dff_buf_array.py b/compiler/modules/dff_buf_array.py index cf2bbef9..d5ad75ec 100644 --- a/compiler/modules/dff_buf_array.py +++ b/compiler/modules/dff_buf_array.py @@ -61,7 +61,7 @@ class dff_buf_array(design.design): self.dff_insts={} for row in range(self.rows): for col in range(self.columns): - name = "Xdff_r{0}_c{1}".format(row,col) + name = "dff_r{0}_c{1}".format(row,col) self.dff_insts[row,col]=self.add_inst(name=name, mod=self.dff) self.connect_inst([self.get_din_name(row,col), diff --git a/compiler/modules/dff_inv_array.py b/compiler/modules/dff_inv_array.py index 4143f3e3..81aa7337 100644 --- a/compiler/modules/dff_inv_array.py +++ b/compiler/modules/dff_inv_array.py @@ -61,7 +61,7 @@ class dff_inv_array(design.design): self.dff_insts={} for row in range(self.rows): for col in range(self.columns): - name = "Xdff_r{0}_c{1}".format(row,col) + name = "dff_r{0}_c{1}".format(row,col) self.dff_insts[row,col]=self.add_inst(name=name, mod=self.dff) self.connect_inst([self.get_din_name(row,col), @@ -74,7 +74,7 @@ class dff_inv_array(design.design): def place_dff_array(self): for row in range(self.rows): for col in range(self.columns): - name = "Xdff_r{0}_c{1}".format(row,col) + name = "dff_r{0}_c{1}".format(row,col) if (row % 2 == 0): base = vector(col*self.dff.width,row*self.dff.height) mirror = "R0" diff --git a/compiler/modules/hierarchical_predecode.py b/compiler/modules/hierarchical_predecode.py index 85ead465..944eed02 100644 --- a/compiler/modules/hierarchical_predecode.py +++ b/compiler/modules/hierarchical_predecode.py @@ -90,7 +90,7 @@ class hierarchical_predecode(design.design): """ Create the input inverters to invert input signals for the decode stage. """ self.in_inst = [] for inv_num in range(self.number_of_inputs): - name = "Xpre_inv_{0}".format(inv_num) + name = "pre_inv_{0}".format(inv_num) self.in_inst.append(self.add_inst(name=name, mod=self.inv)) self.connect_inst(["in_{0}".format(inv_num), @@ -114,7 +114,7 @@ class hierarchical_predecode(design.design): """ Create inverters for the inverted output decode signals. """ self.inv_inst = [] for inv_num in range(self.number_of_outputs): - name = "Xpre_nand_inv_{}".format(inv_num) + name = "pre_nand_inv_{}".format(inv_num) self.inv_inst.append(self.add_inst(name=name, mod=self.inv)) self.connect_inst(["Z_{}".format(inv_num), diff --git a/compiler/modules/write_driver_array.py b/compiler/modules/write_driver_array.py index 61fe8c24..3b5e75d9 100644 --- a/compiler/modules/write_driver_array.py +++ b/compiler/modules/write_driver_array.py @@ -68,7 +68,7 @@ class write_driver_array(design.design): def create_write_array(self): self.driver_insts = {} for i in range(0,self.columns,self.words_per_row): - name = "Xwrite_driver{}".format(i) + name = "write_driver{}".format(i) index = int(i/self.words_per_row) self.driver_insts[index]=self.add_inst(name=name, mod=self.driver)