Enable REAL PNOR DD test cases in the VENICE configuration

Change-Id: I94c4d5d378f3c4f615e33af3bed6a04e4c55c145
RTC: 42625
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1203
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 9 insertions, 32 deletions

diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 04c47e541..54830bb7c 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -26,3 +26,9 @@
 ##    to setup the sandbox
 ##
 
+### Force LPC2SPI FPGA to be enabled - default being changed with SW147676.  Remove with RTC: 43661
+echo "+++ Update VENICE config to include LPC2SPI FPGA"
+mkdir -p $sb/simu/configs/
+cp --update $bb/src/simu/configs/P8_VENICE.config $sb/simu/configs/P8_VENICE.config
+sed -i -e's/SETENV GFW_P8_VENICE_USE_LPC2SPI_FPGA.*/SETENV GFW_P8_VENICE_USE_LPC2SPI_FPGA yes/' $sb/simu/configs/P8_VENICE.config
+
diff --git a/src/usr/pnor/test/pnorddtest.H b/src/usr/pnor/test/pnorddtest.H
index 5a7c88b07..c984ee2b6 100644
--- a/src/usr/pnor/test/pnorddtest.H
+++ b/src/usr/pnor/test/pnorddtest.H
@@ -395,17 +395,7 @@ class PnorDdTest : public CxxTest::TestSuite
             supported_modes.push_back(PnorDD::MODEL_MEMCPY);
             supported_modes.push_back(PnorDD::MODEL_LPC_MEM);
 
-            //Hack to check if this is a VENICE config since Real PNOR doesn't work in simics right now.
-            //TODO: Remove this hack when simics is fixed. (RTC: 42625)
-
-            TARGETING::EntityPath epath(TARGETING::EntityPath::PATH_PHYSICAL);
-            epath.addLast(TARGETING::TYPE_SYS,0);
-            epath.addLast(TARGETING::TYPE_NODE,0);
-            epath.addLast(TARGETING::TYPE_PROC,9);
-            TARGETING::Target* veniceProc = TARGETING::targetService().toTarget(epath);
-
-            if((!TARGETING::is_vpo()) &&
-               (veniceProc == NULL))
+            if(!TARGETING::is_vpo())
             {
                 TRACFCOMP(g_trac_pnor, "PnorDdTest::test_readwrite_modes> Adding REAL_CMD mode");
                 supported_modes.push_back(PnorDD::MODEL_REAL_CMD);
@@ -563,17 +553,7 @@ class PnorDdTest : public CxxTest::TestSuite
             supported_modes.push_back(PnorDD::MODEL_MEMCPY);
             supported_modes.push_back(PnorDD::MODEL_LPC_MEM);
 
-            //Hack to check if this is a VENICE config since Real PNOR doesn't work in simics right now.
-            //TODO: Remove this hack when simics is fixed. (RTC: 42625)
-
-            TARGETING::EntityPath epath(TARGETING::EntityPath::PATH_PHYSICAL);
-            epath.addLast(TARGETING::TYPE_SYS,0);
-            epath.addLast(TARGETING::TYPE_NODE,0);
-            epath.addLast(TARGETING::TYPE_PROC,9);
-            TARGETING::Target* veniceProc = TARGETING::targetService().toTarget(epath);
-
-            if((!TARGETING::is_vpo()) &&
-               (veniceProc == NULL))
+            if(!TARGETING::is_vpo())
             {
                 TRACFCOMP(g_trac_pnor, "PnorDdTest::test_smartwrite_modes> Adding REAL_CMD mode");
                 supported_modes.push_back(PnorDD::MODEL_REAL_CMD);
@@ -725,17 +705,8 @@ class PnorDdTest : public CxxTest::TestSuite
             std::list<PnorDD::PnorMode_t> supported_modes;
             supported_modes.push_back(PnorDD::MODEL_MEMCPY);
             supported_modes.push_back(PnorDD::MODEL_LPC_MEM);
-            //Hack to check if this is a VENICE config since Real PNOR doesn't work in simics right now.
-            //TODO: Remove this hack when simics is fixed. (RTC: 42625)
-
-            TARGETING::EntityPath epath(TARGETING::EntityPath::PATH_PHYSICAL);
-            epath.addLast(TARGETING::TYPE_SYS,0);
-            epath.addLast(TARGETING::TYPE_NODE,0);
-            epath.addLast(TARGETING::TYPE_PROC,9);
-            TARGETING::Target* veniceProc = TARGETING::targetService().toTarget(epath);
 
-            if((!TARGETING::is_vpo()) &&
-               (veniceProc == NULL))
+            if(!TARGETING::is_vpo())
             {
                 TRACFCOMP(g_trac_pnor, "PnorDdTest::test_crossblock_modes> Adding REAL_CMD mode");
                 supported_modes.push_back(PnorDD::MODEL_REAL_CMD);