more automatic testcases

t-crest · Jul 29, 2014 · 352ae56 · 352ae56
1 parent ca7753a
commit 352ae56
Show file tree

Hide file tree

Showing 7 changed files with 2,078 additions and 6 deletions.
diff --git a/test/testcases/test_tiled_4x4/autosim.do b/test/testcases/test_tiled_4x4/autosim.do
@@ -0,0 +1,5 @@
+set NumericStdNoWarnings 1
+view *
+#view wave
+run 50 us
+exit
diff --git a/test/testcases/test_tiled_4x4/config.mk b/test/testcases/test_tiled_4x4/config.mk
@@ -5,6 +5,13 @@ test_tiled_4x4: clean test_tiled_4x4_setup async_rtl_asic noc_tiled
 	$(PREFIX) vcom $(OPTIONS) $(SRCDIR)/noc/tiled/fake_entities/processor_traffic_generator.vhd
 	$(PREFIX) vsim -t 10ps -voptargs=+acc -do $(TESTDIR)/testcases/netlist_tiled/tile_netlist_rtl.do tiled_noc_tb
 
+test_tiled_4x4_auto: clean test_tiled_4x4_setup async_rtl_asic noc_tiled
+	$(PREFIX) vcom $(OPTIONS) $(TESTDIR)/bench/tiled_noc_tb.vhd
+	$(PREFIX) vcom $(OPTIONS) $(SRCDIR)/noc/tiled/fake_entities/processor_traffic_generator.vhd
+	$(PREFIX) vsim -c -t 10ps -voptargs=+acc -do $(TESTDIR)/testcases/test_tiled_4x4/autosim.do tiled_noc_tb | grep NI |sort |grep read > output.filtered
+	diff -w output.filtered ../test/testcases/test_tiled_4x4/output.golden
+	@echo test_tiled_4x4 passed
+
 test_tiled_4x4_setup: work
 	$(PREFIX) vcom $(OPTIONS) $(TESTDIR)/testcases/test_tiled_4x4/config.vhd 
 

diff --git a/test/testcases/test_tiled_4x4/output.golden b/test/testcases/test_tiled_4x4/output.golden
diff --git a/test/testcases/test_tiled_4x4_pipelined/autosim.do b/test/testcases/test_tiled_4x4_pipelined/autosim.do
@@ -0,0 +1,6 @@
+set NumericStdNoWarnings 1
+view *
+#view wave
+log -r * 
+run 50 us
+exit
diff --git a/test/testcases/test_tiled_4x4_pipelined/config.mk b/test/testcases/test_tiled_4x4_pipelined/config.mk
@@ -5,6 +5,13 @@ test_tiled_4x4_pipelined: clean test_tiled_4x4_pipelined_setup async_rtl_asic no
 	$(PREFIX) vcom $(OPTIONS) $(SRCDIR)/noc/tiled/fake_entities/processor_traffic_generator.vhd
 	$(PREFIX) vsim -t 10ps -voptargs=+acc -do $(TESTDIR)/testcases/netlist_tiled/tile_netlist_rtl.do tiled_noc_tb
 
+test_tiled_4x4_pipelined_auto: clean test_tiled_4x4_pipelined_setup async_rtl_asic noc_tiled
+	$(PREFIX) vcom $(OPTIONS) $(TESTDIR)/bench/tiled_noc_tb.vhd
+	$(PREFIX) vcom $(OPTIONS) $(SRCDIR)/noc/tiled/fake_entities/processor_traffic_generator.vhd
+	$(PREFIX) vsim -c -t 10ps -voptargs=+acc -do $(TESTDIR)/testcases/test_tiled_4x4_pipelined/autosim.do tiled_noc_tb | grep NI |sort |grep read > output.filtered
+	diff -w output.filtered ../test/testcases/test_tiled_4x4_swap/output.golden
+	@echo pipelined 4x4 test passed
+
 test_tiled_4x4_pipelined_setup: work
 	$(PREFIX) vcom $(OPTIONS) $(TESTDIR)/testcases/test_tiled_4x4_pipelined/config.vhd 
 

diff --git a/test/testcases/test_tiled_4x4_pipelined/config.vhd b/test/testcases/test_tiled_4x4_pipelined/config.vhd
@@ -40,26 +40,25 @@ use ieee.std_logic_1164.all;
 use work.config_types.all;
 
 package config is
-	constant SPM_ADDR_WIDTH	: integer := 9;
 
 
 
 
     constant TARGET_ARCHITECTURE : ARCHITECTURES := RTL;
     constant TARGET_IMPLEMENTATION : IMPLEMENTATIONS := ASYNC;
-
+    constant SPM_ADDR_WIDTH : integer := 8;    
     constant N : integer := 4; -- Horizontal width
     constant M : integer := 4; -- Vertical Height
 
     constant NODES : integer := N*M;
     constant PRD_LENGTH : integer := 21;
-
+    constant GATING_ENABLED : integer := 1;
     constant SWAP_PORTS : boolean := true;
 
-    constant LINK_PIPELINE_STAGES : integer := 3;
-    constant LINK_PIPELINE_INIT	: latch_state_vector(3 downto 0) := (EMPTY_BUBBLE, EMPTY_TOKEN, VALID_BUBBLE, VALID_TOKEN);
+    constant LINK_PIPELINE_STAGES : integer := 0;
+    constant LINK_PIPELINE_INIT	: latch_state_vector(3 downto 0) := (transparent, transparent, transparent, transparent);
 
-    constant TEST_DIR : string := "../test/testcases/test_tiled_4x4_pipelined/";
+    constant TEST_DIR : string := "../test/testcases/test_tiled_4x4_swap/";
     constant TG_SCHEDULE_FILE : string := TEST_DIR & "all_to_all.sched";
     constant TG_SPM_INIT_FILE : string := TEST_DIR & "SPM_init.dat";
     constant TG_DMA_INIT_FILE : string := TEST_DIR & "DMA_init.dat";