From 165999aeb6aef85b852fc34971b2d89f45c10463 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Mon, 17 Nov 2008 18:40:58 +0000 Subject: [PATCH] rename SATURATION_AMOUNT to INSTRUCTION_IN_SATURATION_AMOUNT --- testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java index 94a88d1..9dd2ef3 100644 --- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java +++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java @@ -57,12 +57,12 @@ public class MarinaTest { // Less formally, this is roughly the number of stages of // buffering between the instruction insertion point and the // instruction ring, plus the capacity of the instruction ring. - private static final int SATURATION_AMOUNT = 19; + private static final int INSTRUCTION_IN_SATURATION_AMOUNT = 19; // This is some number which is significantly greater than - // SATURATION_AMOUNT. Increasing it may slow the tests down, but + // INSTRUCTION_IN_SATURATION_AMOUNT. Increasing it may slow the tests down, but // will never cause them to operate incorrectly. - private static final int MORE_THAN_SATURATION_AMOUNT = 25; + private static final int MORE_THAN_INSTRUCTION_IN_SATURATION_AMOUNT = 25; // Nominal cycle time assuming 4 GHz throughput private static final double CYCLE_TIME_NS = 0.250; @@ -696,7 +696,7 @@ public class MarinaTest { marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.OuterLoopCounter,1)); prln("Executing Set OLC--"); marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.OuterLoopCounter,SetSource.Decrement)); - saturateInstructionFifo(marina, REQUEUEING_NOP, MORE_THAN_SATURATION_AMOUNT, false); + saturateInstructionFifo(marina, REQUEUEING_NOP, MORE_THAN_INSTRUCTION_IN_SATURATION_AMOUNT, false); adjustIndent(-2); prln("End testRequeueStage0"); } @@ -707,7 +707,7 @@ public class MarinaTest { prln("Executing Set OLC=63"); marina.instrIn.fill(new Instruction.Set(DOCK,false,Predicate.IgnoreOLC,SetDest.OuterLoopCounter,63)); - saturateInstructionFifo(marina, REQUEUEING_NOP, MORE_THAN_SATURATION_AMOUNT, true); + saturateInstructionFifo(marina, REQUEUEING_NOP, MORE_THAN_INSTRUCTION_IN_SATURATION_AMOUNT, true); adjustIndent(-2); prln("End testRequeueStage0to1"); } -- 1.7.10.4