From 1e12cbffcc6869b1e3d9493892971074291b9cfe Mon Sep 17 00:00:00 2001
From: Frank Livingston <frank-livingston@ti.com>
Date: Wed, 3 May 2017 13:12:27 -0500
Subject: [PATCH] PASDK-71:Ensure pfpBegin() not called twice before call to
 pfpEnd() for particular PFP ID

---
 pasdk/common/pfp_app.h                        | 25 +++++++++++++
 pasdk/test_arm/.cproject                      | 12 +++---
 pasdk/test_dsp/framework/audioStreamInpProc.c | 37 +++++++++++++++++--
 pasdk/test_dsp/framework/audioStreamOutProc.c | 16 ++++++--
 pasdk/test_dsp/framework/itopo/system.c       |  8 ----
 5 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/pasdk/common/pfp_app.h b/pasdk/common/pfp_app.h
index 77ec563f..b79a3460 100644
--- a/pasdk/common/pfp_app.h
+++ b/pasdk/common/pfp_app.h
@@ -36,6 +36,18 @@
 #define PFP_DEF_PERIOD_MS   (100.0)
 #define PFP_DEF_ALPHA       (PFP_DEF_PERIOD_MS/PFP_DEF_TAU_MS)
 
+// disable all PFP's
+//#define PFP_ENABLE_MASK ( 0 )
+
+// enable all PFP's
+#define PFP_ENABLE_MASK ( (1<<PFP_ID_ASIT_0) | \
+                          (1<<PFP_ID_ASIT_1) | \
+                          (1<<PFP_ID_ASOT_0) | \
+                          (1<<PFP_ID_ASOT_ASP_0) | \
+                          (1<<PFP_ID_ASOT_ASP_1) | \
+                          (1<<PFP_ID_ASOT_ASP_2) | \
+                          (1<<PFP_ID_ASOT_ASP_3) )
+
 #else /* _TMS320C6X */
 
 /* Define all PFP ID's */
@@ -54,6 +66,19 @@
 #define PFP_DEF_PERIOD_MS   (100.0)
 #define PFP_DEF_ALPHA       (PFP_DEF_PERIOD_MS/PFP_DEF_TAU_MS)
 
+//
+// NOTE: currently ARM PFP's are enabled in main()
+// These masks can be considered a placeholder
+
+//
+// disable all PFP's
+//#define PFP_ENABLE_MASK ( 0 )
+
+// enable INFO and DECODE PFP's
+#define PFP_ENABLE_MASK ( (1<<PFP_ID_ASDT_0) | \
+                          (1<<PFP_ID_ASDT_1) )
+
+
 #endif /* _TMS320C6X */
 
 #endif /* _PFP_APP_H */
diff --git a/pasdk/test_arm/.cproject b/pasdk/test_arm/.cproject
index 419d20df..7962f36d 100644
--- a/pasdk/test_arm/.cproject
+++ b/pasdk/test_arm/.cproject
@@ -182,12 +182,12 @@
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1926416484" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1108422400"/>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1859149112.763196952" name="pfp.c" rcbsApplicability="disable" resourcePath="common/pfp/pfp.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112.918634850">
-						<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112.918634850" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112">
-							<option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL.1699808898" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL.3" valueType="enumerated"/>
-							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS.289636932" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS"/>
-							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS.454915412" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS"/>
-							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS.1285572722" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS"/>
+					<fileInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1859149112.525828123" name="pfp.c" rcbsApplicability="disable" resourcePath="common/pfp/pfp.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112.1138995781">
+						<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112.1138995781" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112">
+							<option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL.1387663569" name="Optimization Level" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.OPT_LEVEL.3" valueType="enumerated"/>
+							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS.1655899773" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS"/>
+							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS.1368316669" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS"/>
+							<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS.777145737" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS"/>
 						</tool>
 					</fileInfo>
 					<sourceEntries>
diff --git a/pasdk/test_dsp/framework/audioStreamInpProc.c b/pasdk/test_dsp/framework/audioStreamInpProc.c
index f822db70..f6b0f37d 100644
--- a/pasdk/test_dsp/framework/audioStreamInpProc.c
+++ b/pasdk/test_dsp/framework/audioStreamInpProc.c
@@ -68,6 +68,10 @@ All rights reserved.
 
 #include "pfp/pfp.h"
 #include "pfp_app.h"        /* contains all PFP ID's */
+Int32 gNumPfpAsit0=0; // debug
+Int32 gNumPfpAsit1=0;
+
+
 
 // FL: debug
 #include "dbgCapAf.h"
@@ -763,7 +767,9 @@ Void taskAsipFxn(
         // Measure cycles in autodet processing loop.
         // Only measures cycles spent in loop.
         pfpEnd(PFP_ID_ASIT_0, PFP_FINISH_MEAS);      // PFP end
+        gNumPfpAsit0--;
         pfpBegin(PFP_ID_ASIT_0, pC->taskHandle);     // PFP begin
+        gNumPfpAsit0++;
 
         statusOp_read(&tempVar8,
                       &(pAstCfg->xDec[zMD].decodeStatus.sourceSelect),
@@ -792,7 +798,9 @@ Void taskAsipFxn(
         }
 #endif
         
-        pfpEnd(PFP_ID_ASIT_0, PFP_FINISH_MEAS);      // PFP end -- outside of PFP for autodetection complete
+        // PFP end -- outside of PFP for autodetection complete
+        pfpEnd(PFP_ID_ASIT_0, PFP_FINISH_MEAS);
+        gNumPfpAsit0--;
         
         // query for input type
         if (errno = SIO_ctrl(pAstCfg->xInp[zMI].hRxSio, PAF_SIO_CONTROL_GET_SOURCEPROGRAM, (Arg )&sourceProgram))
@@ -2129,6 +2137,11 @@ PAF_ASIT_decodeProcessing(
                 else if (getVal == ASPERR_ABORT)
                 {
                     TRACE_VERBOSE0("PAF_ASIT_decodeProcessing. %d: return getVal");
+                    
+                    // PFP end -- outside of PFP for errors, EOS, or Input SIO change
+                    pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);
+                    gNumPfpAsit1--;
+                    
                     return getVal;
                 }
                 else
@@ -2217,6 +2230,11 @@ PAF_ASIT_decodeProcessing(
                             {
                                 gProbe2Err++;
                                 TRACE_TERSE0("PAF_ASIT_decodeProcessing. %d: INFO1, return (ASPERR_ISSUE)");
+                                
+                                // PFP end -- outside of PFP for errors, EOS, or Input SIO change
+                                pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);
+                                gNumPfpAsit1--;
+                                
                                 return (ASPERR_ISSUE);
                             }
                         }
@@ -2256,7 +2274,9 @@ PAF_ASIT_decodeProcessing(
                 // Measure cycles in decode processing loop.
                 // Only measures cycles spent in loop.
                 pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);     // PFP end
+                gNumPfpAsit1--;
                 pfpBegin(PFP_ID_ASIT_1, pC->taskHandle);    // PFP begin
+                gNumPfpAsit1++;
 
                 if (errno = pP->fxns->decodeInfo2(pP, pQ, pC, frame, block))
                 {
@@ -2323,8 +2343,6 @@ PAF_ASIT_decodeProcessing(
 
         }  // End of switch (state).
 
-        pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS); // PFP end -- outside of PFP for errors, EOS, or Input SIO change
-        
         TRACE_VERBOSE0("PAF_ASIT_decodeProcessing: Calling decode complete");
         if (pP->fxns->decodeComplete(pP, pQ, pC, alg, frame, block))
         {
@@ -2333,8 +2351,19 @@ PAF_ASIT_decodeProcessing(
         
         TRACE_TIME((&TIME_MOD, "as1-f2: ... + %d = ?? (final? %d)", dtime(), state == FINAL));
 
-        return errno;
+        // PFP end -- outside of PFP for errors, EOS, or Input SIO change
+        //pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);
+        //gNumPfpAsit1--;
+        
+        //return errno;
+        break;
     }  // End of for (;;) to Receive, process, and transmit the data.
+    
+    // PFP end -- outside of PFP for errors, EOS, or Input SIO change
+    pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);
+    gNumPfpAsit1--;
+    
+    return errno;
 } //PAF_ASIT_decodeProcessing
 
 // -----------------------------------------------------------------------------
diff --git a/pasdk/test_dsp/framework/audioStreamOutProc.c b/pasdk/test_dsp/framework/audioStreamOutProc.c
index c63e826d..a8fb3cfe 100644
--- a/pasdk/test_dsp/framework/audioStreamOutProc.c
+++ b/pasdk/test_dsp/framework/audioStreamOutProc.c
@@ -62,6 +62,7 @@ All rights reserved.
 
 #include "pfp/pfp.h"
 #include "pfp_app.h"        /* contains all PFP ID's */
+Int32 gNumPfpAsot0=0; // debug
 
 // FL: debug
 #include "evmc66x_gpio_dbg.h"
@@ -1458,8 +1459,10 @@ PAF_ASOT_decodeProcessing(
                 // Measure cycles in output processing loop.
                 // Only measures cycles spent in loop.
                 pfpEnd(PFP_ID_ASOT_0, PFP_FINISH_MEAS);
+                gNumPfpAsot0--;
                 pfpBegin(PFP_ID_ASOT_0, pC->taskHandle);
-
+                gNumPfpAsot0++;
+                
                 // (***) FL: do we need this? 
                 //       AF pointers come from CB read, any resets occur in Decoder AF.
                 // Reset audio frame pointers to original values
@@ -1544,17 +1547,22 @@ PAF_ASOT_decodeProcessing(
 
         }  // End of switch (state).
         
-        pfpEnd(PFP_ID_ASOT_0, PFP_FINISH_MEAS); // PFP end -- outside of PFP for errors, EOS, or Output SIO change
-
         TRACE_VERBOSE0("PAF_ASOT_decodeProcessing: Calling decode complete");
         if (pP->fxns->decodeComplete(pP, pQ, pC, NULL, frame, block))
         {
             /* ignored? */;
         }
         
-        return errno;
+        //pfpEnd(PFP_ID_ASOT_0, PFP_FINISH_MEAS); // PFP end -- outside of PFP for errors, EOS, or Output SIO change
+        //gNumPfpAsot0--;
+        
+        //return errno;
+        break;        
     } // End of for (;;)
         
+    pfpEnd(PFP_ID_ASOT_0, PFP_FINISH_MEAS); // PFP end -- outside of PFP for errors, EOS, or Output SIO change
+    gNumPfpAsot0--;
+        
     return errno;
 }
 
diff --git a/pasdk/test_dsp/framework/itopo/system.c b/pasdk/test_dsp/framework/itopo/system.c
index d1101e73..00c3fecb 100644
--- a/pasdk/test_dsp/framework/itopo/system.c
+++ b/pasdk/test_dsp/framework/itopo/system.c
@@ -47,14 +47,6 @@ All rights reserved.
 #include "pfp/pfp.h"
 #include "pfp_app.h"        /* contains all PFP ID's */
 
-#define PFP_ENABLE_MASK ( (1<<PFP_ID_ASIT_0) | \
-                          (1<<PFP_ID_ASIT_1) | \
-                          (1<<PFP_ID_ASOT_0) | \
-                          (1<<PFP_ID_ASOT_ASP_0) | \
-                          (1<<PFP_ID_ASOT_ASP_1) | \
-                          (1<<PFP_ID_ASOT_ASP_2) | \
-                          (1<<PFP_ID_ASOT_ASP_3) )
-                          
 // System Stream parameters, primary functions
 const struct {
     PAF_SST_FxnsMain *main;
-- 
2.39.2