diff --git a/compiler/characterizer/functional.py b/compiler/characterizer/functional.py index 1aed19b9..4386b293 100644 --- a/compiler/characterizer/functional.py +++ b/compiler/characterizer/functional.py @@ -124,6 +124,7 @@ class functional(simulation): comment = self.gen_cycle_comment("read", word, addr, port, self.wmask, self.t_current) self.add_read_one_port(comment, addr, rw_read_din_data, port) self.write_check.append([word, "{0}{1}".format(self.dout_name,port), self.t_current+self.period, check]) + # don't check X's check += 1 self.cycle_times.append(self.t_current) self.t_current += self.period @@ -136,7 +137,7 @@ class functional(simulation): if port in self.readwrite_ports: op = random.choice(rw_ops) elif port in self.write_ports: - op = random.choice(w_ops) + op = rcandom.choice(w_ops) else: op = random.choice(r_ops) diff --git a/compiler/gdsMill/gdsMill/vlsiLayout.py b/compiler/gdsMill/gdsMill/vlsiLayout.py index 57e81768..f4248ebd 100644 --- a/compiler/gdsMill/gdsMill/vlsiLayout.py +++ b/compiler/gdsMill/gdsMill/vlsiLayout.py @@ -729,7 +729,7 @@ class VlsiLayout: def getBlockages(self,layer): """ - Return all blockages on a given layer in [llx, lly, urx, ury] format and + Return all blockages on a given layer in [coordinate 1, coordinate 2,...] format and user units. """ blockages = [] @@ -744,7 +744,7 @@ class VlsiLayout: def getAllShapes(self,layer): """ - Return all shapes on a given layer in [llx, lly, urx, ury] format and user units for rectangles + Return all shapes on a given layer in [llx, lly, urx, ury] format and user units for rectangles and [coordinate 1, coordinate 2,...] format and user units for polygons. """ boundaries = set() diff --git a/compiler/modules/port_data.py b/compiler/modules/port_data.py index 2f5b634f..480047fe 100644 --- a/compiler/modules/port_data.py +++ b/compiler/modules/port_data.py @@ -175,7 +175,7 @@ class port_data(design.design): columns=self.num_cols, word_size=self.word_size, write_size=self.write_size) - self.add_mod(self.write_driver_array) + self.add_mod(self.write_mask_array) else: self.write_mask_array_inst = None @@ -309,7 +309,7 @@ class port_data(design.design): def place_write_driver_array(self, offset): """ Placing Write Driver """ - self.write_driver_array_inst.place(offset=offset, mirror="MX") + self .write_driver_array_inst.place(offset=offset, mirror="MX") def compute_instance_offsets(self): diff --git a/compiler/tests/22_sram_wmask_func_test.py b/compiler/tests/22_sram_wmask_func_test.py index 4fcc63c9..db239ccf 100755 --- a/compiler/tests/22_sram_wmask_func_test.py +++ b/compiler/tests/22_sram_wmask_func_test.py @@ -15,7 +15,7 @@ from globals import OPTS from sram_factory import factory import debug -#@unittest.skip("SKIPPING sram_wmask_func_test") +@unittest.skip("SKIPPING sram_wmask_func_test") class sram_wmask_func_test(openram_test): def runTest(self):