From 6e227724209f78bdf0dd055de5dfed080881a4bc Mon Sep 17 00:00:00 2001
From: Andreas Olofsson <andreas@adapteva.com>
Date: Tue, 8 Mar 2016 19:36:44 -0500
Subject: [PATCH] Removed autoinst for dut.v -Had to remove the dummy dut.v to
 make scripts and links cleaner

---
 common/dv/dv_top.v | 54 +++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/common/dv/dv_top.v b/common/dv/dv_top.v
index c3ffa72..d6c04c7 100644
--- a/common/dv/dv_top.v
+++ b/common/dv/dv_top.v
@@ -9,19 +9,21 @@ module dv_top();
 
    //local variables
    integer r;   
+
    wire [IDW-1:0]   dv_coreid;
    wire [N*N-1:0]   vdd;
    wire 	    vss;
+   wire 	    clkout;
+   wire 	    dut_active;
+   wire [N-1:0]     dut_wait;
+   wire [N-1:0]     dut_access;
+   wire [N*PW-1:0]  dut_packet;
    
+  
    /*AUTOWIRE*/
    // Beginning of automatic wires (for undeclared instantiated-module outputs)
    wire			clk1;			// From dv_ctrl of dv_ctrl.v
    wire			clk2;			// From dv_ctrl of dv_ctrl.v
-   wire			clkout;			// From dut of dut.v
-   wire [N-1:0]		dut_access;		// From dut of dut.v
-   wire			dut_active;		// From dut of dut.v
-   wire [N*PW-1:0]	dut_packet;		// From dut of dut.v
-   wire [N-1:0]		dut_wait;		// From dut of dut.v
    wire			nreset;			// From dv_ctrl of dv_ctrl.v
    wire			start;			// From dv_ctrl of dv_ctrl.v
    wire [N-1:0]		stim_access;		// From dv_driver of dv_driver.v
@@ -59,33 +61,25 @@ module dv_top();
    // DEVICE UNDER TEST
    // -create your own module named dut to include at compile time 
    //#############################################################   
-
-   /*dut AUTO_TEMPLATE(
-                        .\(.*\)_out (dut_\1[]),
-                        .\(.*\)_in  (stim_\1[]),
-            );
-    */
-   
+      
    dut #(.PW(PW), 
-	 .N(N)
-	 ) 
-   dut (/*AUTOINST*/
-	// Outputs
-	.dut_active			(dut_active),
-	.clkout				(clkout),
-	.access_out			(dut_access[N-1:0]),	 // Templated
-	.packet_out			(dut_packet[N*PW-1:0]),	 // Templated
-	.wait_out			(dut_wait[N-1:0]),	 // Templated
+	  .N(N)
+	  ) 
+   dut (// Outputs
+	.dut_active	(dut_active),
+	.clkout		(clkout),
+	.wait_out	(dut_wait[N-1:0]),
+	.access_out	(dut_access[N-1:0]),
+	.packet_out	(dut_packet[N*PW-1:0]),
 	// Inputs
-	.clk1				(clk1),
-	.clk2				(clk2),
-	.nreset				(nreset),
-	.vdd				(vdd[N*N-1:0]),
-	.vss				(vss),
-	.access_in			(stim_access[N-1:0]),	 // Templated
-	.packet_in			(stim_packet[N*PW-1:0]), // Templated
-	.wait_in			(stim_wait[N-1:0]));	 // Templated
-   
+	.clk1		(clk1),
+	.clk2		(clk2),
+	.nreset		(nreset),
+	.vdd		(vdd[N*N-1:0]),
+	.vss	        (vss),
+	.access_in	(stim_access[N-1:0]),
+	.packet_in	(stim_packet[N*PW-1:0]),
+	.wait_in	(stim_wait[N-1:0]));
    
    //##############################
    //# STIMULUS + MONITORS