From: Adam Megacz <adam.megacz@sun.com>
Date: Tue, 9 Dec 2008 23:22:21 +0000 (+0000)
Subject: attempt to use high-speed south fifo, but currently 3025 fails
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d2addc34cd7775383d91159382a94cd7685a67b2;p=fleet.git

attempt to use high-speed south fifo, but currently 3025 fails
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 07aa38e..cd9bf19 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -1248,6 +1248,7 @@ public class MarinaTest {
     	prln("End recvData");    	
     }
 
+
     private void setOlcFromDataLatch(Marina marina) {
     	prln("Begin setOlcFromDataLatch");
     	adjustIndent(2);
@@ -1726,12 +1727,11 @@ public class MarinaTest {
             prln("inserting set ilc=1");
             marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.InnerLoopCounter,1));
 
-            /*
+            // commenting the following four lines causes this test to pass
             prln("disabling instruction send");
             marina.enableInstructionSend(false);
             prln("enabling instruction recirculate");
             marina.enableInstructionRecirculate(true);
-            */
 
             prln("inserting "+decr_amount+" olc-- instructions");
             for(int i=0; i<decr_amount; i++)
@@ -1757,6 +1757,9 @@ public class MarinaTest {
             prln("enabling instruction send");
             marina.enableInstructionSend(true);
 
+            prln("calling marina.instrIn.run()");
+            marina.instrIn.run();
+
             int expected = decr_amount>=olc ? 0 : 1;
             dataItems = marina.data.drainMany(2);
             fatal(dataItems.size()!=expected, "Expected "+expected+" item to emerge but got: "+dataItems.size()+" data items");