diff --git a/compiler/Makefile b/compiler/Makefile index a547b6ed..4d3b9cc6 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -2,7 +2,7 @@ TECH = scn4m_subm CUR_DIR = $(shell pwd) TEST_DIR = ${CUR_DIR}/tests -MAKEFLAGS += -j 1 +#MAKEFLAGS += -j 1 # Library test LIBRARY_TESTS = $(shell find ${TEST_DIR} -name 0[1-2]*_test.py) @@ -65,6 +65,31 @@ usage: ${USAGE_TESTS} $(ALL_TESTS): python3 $@ -t ${TECH} +#CONFIG_DIR = $(OPENRAM_HOME)/example_configs/model_configs +CONFIG_DIR = $(OPENRAM_HOME)/example_configs/test_configs +MODEL_CONFIGS = $(wildcard $(CONFIG_DIR)/*.py) +SIM_OUT = $(OPENRAM_TECH)/$(TECH)/sim_data +OPTS = +# Characterize and perform DRC/LVS +OPTS += -c +# Do not characterize or perform DRC/LVS +OPTS += -n +# Verbosity +#OPTS += -v +# Spice +OPTS += -s hspice + + +.PHONY: ${MODEL_CONFIGS} + +model: $(MODEL_CONFIGS) + +$(MODEL_CONFIGS): + $(eval bname=$(basename $(notdir $@))) + #echo $(bname) + mkdir -p $(SIM_OUT)/$(bname) + python3 $(OPENRAM_HOME)/openram.py $(OPTS) -p $(SIM_OUT)/$(bname) -o $(bname) $@ 2>&1 > /dev/null + clean: find . -name \*.pyc -exec rm {} \; find . -name \*~ -exec rm {} \; diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py index 1525924d..5ecc0bf4 100644 --- a/compiler/characterizer/lib.py +++ b/compiler/characterizer/lib.py @@ -867,14 +867,14 @@ class lib: write0_power = np.mean(self.char_port_results[port]["write0_power"]) datasheet.write("{0},{1},".format('write_rise_power_{}'.format(port), write1_power)) #FIXME: should be write_fall_power - datasheet.write("{0},{1},".format('read_fall_power_{}'.format(port), write0_power)) + datasheet.write("{0},{1},".format('write_fall_power_{}'.format(port), write0_power)) for port in self.read_ports: read1_power = np.mean(self.char_port_results[port]["read1_power"]) read0_power = np.mean(self.char_port_results[port]["read0_power"]) datasheet.write("{0},{1},".format('read_rise_power_{}'.format(port), read1_power)) #FIXME: should be read_fall_power - datasheet.write("{0},{1},".format('write_fall_power_{}'.format(port), read0_power)) + datasheet.write("{0},{1},".format('read_fall_power_{}'.format(port), read0_power))