From 71a46afa791a642bd8de012f1c0b236d6066ab05 Mon Sep 17 00:00:00 2001
From: Tom Verbeure <tom_verbeure@yahoo.com>
Date: Mon, 29 Aug 2016 22:14:39 -0700
Subject: [PATCH] Checkpoint: map, fit

---
 scripts/quartus/Makefile   |  6 +----
 scripts/quartus/tabtest.sh | 50 ++++++++++++++------------------------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/scripts/quartus/Makefile b/scripts/quartus/Makefile
index 7af582f..ab9357a 100644
--- a/scripts/quartus/Makefile
+++ b/scripts/quartus/Makefile
@@ -47,11 +47,7 @@ tab_%/results.txt:
 area: synth_area_small synth_area_regular synth_area_large
 	-grep -B4 -A10 'Slice LUTs' synth_area_small.log synth_area_regular.log synth_area_large.log
 
-table.txt: tab_small_xc7a_1/results.txt tab_small_xc7a_2/results.txt tab_small_xc7a_3/results.txt
-table.txt: tab_small_xc7k_1/results.txt tab_small_xc7k_2/results.txt tab_small_xc7k_3/results.txt
-table.txt: tab_small_xc7v_1/results.txt tab_small_xc7v_2/results.txt tab_small_xc7v_3/results.txt
-table.txt: tab_small_xcku_1/results.txt tab_small_xcku_2/results.txt tab_small_xcku_3/results.txt
-table.txt: tab_small_xcvu_1/results.txt tab_small_xcvu_2/results.txt tab_small_xcvu_3/results.txt
+table.txt: tab_small_ep4ce_c7/results.txt
 
 table.txt:
 	bash table.sh > table.txt
diff --git a/scripts/quartus/tabtest.sh b/scripts/quartus/tabtest.sh
index fa43fc3..2695368 100644
--- a/scripts/quartus/tabtest.sh
+++ b/scripts/quartus/tabtest.sh
@@ -18,46 +18,32 @@ synth_case() {
 	fi
 
 	case "${dev}" in
-		xc7a) xl_device="xc7a15t-fgg484-${grade}" ;;
-		xc7k) xl_device="xc7k70t-fbg676-${grade}" ;;
-		xc7v) xl_device="xc7v585t-ffg1761-${grade}" ;;
-		xcku) xl_device="xcku035-fbva676-${grade}" ;;
-		xcvu) xl_device="xcvu065-ffvc1517-${grade}" ;;
+		ep4ce) al_device="ep4ce30f23${grade}" ;;
 	esac
 
-	case "${dev}-${grade}" in
-		xcku-1) xl_device="${xl_device}-c" ;;
-		xcvu-1) xl_device="${xl_device}-i" ;;
-		xcku-?|xcvu-?) xl_device="${xl_device}-e" ;;
-	esac
-
-	cat > test_${1}.tcl <<- EOT
-		read_verilog ../tabtest.v
-		read_verilog ../../../picorv32.v
-		read_xdc test_${1}.xdc
-		synth_design -flatten_hierarchy full -part ${xl_device} -top top
-		opt_design -sweep -remap -propconst
-		opt_design -directive Explore
-		place_design -directive Explore
-		phys_opt_design -retime -rewire -critical_pin_opt -placement_opt -critical_cell_opt
-		route_design -directive Explore
-		place_design -post_place_opt
-		phys_opt_design -retime
-		route_design -directive NoTimingRelaxation
-		report_utilization
-		report_timing
+	cat > test_${1}.qsf <<- EOT
+set_global_assignment -name DEVICE ${al_device}
+set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
+set_global_assignment -name TOP_LEVEL_ENTITY top
+set_global_assignment -name VERILOG_FILE ../tabtest.v
+set_global_assignment -name VERILOG_FILE ../../../picorv32.v
+set_global_assignment -name SDC_FILE test_${1}.sdc
 	EOT
 
-	cat > test_${1}.xdc <<- EOT
+	cat > test_${1}.sdc <<- EOT
 		create_clock -period ${speed%?}.${speed#?} [get_ports clk]
 	EOT
 
 	echo "Running tab_${ip}_${dev}_${grade}/test_${1}.."
-	if ! $VIVADO -nojournal -log test_${1}.log -mode batch -source test_${1}.tcl > /dev/null 2>&1; then
-		cat test_${1}.log
-		exit 1
-	fi
-	mv test_${1}.log test_${1}.txt
+     
+    quartus_map test_${1}
+    quartus_fit --read_settings_files=off --write_settings_files=off test_${1} -c test_${1}
+        
+#	if ! $VIVADO -nojournal -log test_${1}.log -mode batch -source test_${1}.tcl > /dev/null 2>&1; then
+#		cat test_${1}.log
+#		exit 1
+#	fi
+#	mv test_${1}.log test_${1}.txt
 }
 
 countdown=2