Adjusted paths in makefile for generating data used in regression models

This commit is contained in:
Hunter Nichols 2021-05-20 13:05:16 -07:00
parent 269b698b0a
commit 41c8eeb23c
2 changed files with 13 additions and 10 deletions

View File

@ -64,11 +64,12 @@ usage: ${USAGE_TESTS}
$(ALL_TESTS): $(ALL_TESTS):
python3 $@ -t ${TECH} python3 $@ -t ${TECH}
OPENRAM_TECHS = $(subst :, ,$(OPENRAM_TECH))
#CONFIG_DIR = $(OPENRAM_HOME)/example_configs/model_configs TECH_DIR := $(word 1, $(foreach dir,$(OPENRAM_TECHS),$(wildcard $(dir)/$(TECH))))
CONFIG_DIR = $(OPENRAM_HOME)/example_configs/test_configs CONFIG_DIR = $(OPENRAM_HOME)/model_configs
MODEL_CONFIGS = $(wildcard $(CONFIG_DIR)/*.py) MODEL_CONFIGS = $(wildcard $(CONFIG_DIR)/*.py)
SIM_OUT = $(OPENRAM_TECH)/$(TECH)/sim_data SIM_DIR = $(OPENRAM_HOME)/model_data
CSV_DIR = $(TECH_DIR)/sim_data
OPTS = OPTS =
# Characterize and perform DRC/LVS # Characterize and perform DRC/LVS
OPTS += -c OPTS += -c
@ -79,16 +80,18 @@ OPTS += -n
# Spice # Spice
OPTS += -s hspice OPTS += -s hspice
.PHONY: ${MODEL_CONFIGS} .PHONY: ${MODEL_CONFIGS}
model: $(MODEL_CONFIGS) .PHONY: model
model: $(MODEL_CONFIGS)
mkdir -p $(CSV_DIR)
python3 $(OPENRAM_HOME)/model_data_util.py $(SIM_DIR) $(CSV_DIR)
$(MODEL_CONFIGS): $(MODEL_CONFIGS):
$(eval bname=$(basename $(notdir $@))) $(eval bname=$(basename $(notdir $@)))
#echo $(bname) mkdir -p $(SIM_DIR)/$(bname)
mkdir -p $(SIM_OUT)/$(bname) python3 $(OPENRAM_HOME)/openram.py $(OPTS) -p $(SIM_DIR)/$(bname) -o $(bname) $@ 2>&1 > /dev/null
python3 $(OPENRAM_HOME)/openram.py $(OPTS) -p $(SIM_OUT)/$(bname) -o $(bname) $@ 2>&1 > /dev/null
clean: clean:
find . -name \*.pyc -exec rm {} \; find . -name \*.pyc -exec rm {} \;

View File

@ -1153,7 +1153,7 @@ class delay(simulation):
# 4) At the minimum period, measure the delay, slew and power for all slew/load pairs. # 4) At the minimum period, measure the delay, slew and power for all slew/load pairs.
self.period = min_period self.period = min_period
char_port_data = self.simulate_loads_and_slews(load_slews, leakage_offset) char_port_data = self.simulate_loads_and_slews(load_slews, leakage_offset)
if len(load_slews) > 1: if OPTS.use_specified_load_slew != None and len(load_slews) > 1:
debug.warning("Path delay lists not correctly generated for characterizations of more than 1 load,slew") debug.warning("Path delay lists not correctly generated for characterizations of more than 1 load,slew")
# Get and save the path delays # Get and save the path delays
bl_names, bl_delays, sen_names, sen_delays = self.get_delay_lists(self.path_delays) bl_names, bl_delays, sen_names, sen_delays = self.get_delay_lists(self.path_delays)