Merge branch 'main' of https://github.com/najaeda/naja-regress

Dockerfile.regress

@@ -50,7 +50,7 @@ WORKDIR /designs
 ENV SET_PYTHONPATH=/naja-install/lib/python
 ENV LD_LIBRARY_PATH=/naja-install/lib
 ENV NAJA_EDIT=/naja-install/bin/naja_edit
-ENV PRIMITIVES=/naja-install/shared/primitives/xilinx.py
+ENV PRIMITIVES=/naja-install/shared/primitives
 ENV YOSYS=/yosys-install/bin/yosys
 ENV VERILATOR=/verilator-install/bin/verilator
 CMD /yosys-install/bin/yosys -V; /verilator-install/bin/verilator -V; make clean; make

designs/Makefile.inc

@@ -2,9 +2,6 @@ YOSYS ?= yosys
 EQY ?= eqy
 VERILATOR ?= verilator
 NAJA_EDIT ?= $(NAJA_INSTALL)/bin/naja_edit
-PRIMITIVES ?= $(NAJA_INSTALL)/shared/primitives/xilinx.py
-ASAP7_PRIMITIVES ?= $(NAJA_INSTALL)/shared/primitives/asap7.py
-NANGATE45_PRIMITIVES ?= $(NAJA_INSTALL)/shared/primitives/nangate45.py
-SG13G2_PRIMITIVES ?= $(NAJA_INSTALL)/shared/primitives/sg13g2.py
+PRIMITIVES ?= $(NAJA_INSTALL)/shared/primitives
 SET_PYTHONPATH ?= $(NAJA_INSTALL)/lib/python
 SCRIPTS ?= ../../scripts

designs/arm_core/Makefile

@@ -24,19 +24,19 @@ arm_core_netlist.v: src/arm_core.v
 
 arm_core_snl/snl.mf: arm_core_netlist.v
 	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o arm_core_snl -p ${PRIMITIVES}
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o arm_core_snl -p ${PRIMITIVES}/xilinx.py
 
 edges.list: arm_core_snl/snl.mf gen_edge_list.py
 	export PYTHONPATH=${SET_PYTHONPATH}; \
 	${NAJA_EDIT} -f snl -i arm_core_snl -e gen_edge_list.py
 
 arm_core_snl.v primitives.v: arm_core_netlist.v
 	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${NAJA_EDIT} -f verilog -t verilog -p ${PRIMITIVES} -i arm_core_netlist.v -o arm_core_snl.v -d primitives.v
+	${NAJA_EDIT} -f verilog -t verilog -p ${PRIMITIVES}/xilinx.py -i arm_core_netlist.v -o arm_core_snl.v -d primitives.v
 
 arm_core_snl_error.v: arm_core_netlist.v src/add_error.py
 	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${NAJA_EDIT} -e src/add_error.py -f verilog -t verilog -p ${PRIMITIVES} -i arm_core_netlist.v -o arm_core_snl_error.v -d primitives.v
+	${NAJA_EDIT} -e src/add_error.py -f verilog -t verilog -p ${PRIMITIVES}/xilinx.py -i arm_core_netlist.v -o arm_core_snl_error.v -d primitives.v
 
 clean:
 	-rm arm_core_snl.v primitives.v arm_core_netlist.v 

designs/black_parrot/Makefile

@@ -4,7 +4,7 @@ all: black_parrot_edited.v black_parrot_snl.v
 
 black_parrot_snl/snl.mf: black_parrot.v
 	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o black_parrot_snl -p ${NANGATE45_PRIMITIVES}
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl -i $< -o black_parrot_snl -p ${PRIMITIVES}/nangate45.py
 
 black_parrot_snl.v: black_parrot_snl/snl.mf
 	export PYTHONPATH=${SET_PYTHONPATH}; \

designs/jpeg/Makefile

@@ -4,11 +4,11 @@ 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 ${ASAP7_PRIMITIVES}
+	${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 ${ASAP7_PRIMITIVES}
+	${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}; \

designs/megaboom/Makefile

@@ -12,7 +12,7 @@ all: parse_snl
 
 megaboom_snl/snl.mf: $(INPUTS_DIR)
 	export PYTHONPATH=${SET_PYTHONPATH}; \
-	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl $(PARSE_INPUTS) -o megaboom_snl -p ${ASAP7_PRIMITIVES}
+	${PYTHON_ENV} ${NAJA_EDIT} -f verilog -t snl $(PARSE_INPUTS) -o megaboom_snl -p ${PRIMITIVES}/asap7.py
 
 parse_snl: megaboom_snl/snl.mf
 	export PYTHONPATH=${SET_PYTHONPATH}; \