PASDK-254:Move location of mem stat dump on ARM to include memory malloc'd in EXT...
authorFrank Livingston <frank-livingston@ti.com>
Thu, 11 May 2017 23:27:31 +0000 (18:27 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 11 May 2017 23:27:31 +0000 (18:27 -0500)
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/framework/itopo/params.c
pasdk/test_dsp/framework/itopo/params.c

index 90d281948dc651995b6314a09709d9e04d94a571..34d2cd829972046bbbf6b64eb4556cad01d06fc8 100644 (file)
@@ -267,17 +267,7 @@ Void taskAsdpFxn(
         TRACE_TERSE2("TaskAsdp: AS%d: initialization phase - %d completed", as+zMS, i);
         LINNO_RPRT(TaskAsdp, -i-3);
     }
-    
-    //
-    // End of Initialization -- final memory usage report.
-    //
-    if (pP->fxns->memStatusPrint)
-    {
-        pP->fxns->memStatusPrint("ASDT MEMSTAT REPORT",
-            HEAP_INTERNAL, HEAP_INTERNAL1, HEAP_EXTERNAL, 
-            HEAP_INTERNAL1_SHM, HEAP_EXTERNAL_SHM, HEAP_EXTERNAL_NONCACHED_SHM);
-    }
-    
+      
 #ifdef NON_CACHE_STATUS
     //
     // init Status structure Gate
@@ -300,6 +290,16 @@ Void taskAsdpFxn(
     }
 #endif
 
+    //
+    // End of Initialization -- final memory usage report.
+    //
+    if (pP->fxns->memStatusPrint)
+    {
+        pP->fxns->memStatusPrint("ASDT MEMSTAT REPORT",
+            HEAP_INTERNAL, HEAP_INTERNAL1, HEAP_EXTERNAL, 
+            HEAP_INTERNAL1_SHM, HEAP_EXTERNAL_SHM, HEAP_EXTERNAL_NONCACHED_SHM);
+    }
+    
     // (***) FL: revisit
     // write back Status structure addresses for Beta Units initialized on Slave
     Cache_wb((Ptr)(&IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]), sizeof(IALG_Status *), Cache_Type_ALLD, 0);
@@ -1321,7 +1321,7 @@ PAF_ASDT_initFrame0(
     //maxFrameLength += PA_MODULO - maxFrameLength % PA_MODULO; // compute maximum framelength (needed for ARC support)
     //aLen = numchan[z] * maxFrameLength;
     aLen = numchan[z] * maxFrameLength + (maxFrameLength - FRAMELENGTH); /* Qin - need additional memory for starting offset
-                                                                                     See line 1301 */
+                                                                                  See line 1301 */
 
     //
     // Initialize audio frame elements directly
index 3ed3ee3bf6baf03ded0edfb1eb541a98e3d9f84a..d3f782f9245a5c08b4bdc41f76d3ff50389ca6f8 100644 (file)
@@ -333,10 +333,6 @@ static const IALG_MemSpace params_memspace_PAi_Slave[] = {
 
 //#include <pafhjt.h>
 
-//extern int IRAM;
-//extern int SDRAM;
-//extern int L3RAM;
-
 // .............................................................................
 const PAF_MetadataBufStatus PAF_ASDT_params_MetadataBufStatus[] =
 {
@@ -429,11 +425,10 @@ const PAF_ASDT_Params asdp_params_PAi =
     },
     PAF_AST_inputsFromDecodes_std,
     {                                                       // heap
-        &gPafHeapIdInt1,    //&IRAM                         // heap.pIntern
-        &gPafHeapIdExt,     //&SDRAM,                       // heap.pExtern
-        //&gPafHeapIdInt1,    //&IRAM,                        // heap.pFrmbuf
-        &gPafHeapIdExt,     //&SDRAM,                        // heap.pFrmbuf //Qin - moved to external memory
-        &gPafHeapIdInt1,    //&L3RAM,                       // heap.pIntern1
+        &gPafHeapIdInt1,                                    // heap.pHeapIdIntern
+        &gPafHeapIdExt,                                     // heap.pHeapIdExtern
+        &gPafHeapIdExt,                                     // heap.pHeapIdFrmbuf
+        &gPafHeapIdInt1,                                    // heap.pHeapIdIntern1
         &gPafHeapIdInt1Shm,                                 // heap.pHeapIdInt1Shm
         &gPafHeapIdExtShm,                                  // heap.pHeapIdExtShm
         &gPafHeapIdExtNonCachedShm,                         // heap.pHeapIdExtNonCachedShm
index cb41dd9d9b9915fd53821379cb2cd07309ef4322..f2d15f03bb9faefb1561665f34af71b88673a1e0 100644 (file)
@@ -760,7 +760,7 @@ const PAF_MetadataBufStatus PAF_AST_params_MetadataBufStatus[] =
     PAF_MAX_PRIVATE_MD_SZ,  // bufSize
     PAF_MAX_NUM_PRIVATE_MD, // NumBuf
     128,                    // alignment
-    &gPafHeapIdExt //&SDRAM // &IRAM,        // pSpace
+    &gPafHeapIdExt          // pHeapIdMdbuf
 };
 
 // .............................................................................
@@ -857,12 +857,12 @@ const PAF_ASIT_Params asip_params_PAi =
     PAF_AST_inputsFromDecodes_std,
     PAF_AST_outputsFromEncodes_std,
     {                                                       // heap
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pIntern
-        &gPafHeapIdExt,    //&SDRAM,                        // heap.pExtern
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pInpbuf
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pOutbuf
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pFrmbuf
-        &gPafHeapIdInt1,   //&L3RAM,                        // heap.pIntern1
+        &gPafHeapIdInt,                                     // heap.pHeapIdIntern
+        &gPafHeapIdExt,                                     // heap.pHeapIdExtern
+        &gPafHeapIdInt,                                     // heap.pHeapIdInpbuf
+        &gPafHeapIdInt,                                     // heap.pHeapIdOutbuf
+        &gPafHeapIdInt,                                     // heap.pHeapIdFrmbuf
+        &gPafHeapIdInt1,                                    // heap.pHeapIdIntern1
         &gPafHeapIdInt1Shm,                                 // heap.pHeapIdInt1Shm
         &gPafHeapIdExtShm,                                  // heap.pHeapIdExtShm
         &gPafHeapIdExtNonCachedShm,                         // heap.pHeapIdExtNonCachedShm
@@ -924,12 +924,12 @@ const PAF_ASOT_Params asop_params_PAi =
     PAF_AST_inputsFromDecodes_std,
     PAF_AST_outputsFromEncodes_std,
     {                                                       // heap
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pIntern
-        &gPafHeapIdExt,    //&SDRAM,                        // heap.pExtern
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pInpbuf
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pOutbuf
-        &gPafHeapIdInt,    //&IRAM,                         // heap.pFrmbuf
-        &gPafHeapIdInt1,   //&L3RAM,                        // heap.pIntern1
+        &gPafHeapIdInt,                                     // heap.pHeapIdIntern
+        &gPafHeapIdExt,                                     // heap.pHeapIdExtern
+        &gPafHeapIdInt,                                     // heap.pHeapIdInpbuf
+        &gPafHeapIdInt,                                     // heap.pHeapIdOutbuf
+        &gPafHeapIdInt,                                     // heap.pHeapIdFrmbuf
+        &gPafHeapIdInt1,                                    // heap.pHeapIdIntern1
         &gPafHeapIdInt1Shm,                                 // heap.pHeapIdInt1Shm
         &gPafHeapIdExtShm,                                  // heap.pHeapIdExtShm
         &gPafHeapIdExtNonCachedShm,                         // heap.pHeapIdExtNonCachedShm