From bd7958be282a51d61a35879b555221f1e4a1d8e4 Mon Sep 17 00:00:00 2001 From: mguthaus Date: Mon, 24 Apr 2017 11:55:11 -0700 Subject: [PATCH] Fixed format test. It was not performing checks due to moving of OPENRAM_HOME. Fixed some tabs and print statements. --- compiler/characterizer/delay.py | 6 +-- compiler/characterizer/lib.py | 42 ++++++++++----------- compiler/tests/00_code_format_check_test.py | 6 ++- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/compiler/characterizer/delay.py b/compiler/characterizer/delay.py index dbebb860..11ff5b60 100644 --- a/compiler/characterizer/delay.py +++ b/compiler/characterizer/delay.py @@ -385,16 +385,16 @@ class delay(): return None debug.info(1, "Min Period for high_to_low transistion: {0}n with a delay of {1}".format(min_period0, delay0)) read_power=ch.convert_to_float(ch.parse_output("timing", "power_read")) - write_power=ch.convert_to_float(ch.parse_output("timing", "power_write")) + write_power=ch.convert_to_float(ch.parse_output("timing", "power_write")) - data = {"min_period1": min_period1, # period in ns + data = {"min_period1": min_period1, # period in ns "delay1": delay1, # delay in s "min_period0": min_period0, "delay0": delay0, "read_power": read_power, "write_power": write_power } - return data + return data def obtain_cycle_times(self, slow_period, fast_period): diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py index bb7310ce..d6c5e21d 100644 --- a/compiler/characterizer/lib.py +++ b/compiler/characterizer/lib.py @@ -149,7 +149,7 @@ class lib: CONS2 = ["INPUT_BY_TRANS_FOR_CLOCK" , "INPUT_BY_TRANS_FOR_SIGNAL"] for i in CONS2: self.lib.write(" power_lut_template({0})".format(i)) - self.lib.write("{\n") + self.lib.write("{\n") self.lib.write(" variable_1 : input_transition_time;\n") self.lib.write(" index_1 (\"0.5\");\n") self.lib.write(" }\n\n") @@ -216,30 +216,30 @@ class lib: self.lib.write(" address : ADDR; \n") self.lib.write(" clocked_on : clk; \n") self.lib.write(" }\n") - self.lib.write(" internal_power(){\n") - self.lib.write(" when : \"OEb & !clk\"; \n") - self.lib.write(" rise_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") - self.lib.write(" values(\"{0}\");\n".format(data["write_power"]* 1e3)) - self.lib.write(" }\n") - self.lib.write(" fall_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") - self.lib.write(" values(\"{0}\");\n".format(data["write_power"]* 1e3)) - self.lib.write(" }\n") + self.lib.write(" internal_power(){\n") + self.lib.write(" when : \"OEb & !clk\"; \n") + self.lib.write(" rise_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") + self.lib.write(" values(\"{0}\");\n".format(data["write_power"]* 1e3)) + self.lib.write(" }\n") + self.lib.write(" fall_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") + self.lib.write(" values(\"{0}\");\n".format(data["write_power"]* 1e3)) + self.lib.write(" }\n") self.lib.write(" }\n") - self.write_timing(times) + self.write_timing(times) self.lib.write(" memory_read(){ \n") self.lib.write(" address : ADDR; \n") self.lib.write(" }\n") - self.lib.write(" internal_power(){\n") - self.lib.write(" when : \"!OEb & !clk\"; \n") - self.lib.write(" rise_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") - self.lib.write(" values(\"{0}\");\n".format(data["read_power"]* 1e3)) - self.lib.write(" }\n") - self.lib.write(" fall_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") - self.lib.write(" values(\"{0}\");\n".format(data["read_power"]* 1e3)) - self.lib.write(" }\n") + self.lib.write(" internal_power(){\n") + self.lib.write(" when : \"!OEb & !clk\"; \n") + self.lib.write(" rise_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") + self.lib.write(" values(\"{0}\");\n".format(data["read_power"]* 1e3)) + self.lib.write(" }\n") + self.lib.write(" fall_power(INPUT_BY_TRANS_FOR_SIGNAL){\n") + self.lib.write(" values(\"{0}\");\n".format(data["read_power"]* 1e3)) + self.lib.write(" }\n") self.lib.write(" }\n") - self.lib.write(" timing(){ \n") + self.lib.write(" timing(){ \n") self.lib.write(" timing_sense : non_unate; \n") self.lib.write(" related_pin : \"clk\"; \n") self.lib.write(" timing_type : rising_edge; \n") @@ -295,8 +295,8 @@ class lib: self.lib.write(" clock : true;\n") self.lib.write(" direction : input; \n") self.lib.write(" capacitance : {0}; \n".format(tech.spice["FF_in_cap"])) - min_pulse_width = (ch.round_time(data["min_period1"]) + ch.round_time(data["min_period0"]))/2.0 - min_period = ch.round_time(data["min_period1"]) + ch.round_time(data["min_period0"]) + min_pulse_width = (ch.round_time(data["min_period1"]) + ch.round_time(data["min_period0"]))/2.0 + min_period = ch.round_time(data["min_period1"]) + ch.round_time(data["min_period0"]) self.lib.write(" timing(){ \n") self.lib.write(" timing_type :\"min_pulse_width\"; \n") self.lib.write(" related_pin : clk; \n") diff --git a/compiler/tests/00_code_format_check_test.py b/compiler/tests/00_code_format_check_test.py index 04ea2e99..b3d4dfa1 100644 --- a/compiler/tests/00_code_format_check_test.py +++ b/compiler/tests/00_code_format_check_test.py @@ -16,7 +16,7 @@ class code_format_test(unittest.TestCase): "Run a test to check for tabs instead of spaces in the all source files." def runTest(self): - source_code_dir = os.environ["OPENRAM_HOME"] + "/compiler" + source_code_dir = os.environ["OPENRAM_HOME"] source_codes = setup_files(source_code_dir) errors = 0 @@ -32,7 +32,9 @@ class code_format_test(unittest.TestCase): continue if re.search("debug.py$", code): continue - if re.search("header.py$", code): + if re.search("testutils.py$", code): + continue + if re.search("globals.py$", code): continue if re.search("openram.py$", code): continue