PASDK-258:Update code merged from 4573453 (PP PASDK-242).
authorFrank Livingston <frank-livingston@ti.com>
Thu, 9 Mar 2017 23:12:47 +0000 (17:12 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 9 Mar 2017 23:12:47 +0000 (17:12 -0600)
Provide single header file to enable/disable and configure benchmarking
build (see PASDK-242 for details on benchmarking configurations).
Header file: common/dbgBenchmark.h
Build with benchmarking disabled is default (SIDK) build.

pasdk/common/asp0.c
pasdk/common/dbgBenchmark.h [new file with mode: 0644]
pasdk/common/dbgCapAf.h
pasdk/test_arm/.cproject
pasdk/test_arm/framework/itopo/params.c
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/itopo/evmk2g/atboot.c
pasdk/test_dsp/framework/aspDecOpCircBuf_master.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/itopo/params.c
pasdk/test_dsp/framework/itopo/patchs.c

index b6a6991324032193d0e6887fd4b23023eac3efcf..f79035f1bc5f9647a23cbdd8151c77c00e205ce1 100644 (file)
@@ -51,8 +51,13 @@ All rights reserved.
 #include <xdc/runtime/IHeap.h>
 #include <ti/sysbios/heaps/HeapMem.h>
 
-
-//#define PROFILER
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+//
+// Performing PCM high-sampling rate + SRC + CAR benchmarking
+//
+#ifdef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+#define PROFILER
+#endif
 
 #ifdef PROFILER
 #include <ti/sysbios/knl/Task.h>
@@ -82,6 +87,8 @@ volatile UInt32 time32_1, time32_2;
 
 #include "logp.h"
 
+
+
 //
 // Audio Stream Processing Chain Function - Initialization
 //
diff --git a/pasdk/common/dbgBenchmark.h b/pasdk/common/dbgBenchmark.h
new file mode 100644 (file)
index 0000000..587caca
--- /dev/null
@@ -0,0 +1,57 @@
+
+/*
+Copyright (c) 2017, Texas Instruments Incorporated - http://www.ti.com/
+All rights reserved.
+
+* Redistribution and use in source and binary forms, with or without 
+* modification, are permitted provided that the following conditions
+* are met:
+*
+* Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+*
+* Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the
+* distribution.
+*
+* Neither the name of Texas Instruments Incorporated nor the names of
+* its contributors may be used to endorse or promote products derived
+* from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+#ifndef _DBG_BENCHMARK_H_
+#define _DBG_BENCHMARK_H_
+
+//
+// Include file to enable benchmarking for:
+//  1) PCM over HDMI input @ 96 kHz  + SRC 2:1 + CAR (7.1.2 or 7.1.4)
+//  2) PCM over HDMI input @ 192 kHz + SRC 4:1 + CAR (7.1.2 or 7.1.4)
+// 
+
+//#define _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+
+#ifndef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+#define PAF_SYS_FRAMELENGTH     ( 256 )
+#define PAF_MAX_SYS_FRAMELENGTH ( 256 )
+
+#else // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+#define PAF_SYS_FRAMELENGTH     ( 512 )     // 512 or 1024
+#define PAF_MAX_SYS_FRAMELENGTH ( 1024 )
+
+#endif // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+
+#endif // _DBG_BENCHMARK_H_
index f6e054edee9d414f072dd1431fdbadfd8c0e6ed0..a71b9176d0df44aa24d8ce0584a1bf8fb0875b22 100644 (file)
@@ -39,6 +39,7 @@ All rights reserved.
 #include <xdc/std.h>
 
 #include "paftyp.h"
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
 
 #define CAP_AF_SOK         ( 0 )
 #define CAP_AF_INV_CHNUM   ( -1 )
index 57d2edf548734f64626c298fa8163f41bac6def4..f9b5c24ca60974f6ec657ad83d0b738988937714 100644 (file)
@@ -11,8 +11,8 @@
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
+                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
@@ -70,7 +70,6 @@
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1227706836" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE.1708873009" name="Define symbols (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
-                                                                       <listOptionValue builtIn="false" value="PAF_SYS_FRAMELENGTH=256"/>
                                                                        <listOptionValue builtIn="false" value="arm0"/>
                                                                        <listOptionValue builtIn="false" value="ARMCOMPILE"/>
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
+                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.767496334" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE.954399099" name="Define symbols (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
-                                                                       <listOptionValue builtIn="false" value="PAF_SYS_FRAMELENGTH=256"/>
                                                                        <listOptionValue builtIn="false" value="arm0"/>
                                                                        <listOptionValue builtIn="false" value="ARMCOMPILE"/>
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
index c70e68acc336c316239bf86281f05461a835daa5..eb8b6f1fe720d0c1820490e9bece45aae01db437 100644 (file)
@@ -52,6 +52,8 @@ All rights reserved.
 #include "audioStreamProc_params.h"
 #include "audioStreamDecodeProc.h"
 
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+
 //
 // Framework Declarations
 //
index 4078270f022ae757a179b9362b93a18d20302d6c..4d93b2fa813be1af335a093ab65d435c92da0bd2 100644 (file)
@@ -11,8 +11,8 @@
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
@@ -68,7 +68,6 @@
                                                        <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug.1984605958" keepEnvironmentInBuildfile="false" name="GNU Make" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug"/>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1216493005" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE.903477341" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE" valueType="definedSymbols">
-                                                                       <listOptionValue builtIn="false" value="PAF_SYS_FRAMELENGTH=256"/>
                                                                        <listOptionValue builtIn="false" value="dsp0"/>
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
                                                                        <listOptionValue builtIn="false" value="SOC_K2G"/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
+                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_01/psdk_cust/pdk_k2g_1_0_1_0_eng/packages"/>
+                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                                        <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug.1271461572" keepEnvironmentInBuildfile="false" name="GNU Make" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug"/>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.423813254" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE.603211438" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE" valueType="definedSymbols">
-                                                                       <listOptionValue builtIn="false" value="PAF_SYS_FRAMELENGTH=256"/>
                                                                        <listOptionValue builtIn="false" value="dsp0"/>
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
                                                                        <listOptionValue builtIn="false" value="SOC_K2G"/>
index 4a31c7699c090116bc9f3e38f2b9815c3d93f336..2f8a87336e86652aac4dee542347db1534b0d089 100644 (file)
@@ -46,11 +46,28 @@ All rights reserved.
 
 #include <pa_i13_evmk2g_io_a.h> //<pa_i13_evmda830_io_a.h>
 
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+
 #ifndef SIMULATE_SIO
-//#define DDP
+//
+// NOT simulating IO
+//
+
 #ifdef TEST_MULTICHANNEL
-#ifndef DDP
-//THD
+//#define DDP_ATBOOT_CFG
+
+#ifndef DDP_ATBOOT_CFG
+//
+// NOT DDP at-boot configuration
+//
+
+#ifndef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+//
+// THD at-boot configuration
+//
+
+// NOT Performing PCM high-sampling rate + SRC + CAR benchmarking
+// 4XI2S HDMI input for multi-ch PCM
 #define CUS_ATBOOT_S \
     writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
     writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
@@ -61,7 +78,8 @@ All rights reserved.
     execPAIOutAnalog, \
     execPAIInHDMI
 #else
-//DDP
+// Performing PCM high-sampling rate + SRC + CAR benchmarking
+// 4XI2S HDMI input for multi-ch PCM
 #define CUS_ATBOOT_S \
     writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
     writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
@@ -70,11 +88,27 @@ All rights reserved.
     writeSYSRecreationModeDirect, \
     writeSYSChannelConfigurationRequestSurround4_1, \
     execPAIOutAnalog, \
-    execPAIInHDMIStereo
-#endif
-    //writeSRCModeDisable, \
-    //writeCARModeDisable
+    execPAIInHDMI, \
+    writeSRCModeDisable, \
+    writeCARModeDisable
+#endif    
+    
+#else // DDP_ATBOOT_CFG
 
+//
+// DDP at-boot configuration
+//
+#define CUS_ATBOOT_S \
+    writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
+    writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
+    writeVOLControlMasterN(0), \
+    writeVOLOffsetMasterN(0x7fff), \
+    writeSYSRecreationModeDirect, \
+    writeSYSChannelConfigurationRequestSurround4_1, \
+    execPAIOutAnalog, \
+    execPAIInHDMIStereo
+    
+#endif // DDP_ATBOOT_CFG
     //
     //writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \     // Lrs/Rrs
     //writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,6,7,-3,-3,-3,-3,-3,-3,-3,-3), \       // Ltm/Rtm
@@ -107,7 +141,8 @@ All rights reserved.
     //execPAIOutAnalog, \
     //execPAIInDigital    
     //
-#else
+    
+#else // TEST_MULTICHANNEL
 
 #define CUS_ATBOOT_S \
     writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
@@ -118,9 +153,12 @@ All rights reserved.
     writeSYSChannelConfigurationRequestStereo, \
     execPAIOutAnalog, \
     execPAIInHDMIStereo
-#endif
+#endif // TEST_MULTICHANNEL
 
 #else // SIMULATE_SIO
+//
+// Simulating IO
+//
 
 #define CUS_ATBOOT_S \
     writeDECChannelMapTo16  (PAF_LEFT,PAF_RGHT,PAF_LSUR,PAF_RSUR,PAF_CNTR,PAF_SUBW,PAF_LBAK,PAF_RBAK,PAF_LWID,PAF_RWID,PAF_LHED,PAF_RHED,-3,-3,-3,-3), \
index d337750266192103dc2629e05a72625a84abab66..b35401741fb9687329af27800d776242063ab60c 100644 (file)
@@ -45,8 +45,10 @@ All rights reserved.
 #include "pafdec.h"
 #include "aspDecOpCircBuf_master.h"
 
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+
 #define DEF_SOURCE_SEL          ( PAF_SOURCE_PCM ) // default source select
-#define DEF_DEC_OP_FRAME_LEN    (PAF_SYS_FRAMELENGTH )   // ( 256 )     // default decoder output frame length
+#define DEF_DEC_OP_FRAME_LEN    ( PAF_SYS_FRAMELENGTH )   // ( 256 )     // default decoder output frame length
 #define DEF_STR_FRAME_LEN       ( 256 )     // default stream frame length
 
 // Generate mute AF on circular buffer read
index 1657319395ff6f85479b7e4417bcd484b6c35125..01f73fc2c8a299a2d25cb825109e8fe44032790e 100644 (file)
@@ -244,7 +244,14 @@ All rights reserved.
 #include "audioStreamInpProc.h"
 
 
-//#define PROFILER
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+#ifdef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+//
+// Performing PCM high-sampling rate + SRC + CAR benchmarking
+//
+
+#define PROFILER
+#endif
 
 #ifdef PROFILER
 extern UInt32 start_profiling;
index 32fea41b888f6c3eba45689463c7365f5ffda4c6..4897c44f105984ca2597b4ea1ceccf6180e2f86f 100644 (file)
@@ -55,6 +55,8 @@ All rights reserved.
 #include "audioStreamInpProc.h"
 #include "audioStreamOutProc.h"
 
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+
 //
 // Framework Declarations
 //
@@ -853,7 +855,7 @@ const PAF_ASIT_Params asip_params_PAi =
     &PAF_ASP_params_decSioMap,                              // pDecSioMap
     PAF_AST_streamsFromDecodes_std,                         // streamsFromDecodes
     PAF_AST_streamsFromEncodes_std,                         // streamsFromEncodes
-    256, //1024,// 256,                                                    // maxFramelength
+    PAF_MAX_SYS_FRAMELENGTH,                                // maxFramelength
     PAF_AST_streamOrder,                                    // streamOrder
     inpLinkInit,                                            // i_inpLinkInit
     outLinkInit,                                            // i_outLinkInit
@@ -917,7 +919,7 @@ const PAF_ASOT_Params asop_params_PAi =
     &PAF_ASP_params_decSioMap,                              // pDecSioMap
     PAF_AST_streamsFromDecodes_std,                         // streamsFromDecodes
     PAF_AST_streamsFromEncodes_std,                         // streamsFromEncodes
-    256, //1024, //256,                                                    // maxFramelength
+    PAF_MAX_SYS_FRAMELENGTH,                                // maxFramelength
     PAF_AST_streamOrder,                                    // streamOrder
     inpLinkInit,                                            // i_inpLinkInit
     outLinkInit,                                            // i_outLinkInit
index 2f8d34a8c4de2c10f51b951afe6ba62df15ba632..1065a67879dfff8d17157dcbc70743f78ce9eb3c 100644 (file)
@@ -46,6 +46,37 @@ All rights reserved.
 #include "audioStreamInpProc.h"
 #include "audioStreamOutProc.h"
 
+#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
+
+#ifndef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+//
+// NOT performing PCM high-sampling rate + SRC + CAR benchmarking
+//
+
+//#define _AE0_
+//#define _SRC4_
+#define _CAR_
+#define _OAR_
+//#define _DAP_
+#define _BMDA_
+//#define _ML0_
+
+#else // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+//
+// Performing PCM high-sampling rate + SRC + CAR benchmarking
+//
+
+//#define _AE0_
+#define _SRC4_
+#define _CAR_
+//#define _OAR_
+//#define _DAP_
+//#define _BMDA_
+//#define _ML0_
+
+#endif // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
+
+
 //
 // Decoder Definitions
 //
@@ -60,13 +91,11 @@ All rights reserved.
 
 #include <aspstd.h>
 
-//#define _AE0_
 #ifdef _AE0_
 #include <ae.h>
 #include <ae_mds.h>
 #endif
 
-//#define _SRC4_
 #ifdef _SRC4_
 #include <src.h>
 #include <src_tih.h>
@@ -74,31 +103,26 @@ All rights reserved.
 #define SUC_TIH_ISUC SRC_TIH_ISRC
 #endif
 
-#define _CAR_
 #ifdef _CAR_
 #include <car.h>
 #include <car_tig.h>
 #endif
 
-#define _OAR_
 #ifdef _OAR_
 #include <oar.h>
 #include <oar_tig.h>
 #endif
 
-//#define _DAP_
 #ifdef _DAP_
 #include <dap.h>
 #include <dap_tig.h>
 #endif
 
-#define _BMDA_
 #ifdef _BMDA_
 #include <bmda.h>
 #include <bmda_tig.h>
 #endif
 
-//#define _ML0_
 #ifdef _ML0_
 #include <ml.h>
 #include <ml_mds.h>
@@ -148,6 +172,10 @@ const PAF_ASP_LinkInit aspLinkInitStdI13[] =
     PAF_ASP_LINKINIT(CUS,AE,MDS), 
 #endif
 
+#ifdef _ML0_
+    PAF_ASP_LINKINIT(STD, ML, MDS), 
+#endif
+
 #ifdef _SRC4_
 //    PAF_ASP_LINKINIT(STD, SRC, MDS),
     PAF_ASP_LINKINITPARAMS(STD, SRC, TIH, &ISRC_PARAMS_DS_8CH_HBW),