restructuring jpeg

Author: xtofalex

.gitignore

@@ -15,5 +15,7 @@ designs/arm_core/arm_core_snl.v
 designs/arm_core/*.list
 designs/black_parrot/black_parrot_edited.v
 designs/black_parrot/black_parrot_snl.v
-designs/jpeg/jpeg_hier_edited.v
-designs/jpeg/jpeg_flat_edited.v
+designs/jpeg/asap7/jpeg_flat_edited.v
+designs/jpeg/asap7/jpeg_hier_edited.v
+designs/jpeg/nangate45/jpeg_flat_edited.v
+designs/jpeg/nangate45/jpeg_hier_edited.v

designs/jpeg/Makefile

@@ -1,26 +1,7 @@
-include ../Makefile.inc
-
-all: jpeg_hier_edited.v jpeg_flat_edited.v
-
-jpeg_snl/snl.mf: jpeg.v
-	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_snl -p ${PRIMITIVES}/asap7.py
-
-jpeg_flat_snl/snl.mf: jpeg_flat.v
-	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_flat_snl -p ${PRIMITIVES}/asap7.py
-
-jpeg_hier_edited.v: jpeg_snl/snl.mf
-	export PYTHONPATH=${SET_PYTHONPATH}; \
-	export PRE_EDIT_BASE_NAME=pre_hier; \
-	export POST_EDIT_BASE_NAME=post_hier; \
-	${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 
-
-jpeg_flat_edited.v: jpeg_flat_snl/snl.mf
-	export PYTHONPATH=${SET_PYTHONPATH}; \
-	export PRE_EDIT_BASE_NAME=pre_flat; \
-	export POST_EDIT_BASE_NAME=post_flat; \
-	${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 
+all:
+	cd asap7 && make
+	cd nangate45 && make
 
 clean:
-	-rm -rf jpeg_snl jpeg_flat_snl *.log *.stats *_edited.v
+	cd asap7 && make clean
+	cd nangate45 && make clean

designs/jpeg/asap7/Makefile

@@ -0,0 +1,26 @@
+include ../../Makefile.inc
+
+all: jpeg_hier_edited.v jpeg_flat_edited.v
+
+jpeg_snl/snl.mf: jpeg.v
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_snl -p ${PRIMITIVES}/asap7.py
+
+jpeg_flat_snl/snl.mf: jpeg_flat.v
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_flat_snl -p ${PRIMITIVES}/asap7.py
+
+jpeg_hier_edited.v: jpeg_snl/snl.mf
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	export PRE_EDIT_BASE_NAME=pre_hier; \
+	export POST_EDIT_BASE_NAME=post_hier; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_snl -o jpeg_hier_edited.v -e ../../../scripts/pre_edit.py -a all -z ../../../scripts/post_edit.py 
+
+jpeg_flat_edited.v: jpeg_flat_snl/snl.mf
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	export PRE_EDIT_BASE_NAME=pre_flat; \
+	export POST_EDIT_BASE_NAME=post_flat; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_flat_snl -o jpeg_flat_edited.v -e ../../../scripts/pre_edit.py -a all -z ../../../scripts/post_edit.py 
+
+clean:
+	-rm -rf jpeg_snl jpeg_flat_snl *.log *.stats *_edited.v

designs/jpeg/jpeg.v designs/jpeg/asap7/jpeg.v

@@ -0,0 +1,26 @@
+include ../../Makefile.inc
+
+all: jpeg_hier_edited.v jpeg_flat_edited.v
+
+jpeg_snl/snl.mf: jpeg.v
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_snl -p ${PRIMITIVES}/nangate45.py
+
+jpeg_flat_snl/snl.mf: jpeg_flat.v
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o jpeg_flat_snl -p ${PRIMITIVES}/nangate45.py
+
+jpeg_hier_edited.v: jpeg_snl/snl.mf
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	export PRE_EDIT_BASE_NAME=pre_hier; \
+	export POST_EDIT_BASE_NAME=post_hier; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_snl -o jpeg_hier_edited.v -e ../../../scripts/pre_edit.py -a all -z ../../../scripts/post_edit.py 
+
+jpeg_flat_edited.v: jpeg_flat_snl/snl.mf
+	export PYTHONPATH=${SET_PYTHONPATH}; \
+	export PRE_EDIT_BASE_NAME=pre_flat; \
+	export POST_EDIT_BASE_NAME=post_flat; \
+	${PYTHON_ENV} ${NAJA_EDIT} -f snl -t verilog -i jpeg_flat_snl -o jpeg_flat_edited.v -e ../../../scripts/pre_edit.py -a all -z ../../../scripts/post_edit.py 
+
+clean:
+	-rm -rf jpeg_snl jpeg_flat_snl *.log *.stats *_edited.v