From 3f0bb441f8a3014bf6b3a656b673fc07663bda76 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Mon, 4 Feb 2019 16:46:24 -0800
Subject: Add tests

---
 tests/aig/and.aag       |  5 +++++
 tests/aig/buffer.aag    |  3 +++
 tests/aig/cnt1.aag      |  3 +++
 tests/aig/cnt1e.aag     |  8 ++++++++
 tests/aig/empty.aag     |  1 +
 tests/aig/false.aag     |  2 ++
 tests/aig/halfadder.aag | 14 ++++++++++++++
 tests/aig/inverter.aag  |  3 +++
 tests/aig/notcnt1.aag   |  4 ++++
 tests/aig/notcnt1e.aag  |  8 ++++++++
 tests/aig/or.aag        |  5 +++++
 tests/aig/run-test.sh   | 20 ++++++++++++++++++++
 tests/aig/toggle-re.aag | 14 ++++++++++++++
 tests/aig/toggle.aag    |  4 ++++
 tests/aig/true.aag      |  2 ++
 tests/tools/autotest.sh | 21 +++++++++++++--------
 16 files changed, 109 insertions(+), 8 deletions(-)
 create mode 100644 tests/aig/and.aag
 create mode 100644 tests/aig/buffer.aag
 create mode 100644 tests/aig/cnt1.aag
 create mode 100644 tests/aig/cnt1e.aag
 create mode 100644 tests/aig/empty.aag
 create mode 100644 tests/aig/false.aag
 create mode 100644 tests/aig/halfadder.aag
 create mode 100644 tests/aig/inverter.aag
 create mode 100644 tests/aig/notcnt1.aag
 create mode 100644 tests/aig/notcnt1e.aag
 create mode 100644 tests/aig/or.aag
 create mode 100755 tests/aig/run-test.sh
 create mode 100644 tests/aig/toggle-re.aag
 create mode 100644 tests/aig/toggle.aag
 create mode 100644 tests/aig/true.aag

(limited to 'tests')

diff --git a/tests/aig/and.aag b/tests/aig/and.aag
new file mode 100644
index 000000000..d1ef2c5a5
--- /dev/null
+++ b/tests/aig/and.aag
@@ -0,0 +1,5 @@
+aag 3 2 0 1 1
+2
+4
+6
+6 2 4
diff --git a/tests/aig/buffer.aag b/tests/aig/buffer.aag
new file mode 100644
index 000000000..94a6fb1ed
--- /dev/null
+++ b/tests/aig/buffer.aag
@@ -0,0 +1,3 @@
+aag 1 1 0 1 0
+2
+2
diff --git a/tests/aig/cnt1.aag b/tests/aig/cnt1.aag
new file mode 100644
index 000000000..ce4f28fcb
--- /dev/null
+++ b/tests/aig/cnt1.aag
@@ -0,0 +1,3 @@
+aag 1 0 1 0 0 1
+2 3
+2
diff --git a/tests/aig/cnt1e.aag b/tests/aig/cnt1e.aag
new file mode 100644
index 000000000..6db3f0ffd
--- /dev/null
+++ b/tests/aig/cnt1e.aag
@@ -0,0 +1,8 @@
+aag 5 1 1 0 3 1
+2
+4 10
+4
+6 5 3
+8 4 2
+10 9 7
+b0 AIGER_NEVER
diff --git a/tests/aig/empty.aag b/tests/aig/empty.aag
new file mode 100644
index 000000000..40c0f00cb
--- /dev/null
+++ b/tests/aig/empty.aag
@@ -0,0 +1 @@
+aag 0 0 0 0 0
diff --git a/tests/aig/false.aag b/tests/aig/false.aag
new file mode 100644
index 000000000..421e64a91
--- /dev/null
+++ b/tests/aig/false.aag
@@ -0,0 +1,2 @@
+aag 0 0 0 1 0
+0
diff --git a/tests/aig/halfadder.aag b/tests/aig/halfadder.aag
new file mode 100644
index 000000000..5bf54d38d
--- /dev/null
+++ b/tests/aig/halfadder.aag
@@ -0,0 +1,14 @@
+aag 7 2 0 2 3
+2
+4
+6
+12
+6 13 15
+12 2 4
+14 3 5
+i0 x
+i1 y
+o0 s
+o1 c
+c
+half adder
diff --git a/tests/aig/inverter.aag b/tests/aig/inverter.aag
new file mode 100644
index 000000000..ff7c28542
--- /dev/null
+++ b/tests/aig/inverter.aag
@@ -0,0 +1,3 @@
+aag 1 1 0 1 0
+2
+3
diff --git a/tests/aig/notcnt1.aag b/tests/aig/notcnt1.aag
new file mode 100644
index 000000000..e92815f23
--- /dev/null
+++ b/tests/aig/notcnt1.aag
@@ -0,0 +1,4 @@
+aag 1 0 1 0 0 1
+2 3
+3
+b0 AIGER_NEVER
diff --git a/tests/aig/notcnt1e.aag b/tests/aig/notcnt1e.aag
new file mode 100644
index 000000000..141c864f7
--- /dev/null
+++ b/tests/aig/notcnt1e.aag
@@ -0,0 +1,8 @@
+aag 5 1 1 0 3 1
+2
+4 10
+5
+6 5 3
+8 4 2
+10 9 7
+b0 AIGER_NEVER
diff --git a/tests/aig/or.aag b/tests/aig/or.aag
new file mode 100644
index 000000000..f780e339f
--- /dev/null
+++ b/tests/aig/or.aag
@@ -0,0 +1,5 @@
+aag 3 2 0 1 1
+2
+4
+7
+6 3 5
diff --git a/tests/aig/run-test.sh b/tests/aig/run-test.sh
new file mode 100755
index 000000000..308578f01
--- /dev/null
+++ b/tests/aig/run-test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+OPTIND=1
+seed=""    # default to no seed specified
+while getopts "S:" opt
+do
+    case "$opt" in
+	S) arg="${OPTARG#"${OPTARG%%[![:space:]]*}"}" # remove leading space
+	   seed="SEED=$arg" ;;
+    esac
+done
+shift "$((OPTIND-1))"
+
+# check for Icarus Verilog
+if ! which iverilog > /dev/null ; then
+  echo "$0: Error: Icarus Verilog 'iverilog' not found."
+  exit 1
+fi
+
+exec ${MAKE:-make} -f ../tools/autotest.mk $seed *.aag EXTRA_FLAGS="-f aiger"
diff --git a/tests/aig/toggle-re.aag b/tests/aig/toggle-re.aag
new file mode 100644
index 000000000..b662bb386
--- /dev/null
+++ b/tests/aig/toggle-re.aag
@@ -0,0 +1,14 @@
+aag 7 2 1 2 4
+2
+4
+6 8
+6
+7
+8 4 10
+10 13 15
+12 2 6
+14 3 7
+i0 enable
+i1 reset
+o0 Q
+o1 !Q
diff --git a/tests/aig/toggle.aag b/tests/aig/toggle.aag
new file mode 100644
index 000000000..09651012d
--- /dev/null
+++ b/tests/aig/toggle.aag
@@ -0,0 +1,4 @@
+aag 1 0 1 2 0
+2 3
+2
+3
diff --git a/tests/aig/true.aag b/tests/aig/true.aag
new file mode 100644
index 000000000..366893648
--- /dev/null
+++ b/tests/aig/true.aag
@@ -0,0 +1,2 @@
+aag 0 0 0 1 0
+1
diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index d6216244f..c01ce5611 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -86,8 +86,9 @@ shift $((OPTIND - 1))
 
 for fn
 do
-	bn=${fn%.v}
-	if [ "$bn" == "$fn" ]; then
+	bn=${fn%.*}
+	ext=${fn##*.}
+	if [[ "$ext" != "v" ]] && [[ "$ext" != "aag" ]]; then
 		echo "Invalid argument: $fn" >&2
 		exit 1
 	fi
@@ -109,10 +110,14 @@ do
 		fn=$(basename $fn)
 		bn=$(basename $bn)
 
-		egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.v
+		if [[ "$ext" == "v" ]]; then
+			egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext}
+		else
+			cp ../$fn ${bn}_ref.${ext}
+		fi
 
 		if [ ! -f ../${bn}_tb.v ]; then
-			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v
+			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.${ext}
 		else
 			cp ../${bn}_tb.v ${bn}_tb.v
 		fi
@@ -138,16 +143,16 @@ do
 		fi
 
 		if [ -n "$scriptfiles" ]; then
-			test_passes -f "$frontend $include_opts" ${bn}_ref.v $scriptfiles
+			test_passes -f "$frontend $include_opts" ${bn}_ref.${ext} $scriptfiles
 		elif [ -n "$scriptopt" ]; then
-			test_passes -f "$frontend $include_opts" -p "$scriptopt" ${bn}_ref.v
+			test_passes -f "$frontend $include_opts" -p "$scriptopt" ${bn}_ref.${ext}
 		elif [ "$frontend" = "verific" ]; then
 			test_passes -p "verific -vlog2k ${bn}_ref.v; verific -import -all; opt; memory;;"
 		elif [ "$frontend" = "verific_gates" ]; then
 			test_passes -p "verific -vlog2k ${bn}_ref.v; verific -import -gates -all; opt; memory;;"
 		else
-			test_passes -f "$frontend $include_opts" -p "hierarchy; proc; opt; memory; opt; fsm; opt -full -fine" ${bn}_ref.v
-			test_passes -f "$frontend $include_opts" -p "hierarchy; synth -run coarse; techmap; opt; abc -dff" ${bn}_ref.v
+			test_passes -f "$frontend $include_opts" -p "hierarchy; proc; opt; memory; opt; fsm; opt -full -fine" ${bn}_ref.${ext}
+			test_passes -f "$frontend $include_opts" -p "hierarchy; synth -run coarse; techmap; opt; abc -dff" ${bn}_ref.${ext}
 		fi
 		touch ../${bn}.log
 	}
-- 
cgit v1.2.3


From fdd55d064b16f9334c86bb15b1c32cfb45294802 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Wed, 6 Feb 2019 12:20:36 -0800
Subject: Rename ASCII tests

---
 tests/aig/and.aag         |  5 -----
 tests/aig/buffer.aag      |  3 ---
 tests/aig/cnt1.aag        |  3 ---
 tests/aig/cnt1e.aag       |  8 --------
 tests/aig/empty.aag       |  1 -
 tests/aig/false.aag       |  2 --
 tests/aig/halfadder.aag   | 14 --------------
 tests/aig/inverter.aag    |  3 ---
 tests/aig/notcnt1.aag     |  4 ----
 tests/aig/notcnt1e.aag    |  8 --------
 tests/aig/or.aag          |  5 -----
 tests/aig/run-test.sh     | 20 --------------------
 tests/aig/toggle-re.aag   | 14 --------------
 tests/aig/toggle.aag      |  4 ----
 tests/aig/true.aag        |  2 --
 tests/aiger/and.aag       |  5 +++++
 tests/aiger/buffer.aag    |  3 +++
 tests/aiger/cnt1.aag      |  3 +++
 tests/aiger/cnt1e.aag     |  8 ++++++++
 tests/aiger/empty.aag     |  1 +
 tests/aiger/false.aag     |  2 ++
 tests/aiger/halfadder.aag | 14 ++++++++++++++
 tests/aiger/inverter.aag  |  3 +++
 tests/aiger/notcnt1.aag   |  4 ++++
 tests/aiger/notcnt1e.aag  |  8 ++++++++
 tests/aiger/or.aag        |  5 +++++
 tests/aiger/run-test.sh   | 20 ++++++++++++++++++++
 tests/aiger/toggle-re.aag | 14 ++++++++++++++
 tests/aiger/toggle.aag    |  4 ++++
 tests/aiger/true.aag      |  2 ++
 30 files changed, 96 insertions(+), 96 deletions(-)
 delete mode 100644 tests/aig/and.aag
 delete mode 100644 tests/aig/buffer.aag
 delete mode 100644 tests/aig/cnt1.aag
 delete mode 100644 tests/aig/cnt1e.aag
 delete mode 100644 tests/aig/empty.aag
 delete mode 100644 tests/aig/false.aag
 delete mode 100644 tests/aig/halfadder.aag
 delete mode 100644 tests/aig/inverter.aag
 delete mode 100644 tests/aig/notcnt1.aag
 delete mode 100644 tests/aig/notcnt1e.aag
 delete mode 100644 tests/aig/or.aag
 delete mode 100755 tests/aig/run-test.sh
 delete mode 100644 tests/aig/toggle-re.aag
 delete mode 100644 tests/aig/toggle.aag
 delete mode 100644 tests/aig/true.aag
 create mode 100644 tests/aiger/and.aag
 create mode 100644 tests/aiger/buffer.aag
 create mode 100644 tests/aiger/cnt1.aag
 create mode 100644 tests/aiger/cnt1e.aag
 create mode 100644 tests/aiger/empty.aag
 create mode 100644 tests/aiger/false.aag
 create mode 100644 tests/aiger/halfadder.aag
 create mode 100644 tests/aiger/inverter.aag
 create mode 100644 tests/aiger/notcnt1.aag
 create mode 100644 tests/aiger/notcnt1e.aag
 create mode 100644 tests/aiger/or.aag
 create mode 100755 tests/aiger/run-test.sh
 create mode 100644 tests/aiger/toggle-re.aag
 create mode 100644 tests/aiger/toggle.aag
 create mode 100644 tests/aiger/true.aag

(limited to 'tests')

diff --git a/tests/aig/and.aag b/tests/aig/and.aag
deleted file mode 100644
index d1ef2c5a5..000000000
--- a/tests/aig/and.aag
+++ /dev/null
@@ -1,5 +0,0 @@
-aag 3 2 0 1 1
-2
-4
-6
-6 2 4
diff --git a/tests/aig/buffer.aag b/tests/aig/buffer.aag
deleted file mode 100644
index 94a6fb1ed..000000000
--- a/tests/aig/buffer.aag
+++ /dev/null
@@ -1,3 +0,0 @@
-aag 1 1 0 1 0
-2
-2
diff --git a/tests/aig/cnt1.aag b/tests/aig/cnt1.aag
deleted file mode 100644
index ce4f28fcb..000000000
--- a/tests/aig/cnt1.aag
+++ /dev/null
@@ -1,3 +0,0 @@
-aag 1 0 1 0 0 1
-2 3
-2
diff --git a/tests/aig/cnt1e.aag b/tests/aig/cnt1e.aag
deleted file mode 100644
index 6db3f0ffd..000000000
--- a/tests/aig/cnt1e.aag
+++ /dev/null
@@ -1,8 +0,0 @@
-aag 5 1 1 0 3 1
-2
-4 10
-4
-6 5 3
-8 4 2
-10 9 7
-b0 AIGER_NEVER
diff --git a/tests/aig/empty.aag b/tests/aig/empty.aag
deleted file mode 100644
index 40c0f00cb..000000000
--- a/tests/aig/empty.aag
+++ /dev/null
@@ -1 +0,0 @@
-aag 0 0 0 0 0
diff --git a/tests/aig/false.aag b/tests/aig/false.aag
deleted file mode 100644
index 421e64a91..000000000
--- a/tests/aig/false.aag
+++ /dev/null
@@ -1,2 +0,0 @@
-aag 0 0 0 1 0
-0
diff --git a/tests/aig/halfadder.aag b/tests/aig/halfadder.aag
deleted file mode 100644
index 5bf54d38d..000000000
--- a/tests/aig/halfadder.aag
+++ /dev/null
@@ -1,14 +0,0 @@
-aag 7 2 0 2 3
-2
-4
-6
-12
-6 13 15
-12 2 4
-14 3 5
-i0 x
-i1 y
-o0 s
-o1 c
-c
-half adder
diff --git a/tests/aig/inverter.aag b/tests/aig/inverter.aag
deleted file mode 100644
index ff7c28542..000000000
--- a/tests/aig/inverter.aag
+++ /dev/null
@@ -1,3 +0,0 @@
-aag 1 1 0 1 0
-2
-3
diff --git a/tests/aig/notcnt1.aag b/tests/aig/notcnt1.aag
deleted file mode 100644
index e92815f23..000000000
--- a/tests/aig/notcnt1.aag
+++ /dev/null
@@ -1,4 +0,0 @@
-aag 1 0 1 0 0 1
-2 3
-3
-b0 AIGER_NEVER
diff --git a/tests/aig/notcnt1e.aag b/tests/aig/notcnt1e.aag
deleted file mode 100644
index 141c864f7..000000000
--- a/tests/aig/notcnt1e.aag
+++ /dev/null
@@ -1,8 +0,0 @@
-aag 5 1 1 0 3 1
-2
-4 10
-5
-6 5 3
-8 4 2
-10 9 7
-b0 AIGER_NEVER
diff --git a/tests/aig/or.aag b/tests/aig/or.aag
deleted file mode 100644
index f780e339f..000000000
--- a/tests/aig/or.aag
+++ /dev/null
@@ -1,5 +0,0 @@
-aag 3 2 0 1 1
-2
-4
-7
-6 3 5
diff --git a/tests/aig/run-test.sh b/tests/aig/run-test.sh
deleted file mode 100755
index 308578f01..000000000
--- a/tests/aig/run-test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-OPTIND=1
-seed=""    # default to no seed specified
-while getopts "S:" opt
-do
-    case "$opt" in
-	S) arg="${OPTARG#"${OPTARG%%[![:space:]]*}"}" # remove leading space
-	   seed="SEED=$arg" ;;
-    esac
-done
-shift "$((OPTIND-1))"
-
-# check for Icarus Verilog
-if ! which iverilog > /dev/null ; then
-  echo "$0: Error: Icarus Verilog 'iverilog' not found."
-  exit 1
-fi
-
-exec ${MAKE:-make} -f ../tools/autotest.mk $seed *.aag EXTRA_FLAGS="-f aiger"
diff --git a/tests/aig/toggle-re.aag b/tests/aig/toggle-re.aag
deleted file mode 100644
index b662bb386..000000000
--- a/tests/aig/toggle-re.aag
+++ /dev/null
@@ -1,14 +0,0 @@
-aag 7 2 1 2 4
-2
-4
-6 8
-6
-7
-8 4 10
-10 13 15
-12 2 6
-14 3 7
-i0 enable
-i1 reset
-o0 Q
-o1 !Q
diff --git a/tests/aig/toggle.aag b/tests/aig/toggle.aag
deleted file mode 100644
index 09651012d..000000000
--- a/tests/aig/toggle.aag
+++ /dev/null
@@ -1,4 +0,0 @@
-aag 1 0 1 2 0
-2 3
-2
-3
diff --git a/tests/aig/true.aag b/tests/aig/true.aag
deleted file mode 100644
index 366893648..000000000
--- a/tests/aig/true.aag
+++ /dev/null
@@ -1,2 +0,0 @@
-aag 0 0 0 1 0
-1
diff --git a/tests/aiger/and.aag b/tests/aiger/and.aag
new file mode 100644
index 000000000..d1ef2c5a5
--- /dev/null
+++ b/tests/aiger/and.aag
@@ -0,0 +1,5 @@
+aag 3 2 0 1 1
+2
+4
+6
+6 2 4
diff --git a/tests/aiger/buffer.aag b/tests/aiger/buffer.aag
new file mode 100644
index 000000000..94a6fb1ed
--- /dev/null
+++ b/tests/aiger/buffer.aag
@@ -0,0 +1,3 @@
+aag 1 1 0 1 0
+2
+2
diff --git a/tests/aiger/cnt1.aag b/tests/aiger/cnt1.aag
new file mode 100644
index 000000000..ce4f28fcb
--- /dev/null
+++ b/tests/aiger/cnt1.aag
@@ -0,0 +1,3 @@
+aag 1 0 1 0 0 1
+2 3
+2
diff --git a/tests/aiger/cnt1e.aag b/tests/aiger/cnt1e.aag
new file mode 100644
index 000000000..6db3f0ffd
--- /dev/null
+++ b/tests/aiger/cnt1e.aag
@@ -0,0 +1,8 @@
+aag 5 1 1 0 3 1
+2
+4 10
+4
+6 5 3
+8 4 2
+10 9 7
+b0 AIGER_NEVER
diff --git a/tests/aiger/empty.aag b/tests/aiger/empty.aag
new file mode 100644
index 000000000..40c0f00cb
--- /dev/null
+++ b/tests/aiger/empty.aag
@@ -0,0 +1 @@
+aag 0 0 0 0 0
diff --git a/tests/aiger/false.aag b/tests/aiger/false.aag
new file mode 100644
index 000000000..421e64a91
--- /dev/null
+++ b/tests/aiger/false.aag
@@ -0,0 +1,2 @@
+aag 0 0 0 1 0
+0
diff --git a/tests/aiger/halfadder.aag b/tests/aiger/halfadder.aag
new file mode 100644
index 000000000..5bf54d38d
--- /dev/null
+++ b/tests/aiger/halfadder.aag
@@ -0,0 +1,14 @@
+aag 7 2 0 2 3
+2
+4
+6
+12
+6 13 15
+12 2 4
+14 3 5
+i0 x
+i1 y
+o0 s
+o1 c
+c
+half adder
diff --git a/tests/aiger/inverter.aag b/tests/aiger/inverter.aag
new file mode 100644
index 000000000..ff7c28542
--- /dev/null
+++ b/tests/aiger/inverter.aag
@@ -0,0 +1,3 @@
+aag 1 1 0 1 0
+2
+3
diff --git a/tests/aiger/notcnt1.aag b/tests/aiger/notcnt1.aag
new file mode 100644
index 000000000..e92815f23
--- /dev/null
+++ b/tests/aiger/notcnt1.aag
@@ -0,0 +1,4 @@
+aag 1 0 1 0 0 1
+2 3
+3
+b0 AIGER_NEVER
diff --git a/tests/aiger/notcnt1e.aag b/tests/aiger/notcnt1e.aag
new file mode 100644
index 000000000..141c864f7
--- /dev/null
+++ b/tests/aiger/notcnt1e.aag
@@ -0,0 +1,8 @@
+aag 5 1 1 0 3 1
+2
+4 10
+5
+6 5 3
+8 4 2
+10 9 7
+b0 AIGER_NEVER
diff --git a/tests/aiger/or.aag b/tests/aiger/or.aag
new file mode 100644
index 000000000..f780e339f
--- /dev/null
+++ b/tests/aiger/or.aag
@@ -0,0 +1,5 @@
+aag 3 2 0 1 1
+2
+4
+7
+6 3 5
diff --git a/tests/aiger/run-test.sh b/tests/aiger/run-test.sh
new file mode 100755
index 000000000..308578f01
--- /dev/null
+++ b/tests/aiger/run-test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+OPTIND=1
+seed=""    # default to no seed specified
+while getopts "S:" opt
+do
+    case "$opt" in
+	S) arg="${OPTARG#"${OPTARG%%[![:space:]]*}"}" # remove leading space
+	   seed="SEED=$arg" ;;
+    esac
+done
+shift "$((OPTIND-1))"
+
+# check for Icarus Verilog
+if ! which iverilog > /dev/null ; then
+  echo "$0: Error: Icarus Verilog 'iverilog' not found."
+  exit 1
+fi
+
+exec ${MAKE:-make} -f ../tools/autotest.mk $seed *.aag EXTRA_FLAGS="-f aiger"
diff --git a/tests/aiger/toggle-re.aag b/tests/aiger/toggle-re.aag
new file mode 100644
index 000000000..b662bb386
--- /dev/null
+++ b/tests/aiger/toggle-re.aag
@@ -0,0 +1,14 @@
+aag 7 2 1 2 4
+2
+4
+6 8
+6
+7
+8 4 10
+10 13 15
+12 2 6
+14 3 7
+i0 enable
+i1 reset
+o0 Q
+o1 !Q
diff --git a/tests/aiger/toggle.aag b/tests/aiger/toggle.aag
new file mode 100644
index 000000000..09651012d
--- /dev/null
+++ b/tests/aiger/toggle.aag
@@ -0,0 +1,4 @@
+aag 1 0 1 2 0
+2 3
+2
+3
diff --git a/tests/aiger/true.aag b/tests/aiger/true.aag
new file mode 100644
index 000000000..366893648
--- /dev/null
+++ b/tests/aiger/true.aag
@@ -0,0 +1,2 @@
+aag 0 0 0 1 0
+1
-- 
cgit v1.2.3


From 3f87cf86ccefe6e66f768fbf19c34db97cf7246d Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Wed, 6 Feb 2019 14:30:19 -0800
Subject: Revert most of autotest.sh; for non *.v use Yosys to translate

---
 tests/tools/autotest.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index c01ce5611..3bce003e1 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -113,16 +113,18 @@ do
 		if [[ "$ext" == "v" ]]; then
 			egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext}
 		else
-			cp ../$fn ${bn}_ref.${ext}
+			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "verilog" -o ${bn}_ref.v ../${fn}
+			frontend="verilog"
 		fi
 
 		if [ ! -f ../${bn}_tb.v ]; then
-			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.${ext}
+			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v
 		else
 			cp ../${bn}_tb.v ${bn}_tb.v
 		fi
 		if $genvcd; then sed -i 's,// \$dump,$dump,g' ${bn}_tb.v; fi
-		compile_and_run ${bn}_tb_ref ${bn}_out_ref ${bn}_tb.v ${bn}_ref.v $libs
+		compile_and_run ${bn}_tb_ref ${bn}_out_ref ${bn}_tb.v ${bn}_ref.v $libs \
+					"$toolsdir"/../../techlibs/common/simlib.v
 		if $genvcd; then mv testbench.vcd ${bn}_ref.vcd; fi
 
 		test_count=0
@@ -143,16 +145,16 @@ do
 		fi
 
 		if [ -n "$scriptfiles" ]; then
-			test_passes -f "$frontend $include_opts" ${bn}_ref.${ext} $scriptfiles
+			test_passes -f "$frontend $include_opts" ${bn}_ref.v $scriptfiles
 		elif [ -n "$scriptopt" ]; then
-			test_passes -f "$frontend $include_opts" -p "$scriptopt" ${bn}_ref.${ext}
+			test_passes -f "$frontend $include_opts" -p "$scriptopt" ${bn}_ref.v
 		elif [ "$frontend" = "verific" ]; then
 			test_passes -p "verific -vlog2k ${bn}_ref.v; verific -import -all; opt; memory;;"
 		elif [ "$frontend" = "verific_gates" ]; then
 			test_passes -p "verific -vlog2k ${bn}_ref.v; verific -import -gates -all; opt; memory;;"
 		else
-			test_passes -f "$frontend $include_opts" -p "hierarchy; proc; opt; memory; opt; fsm; opt -full -fine" ${bn}_ref.${ext}
-			test_passes -f "$frontend $include_opts" -p "hierarchy; synth -run coarse; techmap; opt; abc -dff" ${bn}_ref.${ext}
+			test_passes -f "$frontend $include_opts" -p "hierarchy; proc; opt; memory; opt; fsm; opt -full -fine" ${bn}_ref.v
+			test_passes -f "$frontend $include_opts" -p "hierarchy; synth -run coarse; techmap; opt; abc -dff" ${bn}_ref.v
 		fi
 		touch ../${bn}.log
 	}
-- 
cgit v1.2.3


From 4e6c5e46725bb99e0c919a5f82ce5290da2ce2f9 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Fri, 8 Feb 2019 11:41:25 -0800
Subject: Add binary AIGs converted from AAG

---
 tests/aiger/and.aig       | 3 +++
 tests/aiger/buffer.aig    | 2 ++
 tests/aiger/cnt1.aig      | 3 +++
 tests/aiger/cnt1e.aig     | 4 ++++
 tests/aiger/empty.aig     | 1 +
 tests/aiger/false.aig     | 2 ++
 tests/aiger/halfadder.aig | 9 +++++++++
 tests/aiger/inverter.aig  | 2 ++
 tests/aiger/notcnt1.aig   | 4 ++++
 tests/aiger/notcnt1e.aig  | 4 ++++
 tests/aiger/or.aig        | 3 +++
 tests/aiger/toggle-re.aig | 8 ++++++++
 tests/aiger/toggle.aig    | 4 ++++
 tests/aiger/true.aig      | 2 ++
 14 files changed, 51 insertions(+)
 create mode 100644 tests/aiger/and.aig
 create mode 100644 tests/aiger/buffer.aig
 create mode 100644 tests/aiger/cnt1.aig
 create mode 100644 tests/aiger/cnt1e.aig
 create mode 100644 tests/aiger/empty.aig
 create mode 100644 tests/aiger/false.aig
 create mode 100644 tests/aiger/halfadder.aig
 create mode 100644 tests/aiger/inverter.aig
 create mode 100644 tests/aiger/notcnt1.aig
 create mode 100644 tests/aiger/notcnt1e.aig
 create mode 100644 tests/aiger/or.aig
 create mode 100644 tests/aiger/toggle-re.aig
 create mode 100644 tests/aiger/toggle.aig
 create mode 100644 tests/aiger/true.aig

(limited to 'tests')

diff --git a/tests/aiger/and.aig b/tests/aiger/and.aig
new file mode 100644
index 000000000..da0fa0719
--- /dev/null
+++ b/tests/aiger/and.aig
@@ -0,0 +1,3 @@
+aig 3 2 0 1 1
+6
+
\ No newline at end of file
diff --git a/tests/aiger/buffer.aig b/tests/aiger/buffer.aig
new file mode 100644
index 000000000..0c715fdeb
--- /dev/null
+++ b/tests/aiger/buffer.aig
@@ -0,0 +1,2 @@
+aig 1 1 0 1 0
+2
diff --git a/tests/aiger/cnt1.aig b/tests/aiger/cnt1.aig
new file mode 100644
index 000000000..8d0ba13b1
--- /dev/null
+++ b/tests/aiger/cnt1.aig
@@ -0,0 +1,3 @@
+aig 1 0 1 0 0 1
+3
+2
diff --git a/tests/aiger/cnt1e.aig b/tests/aiger/cnt1e.aig
new file mode 100644
index 000000000..d8d159f11
--- /dev/null
+++ b/tests/aiger/cnt1e.aig
@@ -0,0 +1,4 @@
+aig 5 1 1 0 3 1
+10
+4
+

b0 AIGER_NEVER
diff --git a/tests/aiger/empty.aig b/tests/aiger/empty.aig
new file mode 100644
index 000000000..a28373cd3
--- /dev/null
+++ b/tests/aiger/empty.aig
@@ -0,0 +1 @@
+aig 0 0 0 0 0
diff --git a/tests/aiger/false.aig b/tests/aiger/false.aig
new file mode 100644
index 000000000..ad7d039fa
--- /dev/null
+++ b/tests/aiger/false.aig
@@ -0,0 +1,2 @@
+aig 0 0 0 1 0
+0
diff --git a/tests/aiger/halfadder.aig b/tests/aiger/halfadder.aig
new file mode 100644
index 000000000..83727ee63
--- /dev/null
+++ b/tests/aiger/halfadder.aig
@@ -0,0 +1,9 @@
+aig 5 2 0 2 3
+10
+6
+
i0 x
+i1 y
+o0 s
+o1 c
+c
+half adder
diff --git a/tests/aiger/inverter.aig b/tests/aiger/inverter.aig
new file mode 100644
index 000000000..525d82392
--- /dev/null
+++ b/tests/aiger/inverter.aig
@@ -0,0 +1,2 @@
+aig 1 1 0 1 0
+3
diff --git a/tests/aiger/notcnt1.aig b/tests/aiger/notcnt1.aig
new file mode 100644
index 000000000..f8a667f1f
--- /dev/null
+++ b/tests/aiger/notcnt1.aig
@@ -0,0 +1,4 @@
+aig 1 0 1 0 0 1
+3
+3
+b0 AIGER_NEVER
diff --git a/tests/aiger/notcnt1e.aig b/tests/aiger/notcnt1e.aig
new file mode 100644
index 000000000..7c85a7290
--- /dev/null
+++ b/tests/aiger/notcnt1e.aig
@@ -0,0 +1,4 @@
+aig 5 1 1 0 3 1
+10
+5
+

b0 AIGER_NEVER
diff --git a/tests/aiger/or.aig b/tests/aiger/or.aig
new file mode 100644
index 000000000..75c9e4480
--- /dev/null
+++ b/tests/aiger/or.aig
@@ -0,0 +1,3 @@
+aig 3 2 0 1 1
+7
+

\ No newline at end of file
diff --git a/tests/aiger/toggle-re.aig b/tests/aiger/toggle-re.aig
new file mode 100644
index 000000000..9d6730f21
--- /dev/null
+++ b/tests/aiger/toggle-re.aig
@@ -0,0 +1,8 @@
+aig 7 2 1 2 4
+14
+6
+7
+
i0 enable
+i1 reset
+o0 Q
+o1 !Q
diff --git a/tests/aiger/toggle.aig b/tests/aiger/toggle.aig
new file mode 100644
index 000000000..b69e21aaf
--- /dev/null
+++ b/tests/aiger/toggle.aig
@@ -0,0 +1,4 @@
+aig 1 0 1 2 0
+3
+2
+3
diff --git a/tests/aiger/true.aig b/tests/aiger/true.aig
new file mode 100644
index 000000000..10086f389
--- /dev/null
+++ b/tests/aiger/true.aig
@@ -0,0 +1,2 @@
+aig 0 0 0 1 0
+1
-- 
cgit v1.2.3


From 587872236ecd1ca2f2a466bccc8d41618feb0dfb Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Fri, 8 Feb 2019 12:41:59 -0800
Subject: Support and differentiate between ASCII and binary AIG testing

---
 tests/aiger/run-test.sh | 6 +++++-
 tests/tools/autotest.sh | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/aiger/run-test.sh b/tests/aiger/run-test.sh
index 308578f01..e0a34f023 100755
--- a/tests/aiger/run-test.sh
+++ b/tests/aiger/run-test.sh
@@ -17,4 +17,8 @@ if ! which iverilog > /dev/null ; then
   exit 1
 fi
 
-exec ${MAKE:-make} -f ../tools/autotest.mk $seed *.aag EXTRA_FLAGS="-f aiger"
+echo "===== AAG ======"
+${MAKE:-make} -f ../tools/autotest.mk $seed *.aag EXTRA_FLAGS="-f aiger"
+
+echo "===== AIG ======"
+exec ${MAKE:-make} -f ../tools/autotest.mk $seed *.aig EXTRA_FLAGS="-f aiger"
diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index 3e1325b33..0ffa062e3 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -90,7 +90,7 @@ for fn
 do
 	bn=${fn%.*}
 	ext=${fn##*.}
-	if [[ "$ext" != "v" ]] && [[ "$ext" != "aag" ]]; then
+	if [[ "$ext" != "v" ]] && [[ "$ext" != "aag" ]] && [[ "$ext" != "aig" ]]; then
 		echo "Invalid argument: $fn" >&2
 		exit 1
 	fi
-- 
cgit v1.2.3


From 430a7548bca6046c812f713877253f8c3d81d805 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Sun, 17 Feb 2019 11:50:55 -0800
Subject: One more merge conflict

---
 tests/tools/autotest.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index 2722cba19..b5abc3570 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -134,18 +134,13 @@ do
 		fn=$(basename $fn)
 		bn=$(basename $bn)
 
-<<<<<<< HEAD
+		rm -f ${bn}_ref.fir
 		if [[ "$ext" == "v" ]]; then
 			egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext}
 		else
 			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "verilog" -o ${bn}_ref.v ../${fn}
 			frontend="verilog"
 		fi
-=======
-		rm -f ${bn}_ref.fir
-
-		egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.v
->>>>>>> e45f62b0c56717a23099425f078d1e56212aa632
 
 		if [ ! -f ../${bn}_tb.v ]; then
 			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v
-- 
cgit v1.2.3