Merge pull request #35 from SergeyDegtyar/master

Add tests for errors from 'abc' command.

misc/Makefile

@@ -175,9 +175,10 @@ $(eval $(call template,tee, tee))
 $(eval $(call template,test_autotb, test_autotb test_autotb_file test_autotb_n test_autotb_seed))
 
 #abc
-$(eval $(call template,abc, abc_D abc_g_aig abc_g_cmos2 abc_g_simple abc_mux16 abc_mux4 abc_mux8 abc_S))
-$(eval $(call template,abc_dff, abc_D abc_g_aig abc_g_cmos2 abc_g_simple abc_mux16 abc_mux4 abc_mux8 abc_S))
+$(eval $(call template,abc, abc_D abc_g_aig abc_g_cmos2 abc_g_simple abc_mux16 abc_mux4 abc_mux8 abc_S abc_dff))
+$(eval $(call template,abc_dff, abc_D abc_g_aig abc_g_cmos2 abc_g_simple abc_mux16 abc_mux4 abc_mux8 abc_S abc_dff))
 $(eval $(call template,abc_mux, abc_D abc_g_aig abc_g_cmos2 abc_g_simple abc_mux16 abc_mux4 abc_mux8 abc_S))
+$(eval $(call template,abc_error, abc_cannot_open abc_constr_no_liberty abc_lut_liberty abc_unsup_gate_type abc_inv_luts_synt abc_dff abc_return_code abc_clk_domain_not_found abc_script_o abc_script_top))
 
 #hilomap
 $(eval $(call template,hilomap, hilomap hilomap_hicell hilomap_locell hilomap_singleton hilomap_hicell_singleton hilomap_locell_singleton hilomap_hicell_locell_singleton))

misc/abc_error/top.lib

+

misc/abc_error/top.v

+module top
+(
+ input x,
+ input y,
+ input cin,
+
+ output A,
+ output cout
+ );
+
+`ifndef BUG
+assign cout = x / y * cin;
+`else
+assign {cout,A} =  cin - y * x;
+`endif
+
+endmodule

misc/run.sh

@@ -13,102 +13,137 @@ cd $1/work_$2
 
 touch .start
 
-yosys -ql yosys.log ../../scripts/$2.ys
-if [ $? != 0 ] ; then
+# cases where 'syntax error' or other errors are expected
+if [ "$1" = "abc_error" ]; then
+
+	expected_string=""
+    #Change checked string for check other errors
+	if [ "$2" = "abc_constr_no_liberty" ]; then
+		expected_string="ERROR: Got -constr but no -liberty!"
+	elif [ "$2" = "abc_cannot_open" ]; then
+		expected_string="ERROR: Can't open ABC output file"
+	elif [ "$2" = "abc_lut_liberty" ]; then
+		expected_string="ERROR: Got -lut and -liberty! This two options are exclusive."
+	elif [ "$2" = "abc_unsup_gate_type" ]; then
+		expected_string="ERROR: Command syntax error: Unsupported gate type:"
+	elif [ "$2" = "abc_inv_luts_synt" ]; then
+		expected_string="Invalid -luts syntax"
+	elif [ "$2" = "abc_return_code" ]; then
+		expected_string="failed: return code"
+	elif [ "$2" = "abc_clk_domain_not_found" ]; then
+		expected_string="ERROR: Clock domain u not found"
+	elif [ "$2" = "abc_script_o" ]; then
+		expected_string="ERROR: Clock domain u not found"
+	elif [ "$2" = "abc_script_top" ]; then
+		expected_string="ERROR: Clock domain u not found"
+	fi
+
+	if yosys -ql yosys.log ../../scripts/$2.ys; then
+		echo FAIL > ${1}_${2}.status
+	else
+		if  grep "$expected_string" yosys.log && [ "$expected_string" != "" ]; then
+			echo PASS > ${1}_${2}.status
+		else
+			echo FAIL > ${1}_${2}.status
+		fi
+	fi
+else
+
+	yosys -ql yosys.log ../../scripts/$2.ys
+	if [ $? != 0 ] ; then
 		echo FAIL > ${1}_${2}.status
 		touch .stamp
 		exit 0
-fi
-
+	fi
 
-#cases where some object names are/aren't expected in output file (tee -o result.log in the test script)
-cell_failed="0"
-expected_string=""
-expected="1"
+	#cases where some object names are/aren't expected in output file (tee -o result.log in the test script)
+	cell_failed="0"
+	expected_string=""
+	expected="1"
 
-if   [ "$2" = "add" ]; then
+	if   [ "$2" = "add" ]; then
 		expected_string="wire width 0 \\\w"
-elif [ "$2" = "add_global_input" ]; then
+	elif [ "$2" = "add_global_input" ]; then
 		expected_string="wire width 32000 input 6 \\\gi"
-elif [ "$2" = "add_input" ]; then
+	elif [ "$2" = "add_input" ]; then
 		expected_string="wire width 2 input 6 \\\i"
-elif [ "$2" = "add_output" ]; then
+	elif [ "$2" = "add_output" ]; then
 		expected_string="wire width 3 output 6 \\\o"
-elif [ "$2" = "add_inout" ]; then
+	elif [ "$2" = "add_inout" ]; then
 		expected_string="wire width 3 inout 6 \\\34"
-elif [ "$2" = "add_wire" ]; then
+	elif [ "$2" = "add_wire" ]; then
 		expected_string="wire \\\w"
-elif [ "$2" = "assertpmux" ]; then
+	elif [ "$2" = "assertpmux" ]; then
 		expected_string="cell \$assert"
-elif [ "$2" = "assertpmux_always" ]; then
+	elif [ "$2" = "assertpmux_always" ]; then
 		expected_string="cell \$assert"
-elif [ "$2" = "assertpmux_noinit" ]; then
+	elif [ "$2" = "assertpmux_noinit" ]; then
 		expected_string="cell \$assert"
-elif [ "$1" = "blackbox" ]; then
+	elif [ "$1" = "blackbox" ]; then
 		expected_string="attribute \\\blackbox 1"
-elif [ "$2" = "chformal" ]; then
+	elif [ "$2" = "chformal" ]; then
 		expected_string="cell \$assert"
 		expected="0"
-elif [ "$2" = "chformal_assert" ]; then
+	elif [ "$2" = "chformal_assert" ]; then
 		expected_string="cell \$assert"
 		expected="0"
-elif [ "$2" = "chformal_assert2assume" ]; then
+	elif [ "$2" = "chformal_assert2assume" ]; then
 		expected_string="cell \$assert"
 		expected="0"
-elif [ "$2" = "chformal_assume" ]; then
+	elif [ "$2" = "chformal_assume" ]; then
 		expected_string="cell \$assume"
 		expected="0"
-elif [ "$2" = "chformal_assume2assert" ]; then
+	elif [ "$2" = "chformal_assume2assert" ]; then
 		expected_string="cell \$assume"
 		expected="0"
-elif [ "$2" = "chformal_fair" ]; then
+	elif [ "$2" = "chformal_fair" ]; then
 		expected_string="cell \$fair"
 		expected="0"
-elif [ "$2" = "chformal_fair2live" ]; then
+	elif [ "$2" = "chformal_fair2live" ]; then
 		expected_string="cell \$fair"
 		expected="0"
-elif [ "$2" = "chformal_fair2live_assert2assume" ]; then
+	elif [ "$2" = "chformal_fair2live_assert2assume" ]; then
 		expected_string="cell \$fair"
 		expected="0"
-elif [ "$2" = "chformal_live" ]; then
+	elif [ "$2" = "chformal_live" ]; then
 		expected_string="cell \$live"
 		expected="0"
-elif [ "$2" = "chformal_live2fair" ]; then
+	elif [ "$2" = "chformal_live2fair" ]; then
 		expected_string="cell \$live"
 		expected="0"
-elif [ "$2" = "delete" ]; then
+	elif [ "$2" = "delete" ]; then
 		expected_string="module \\\middle"
 		expected="0"
-elif [ "$2" = "delete_proc" ]; then
+	elif [ "$2" = "delete_proc" ]; then
 		expected_string="process \$proc\$../top.v:13\$1"
 		expected="0"
-elif [ "$2" = "delete_input" ]; then
+	elif [ "$2" = "delete_input" ]; then
 		expected_string="wire input 1 \\\x"
 		expected="0"
-elif [ "$2" = "delete_output" ]; then
+	elif [ "$2" = "delete_output" ]; then
 		expected_string="wire output 3 \\\o"
 		expected="0"
-elif [ "$2" = "delete_port" ]; then
+	elif [ "$2" = "delete_port" ]; then
 		expected_string="wire output 4 \\\A"
 		expected="0"
-elif [ "$2" = "delete_cell" ]; then
+	elif [ "$2" = "delete_cell" ]; then
 		expected_string="cell \$mux \$ternary\$../top.v:16\$2"
 		expected="0"
-elif [ "$2" = "delete_wire" ]; then
+	elif [ "$2" = "delete_wire" ]; then
 		expected_string="wire \\\o"
 		expected="0"
-elif [ "$2" = "delete_mem" ]; then
+	elif [ "$2" = "delete_mem" ]; then
 		expected_string="cell \$memrd \$memrd\$\ram\$../top.v:30\$7"
 		expected="0"
-elif [ "$2" = "edgetypes" ]; then
+	elif [ "$2" = "edgetypes" ]; then
 		expected_string="\$add"
-elif [ "$1" = "fmcombine" ]; then
+	elif [ "$1" = "fmcombine" ]; then
 		expected_string="Combining cells "
-elif [ "$1" = "insbuf" ]; then
+	elif [ "$1" = "insbuf" ]; then
 		expected_string="cell \$_BUF_ \$auto\$insbuf"
-elif [ "$1" = "ltp" ]; then
+	elif [ "$1" = "ltp" ]; then
 		expected_string="Longest topological path in"
-elif [ "$1" = "mutate" ]; then
+	elif [ "$1" = "mutate" ]; then
 		if [ "$2" = "mutate_all" ] || \
 		[ "$2" = "mutate_cnot0" ] || \
 		[ "$2" = "mutate_cnot1" ] || \
@@ -117,36 +152,36 @@ elif [ "$1" = "mutate" ]; then
 		[ "$2" = "mutate_inv" ]; then
 		expected_string="\$auto\$mutate"
 		fi
-elif [ "$1" = "mutate_mem" ]; then
+	elif [ "$1" = "mutate_mem" ]; then
 		if [ "$2" = "mutate_all" ]; then
 		expected_string="\$auto\$mutate"
 		fi
-elif [ "$2" = "pmuxtree" ]; then
+	elif [ "$2" = "pmuxtree" ]; then
 		expected_string="cell \$pmux"
 		expected="0"
-elif [ "$1" = "qwp" ]; then
+	elif [ "$1" = "qwp" ]; then
 		expected_string="attribute \\\qwp_position"
-elif [ "$2" = "rename" ]; then
+	elif [ "$2" = "rename" ]; then
 		expected_string="module \\\mid_module"
-elif [ "$2" = "rename_low" ]; then
+	elif [ "$2" = "rename_low" ]; then
 		expected_string="module \\\newlow"
-elif [ "$2" = "rename_top" ]; then
+	elif [ "$2" = "rename_top" ]; then
 		expected_string="module \\\new_top"
-elif [ "$2" = "rmports" ]; then
+	elif [ "$2" = "rmports" ]; then
 		expected_string="wire output 5 \\\cout"
 		expected="0"
-elif [ "$2" = "scatter" ]; then
+	elif [ "$2" = "scatter" ]; then
 		expected_string="\$auto\$scatter"
-elif [ "$1" = "scc" ] || \
+	elif [ "$1" = "scc" ] || \
 		[ "$1" = "scc_hier_feedback" ]; then
 		expected_string="0 SCCs"
 		if [ "$1" = "scc_hier_feedback" ] && [ "$2" = "scc_all_cell_types" ]; then
 			expected="0"
 		fi
-elif [ "$1" = "scc_feedback" ]; then
+	elif [ "$1" = "scc_feedback" ]; then
 		expected_string="0 SCCs"
 		expected="0"
-elif [ "$1" = "setattr" ] || \
+	elif [ "$1" = "setattr" ] || \
 		[ "$1" = "setattr_mem" ]; then
 		if [ "$2" = "setattr" ] || \
 		[ "$2" = "setattr_top" ] || \
@@ -156,14 +191,14 @@ elif [ "$1" = "setattr" ] || \
 		else
 		expected_string="attribute \\\u 1"
 		fi
-elif [ "$1" = "sim" ] || \
+	elif [ "$1" = "sim" ] || \
 		[ "$1" = "sim_mem" ]; then
 		if [ "$2" != "sim_d" ]; then
 		expected_string="Simulating cycle"
 		fi
-elif [ "$1" = "splice" ]; then
+	elif [ "$1" = "splice" ]; then
 		expected_string="\$auto\$splice"
-elif [ "$1" = "splitnets" ]; then
+	elif [ "$1" = "splitnets" ]; then
 		if [ "$2" = "splitnets_dpf" ] || \
 		[ "$2" = "splitnets_driver" ]; then
 		expected_string="wire width 8 \$memwr"
@@ -171,34 +206,36 @@ elif [ "$1" = "splitnets" ]; then
 		expected_string="wire width 8 \$memwr"
 		expected="0"
 		fi
-elif [ "$1" = "stat" ]; then
+	elif [ "$1" = "stat" ]; then
 		expected_string="middle                          1"
-elif [ "$1" = "supercover" ]; then
+	elif [ "$1" = "supercover" ]; then
 		expected_string="cell \$cover \$auto\$supercover"
-fi
+	fi
 
-if [ "$expected_string" != "" ]; then
-if grep "$expected_string" result.log; then
+	if [ "$expected_string" != "" ]; then
+	if grep "$expected_string" result.log; then
 		if [ $expected = "1" ]; then
 			cell_failed="0"
 		else
 			cell_failed="1"
 		fi
-else
+	else
 		if [ $expected = "1" ]; then
 			cell_failed="1"
 		else
 			cell_failed="0"
 		fi
-fi
-fi
+	fi
+	fi
 
-if grep 'Assert' result.log || grep 'failed in' result.log || grep 'ERROR' result.log; then
+	if grep 'Assert' result.log || grep 'failed in' result.log || grep 'ERROR' result.log; then
 		echo FAIL > ${1}_${2}.status
-elif [ $cell_failed = '1' ]; then
+	elif [ $cell_failed = '1' ]; then
 		echo FAIL > ${1}_${2}.status
-else
+	else
 		echo PASS > ${1}_${2}.status
-fi
+	fi
+
 
+fi
 touch .stamp

misc/scripts/abc_cannot_open.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -liberty -constr
+ abc -liberty -constr

misc/scripts/abc_clk_domain_not_found.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log  abc -dff -clk u
+ abc -dff -clk u

misc/scripts/abc_constr_no_liberty.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -constr -liberty
+abc -constr -liberty

misc/scripts/abc_dff.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log  abc -dff
+ abc -dff

misc/scripts/abc_inv_luts_synt.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log  abc -luts :
+ abc -liberty -luts :

misc/scripts/abc_lut_liberty.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log  abc -lut 2 -liberty top.lib
+ abc -lut 2 -liberty top.lib

misc/scripts/abc_return_code.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -g XOR
+abc -g XOR

misc/scripts/abc_script_o.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -script o
+abc -script o

misc/scripts/abc_script_top.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -script top.ys
+abc -script top.ys

misc/scripts/abc_unsup_gate_type.ys

+read_verilog ../top.v
+synth -top top
+tee -o result.log abc -g XO
+abc -g XO

misc/scripts/stat_tech_xilinx.ys

+read_verilog ../top.v
+synth_xilinx
+tee -o result.log stat -tech xilinx