Skip to content

Commit 25592ae

Browse files
committed
save current regress setting
1 parent 401aa3d commit 25592ae

File tree

7 files changed

+53
-48
lines changed

7 files changed

+53
-48
lines changed

designs/black_parrot/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ black_parrot_snl.v: black_parrot_snl/snl.mf
1010
export PYTHONPATH=${SET_PYTHONPATH}; \
1111
${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i black_parrot_snl -o black_parrot_snl.v
1212

13-
black_parrot_edited.v: pre_edit.py post_edit.py black_parrot_snl/snl.mf
13+
black_parrot_edited.v: ${SCRIPTS}/pre_edit.py ${SCRIPTS}/post_edit.py black_parrot_snl/snl.mf
1414
export PYTHONPATH=${SET_PYTHONPATH}; \
15-
${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i black_parrot_snl -o black_parrot_edited.v -e pre_edit.py -z post_edit.py
15+
${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i black_parrot_snl -o black_parrot_edited.v -e ${SCRIPTS}/pre_edit.py -a dle -z ${SCRIPTS}/post_edit.py
1616

1717
clean:
18-
-rm -rf black_parrot_snl black_parrot_snl.v black_parrot_edited.v
18+
-rm -rf __pycache__ black_parrot_snl black_parrot_snl.v black_parrot_edited.v *.log *.stats

designs/black_parrot/pre_edit.py

-19
This file was deleted.

designs/black_parrot/save_design_stats.py

-13
This file was deleted.

designs/jpeg/Makefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include ../Makefile.inc
22

3-
all: parse_snl parse_snl_flat
3+
all: jpeg_hier_edited.v jpeg_flat_edited.v
44

55
jpeg_snl/snl.mf: jpeg.v
66
export PYTHONPATH=${SET_PYTHONPATH}; \
@@ -10,13 +10,17 @@ jpeg_flat_snl/snl.mf: jpeg_flat.v
1010
export PYTHONPATH=${SET_PYTHONPATH}; \
1111
${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_flat_snl -p ${ASAP7_PRIMITIVES}
1212

13-
parse_snl: jpeg_snl/snl.mf
13+
jpeg_hier_edited.v: jpeg_snl/snl.mf
1414
export PYTHONPATH=${SET_PYTHONPATH}; \
15-
${PYTHON_ENV} ${NAJA_EDIT} -f snl -i jpeg_snl
15+
export PRE_EDIT_BASE_NAME=pre_hier; \
16+
export POST_EDIT_BASE_NAME=post_hier; \
17+
${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_snl -o jpeg_hier_edited.v -e ${SCRIPTS}/pre_edit.py -a dle -z ${SCRIPTS}/post_edit.py
1618

17-
parse_snl_flat: jpeg_flat_snl/snl.mf
19+
jpeg_flat_edited.v: jpeg_flat_snl/snl.mf
1820
export PYTHONPATH=${SET_PYTHONPATH}; \
19-
${PYTHON_ENV} ${NAJA_EDIT} -f snl -i jpeg_flat_snl
21+
export PRE_EDIT_BASE_NAME=pre_flat; \
22+
export POST_EDIT_BASE_NAME=post_flat; \
23+
${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_flat_snl -o jpeg_flat_edited.v -e ${SCRIPTS}/pre_edit.py -a dle -z ${SCRIPTS}/post_edit.py
2024

2125
clean:
22-
-rm -rf jpeg_snl jpeg_flat_snl
26+
-rm -rf jpeg_snl jpeg_flat_snl *.log *.stats *_edited.v

designs/megaboom/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ PARSE_INPUTS = $(foreach input,$(INPUTS_DIR),-i $(input))
1010

1111
all: parse_snl
1212

13-
megaboom_snl/snl.mf: edit.py $(INPUTS_DIR)
13+
megaboom_snl/snl.mf: $(INPUTS_DIR)
1414
export PYTHONPATH=${SET_PYTHONPATH}; \
15-
${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl $(PARSE_INPUTS) -o megaboom_snl -p ${ASAP7_PRIMITIVES} -e $<
15+
${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl $(PARSE_INPUTS) -o megaboom_snl -p ${ASAP7_PRIMITIVES}
1616

17-
parse_snl: edit.py megaboom_snl/snl.mf
17+
parse_snl: megaboom_snl/snl.mf
1818
export PYTHONPATH=${SET_PYTHONPATH}; \
19-
${PYTHON_ENV} ${NAJA_EDIT} -f snl -i megaboom_snl -a dle -e $<
19+
${PYTHON_ENV} ${NAJA_EDIT} -f snl -i megaboom_snl -a dle -e ${SCRIPTS}/pre_edit.py -z ${SCRIPTS}/post_edit.py
2020

2121
clean:
2222
-rm -rf megaboom_snl
2323
-rm -rf __pycache__
24-
-rm design.stats
24+
-rm *.stats
2525

scripts/post_edit.py

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import os
2+
import logging
3+
from naja import snl
4+
from naja.stats import design_stats
5+
6+
def edit():
7+
post_edit_base_name = 'post_edit'
8+
if os.getenv('POST_EDIT_BASE_NAME') != None:
9+
post_edit_base_name = os.getenv('POST_EDIT_BASE_NAME')
10+
log_name = post_edit_base_name + '.log'
11+
logging.basicConfig(filename=log_name, filemode='w' ,level=logging.DEBUG)
12+
universe = snl.SNLUniverse.get()
13+
if universe is None:
14+
logging.critical('No loaded SNLUniverse')
15+
return 1
16+
top = universe.getTopDesign()
17+
if top is None:
18+
logging.critical('SNLUniverse does not contain any top SNLDesign')
19+
return 1
20+
else:
21+
logging.info('Found top design ' + str(top))
22+
23+
#clean_buffer_and_constants(top)
24+
stats_file_name = post_edit_base_name + '.stats'
25+
stats = open(stats_file_name, 'w')
26+
design_stats.compute_and_dump_design_stats(top, stats)

designs/black_parrot/post_edit.py scripts/pre_edit.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
import os
12
import logging
23
from naja import snl
34
from naja.stats import design_stats
45

56
def edit():
6-
logging.basicConfig(filename='pre_edit.log', filemode='w' ,level=logging.DEBUG)
7+
pre_edit_base_name = 'pre_edit'
8+
if os.getenv('PRE_EDIT_BASE_NAME') != None:
9+
pre_edit_base_name = os.getenv('PRE_EDIT_BASE_NAME')
10+
log_name = pre_edit_base_name + '.log'
11+
logging.basicConfig(filename=log_name, filemode='w' ,level=logging.DEBUG)
712
universe = snl.SNLUniverse.get()
813
if universe is None:
914
logging.critical('No loaded SNLUniverse')
@@ -16,4 +21,6 @@ def edit():
1621
logging.info('Found top design ' + str(top))
1722

1823
#clean_buffer_and_constants(top)
19-
save_design_stats.save_design_stats(top, 'optimized_design.stats')
24+
stats_file_name = pre_edit_base_name + '.stats'
25+
stats = open(stats_file_name, 'w')
26+
design_stats.compute_and_dump_design_stats(top, stats)

0 commit comments

Comments
 (0)