From 43388cae334bd7cf203385f66ad8e84bf3dcc92f Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Wed, 4 Mar 2009 23:13:24 +0000 Subject: [PATCH] get testAllChains() to work --- .../com/sun/vlsi/chips/marina/test/Marina.java | 43 ++++++++++++-------- .../com/sun/vlsi/chips/marina/test/MarinaTest.java | 6 +-- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/testCode/com/sun/vlsi/chips/marina/test/Marina.java b/testCode/com/sun/vlsi/chips/marina/test/Marina.java index 953fb9b..ee48a9c 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/Marina.java +++ b/testCode/com/sun/vlsi/chips/marina/test/Marina.java @@ -14,23 +14,30 @@ import edu.berkeley.fleet.api.Instruction; public class Marina { public static final String DATA_CHAIN = "marina.marina_data"; public static final String CONTROL_CHAIN = "marina.marina_control"; - public static final String REPORT_CHAIN = "marina.marina_report"; + public static final String REPORT_CHAIN = "marina.marina_report"; - private static final String OLC_PATH = - "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx6@0"; - private static final String ILC_PATH = - "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx9@0"; - private static final String FLAGS_PATH = - "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx2@0"; - private static final String INSTR_RING_CONTROL_PATH = - "southFif@0.tapPropS@0.tapStage@1"; - private static final String TOK_FIFO_PATH = "tokenFIF@0"; - private static final String TOK_PRED_PATH = "dataPath@0.ringSkip@1.skipCoun@1.moveLit@0.scanKhx5@0.scanCell@5"; - private static final String INSTRUCTION_COUNTER_PATH = "southFif@0.tapPropS@0.instruct@0"; - private static final String DATA_COUNTER_PATH = "northFif@0.fillDrai@0.instruct@0"; - private static final int COUNTER_LENGTH = 34; - private static final int INSTRUCTION_SEND_NDX = 1; - private static final int INSTRUCTION_RECIRCULATE_NDX = 0; + private static final String OLC_PATH = + "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx6@0"; + private static final String ILC_PATH = + "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx9@0"; + private static final String FLAGS_PATH = + "dataPath@0.ringSkip@1.skipCoun@1.skipCoun@0.scanKx2@0"; + + private static final String INSTR_RING_CONTROL_PATH = + "southFif@1.tapPropS@1.tapStage@2"; + private static final String TOK_FIFO_PATH = + "tokenFIF@1"; + private static final String INSTRUCTION_COUNTER_PATH = + "southFif@1.tapPropS@1.instruct@0"; + private static final String DATA_COUNTER_PATH = + "northFif@1.fillDrai@1.instruct@0"; + + private static final String TOK_PRED_PATH = + "dataPath@0.ringSkip@1.skipCoun@1.moveLit@0.scanKhx5@0.scanCell@5"; + + private static final int COUNTER_LENGTH = 34; + private static final int INSTRUCTION_SEND_NDX = 1; + private static final int INSTRUCTION_RECIRCULATE_NDX = 0; private static final int A_FLAG_NDX = 0; private static final int B_FLAG_NDX = 1; @@ -96,12 +103,12 @@ public class Marina { this.cc = cc; this.model = model; this.indenter = indenter; - data = new ProperStopper("northFif@0.fillDrai@0.properSt@0", + data = new ProperStopper("northFif@1.fillDrai@1.properSt@1", CONTROL_CHAIN, DATA_CHAIN, REPORT_CHAIN, cc, model, clockHack, indenter); - instrIn = new InstructionStopper("southFif@0.tapPropS@0.properSt@0", + instrIn = new InstructionStopper("southFif@1.tapPropS@1.properSt@1", CONTROL_CHAIN, DATA_CHAIN, REPORT_CHAIN, diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java index 3264b27..87b70bd 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java +++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java @@ -243,9 +243,9 @@ public class MarinaTest { ((SimulationModel)model).start("nanosim -c cfg", netListName, 0, !cmdArgs.jtagShift); -// ctD.testAllChains("marina", Infrastructure.SEVERITY_WARNING); -// ctR.testAllChains("marina", Infrastructure.SEVERITY_WARNING); -// ctC.testAllChains("marina", Infrastructure.SEVERITY_WARNING); + ctD.testAllChains("marina", Infrastructure.SEVERITY_WARNING); + ctR.testAllChains("marina", Infrastructure.SEVERITY_WARNING); + ctC.testAllChains("marina", Infrastructure.SEVERITY_WARNING); ccs.addChain(Marina.DATA_CHAIN, ccD); ccs.addChain(Marina.REPORT_CHAIN, ccR); -- 1.7.10.4