From 4b2c048529a64a79cbce403e070c5a7c138ba117 Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Wed, 19 Oct 2016 16:33:08 -0500 Subject: Temporary Fix for timer Also include fix for changing the behavior on simics CMVC-Prereq: 1009109 Change-Id: Ib191e2c30ac508d2506ea1ed48dd76cc59da62f2 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31519 Tested-by: Jenkins Server Reviewed-by: AMIT J. TENDOLKAR Reviewed-by: RAJA DAS Tested-by: AMIT J. TENDOLKAR --- src/test/framework/etc/workarounds.postsimsetup | 3 +++ src/test/testcases/testUtil.py | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/test') diff --git a/src/test/framework/etc/workarounds.postsimsetup b/src/test/framework/etc/workarounds.postsimsetup index ac7f3a29..0d29a9e0 100755 --- a/src/test/framework/etc/workarounds.postsimsetup +++ b/src/test/framework/etc/workarounds.postsimsetup @@ -42,3 +42,6 @@ mkdir -p $SANDBOXBASE/obj/ppc/simu/scripts/hbfw cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $SANDBOXBASE/obj/ppc/simu/scripts/hbfw patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/src/test/framework/etc/patches/standalone.simics.patch +# patch for magic instruction +mkdir -p $SANDBOXBASE/imics/linux64/lib/ +cp -f /esw/san2/sgupta2m/MagicPatch/ppe.so $SANDBOXBASE/simics/linux64/lib/ diff --git a/src/test/testcases/testUtil.py b/src/test/testcases/testUtil.py index db8fbfbb..7620ebc5 100644 --- a/src/test/testcases/testUtil.py +++ b/src/test/testcases/testUtil.py @@ -26,6 +26,8 @@ import time import conf from sim_commands import * +waitItrCount = 10000000; +cyclesPerIter = 20000; #err = False lbus = conf.p9Proc0.proc_lbus_map def writeUsFifo( data): @@ -112,9 +114,9 @@ def writeEntry(obj, address, value ): if( status[2] & 0x02): count = count + 1 - runCycles(200000) + runCycles(cyclesPerIter) # This will cause test to fail - if(count > 50): + if(count > waitItrCount): raise Exception('Timeout. FIFO FULL'); else: # write entry @@ -141,9 +143,9 @@ def readEntry(obj, address, size): loop = 0 else: count = count + 1 - runCycles(200000) + runCycles(cyclesPerIter) # This will cause test to fail - if(count > 50): + if(count > waitItrCount): raise Exception('Timeout. Empty FIFO'); return value -- cgit v1.2.1