CMSIS-DSP: Corrected some headers to use right date and versions.

Added a new option to test framework.
pull/19/head
Christophe Favergeon 5 years ago
parent 9133c874e0
commit 0a5a96d904

@ -3,13 +3,12 @@
* Title: arm_common_tables.h * Title: arm_common_tables.h
* Description: Extern declaration for common tables * Description: Extern declaration for common tables
* *
* $Date: 27. January 2017 * @version V1.9.0
* $Revision: V.1.5.1 * @date 17. March 2021
* *
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2017 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -3,13 +3,12 @@
* Title: arm_common_tables_f16.h * Title: arm_common_tables_f16.h
* Description: Extern declaration for common tables * Description: Extern declaration for common tables
* *
* $Date: 27. January 2017 * @version V1.9.0
* $Revision: V.1.5.1 * @date 17. March 2021
* *
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2017 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -4,13 +4,12 @@
* Description: Constant structs that are initialized for user convenience. * Description: Constant structs that are initialized for user convenience.
* For example, some can be given as arguments to the arm_cfft_f32() function. * For example, some can be given as arguments to the arm_cfft_f32() function.
* *
* $Date: 27. January 2017 * @version V1.9.0
* $Revision: V.1.5.1 * @date 17. March 2021
* *
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2017 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -4,13 +4,12 @@
* Description: Constant structs that are initialized for user convenience. * Description: Constant structs that are initialized for user convenience.
* For example, some can be given as arguments to the arm_cfft_f16() function. * For example, some can be given as arguments to the arm_cfft_f16() function.
* *
* $Date: 20. April 2020 * @version V1.9.0
* $Revision: V.1.5.1 * @date 17. March 2021
* *
* Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2020 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -3,13 +3,13 @@
* Title: arm_helium_utils.h * Title: arm_helium_utils.h
* Description: Utility functions for Helium development * Description: Utility functions for Helium development
* *
* $Date: 09. September 2019 * @version V1.9.0
* $Revision: V.1.5.1 * @date 17. March 2021
* *
* Target Processor: Cortex-M cores * Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2019 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -1,11 +1,11 @@
/****************************************************************************** /******************************************************************************
* @file arm_math.h * @file arm_math.h
* @brief Public header file for CMSIS DSP Library * @brief Public header file for CMSIS DSP Library
* @version V1.7.0 * @version V1.9.0
* @date 18. March 2019 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2019 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -1,11 +1,11 @@
/****************************************************************************** /******************************************************************************
* @file arm_math_f16.h * @file arm_math_f16.h
* @brief Public header file for f16 function of the CMSIS DSP Library * @brief Public header file for f16 function of the CMSIS DSP Library
* @version V1.8.1 * @version V1.9.0
* @date 20. April 2020 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2020 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -2,10 +2,10 @@
* @file arm_math_memory.h * @file arm_math_memory.h
* @brief Public header file for CMSIS DSP Library * @brief Public header file for CMSIS DSP Library
* @version V1.9.0 * @version V1.9.0
* @date 20. July 2020 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2020 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -2,10 +2,10 @@
* @file arm_math_types.h * @file arm_math_types.h
* @brief Public header file for CMSIS DSP Library * @brief Public header file for CMSIS DSP Library
* @version V1.9.0 * @version V1.9.0
* @date 20. July 2020 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2020 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -2,10 +2,10 @@
* @file arm_math_types_f16.h * @file arm_math_types_f16.h
* @brief Public header file for f16 function of the CMSIS DSP Library * @brief Public header file for f16 function of the CMSIS DSP Library
* @version V1.9.0 * @version V1.9.0
* @date 20. July 2020 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2020 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -4,12 +4,13 @@
* Description: common tables like fft twiddle factors, Bitreverse, reciprocal etc * Description: common tables like fft twiddle factors, Bitreverse, reciprocal etc
* used for MVE implementation only * used for MVE implementation only
* *
* $Date: 14. April 2020 * @version V1.9.0
* @date 17. March 2021
* *
* Target Processor: Cortex-M cores * Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2020 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -4,12 +4,13 @@
* Description: common tables like fft twiddle factors, Bitreverse, reciprocal etc * Description: common tables like fft twiddle factors, Bitreverse, reciprocal etc
* used for MVE implementation only * used for MVE implementation only
* *
* $Date: 14. April 2020 * @version V1.9.0
* @date 17. March 2021
* *
* Target Processor: Cortex-M cores * Target Processor: Cortex-M cores
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
/* /*
* Copyright (C) 2010-2020 ARM Limited or its affiliates. All rights reserved. * Copyright (C) 2010-2021 ARM Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -1,11 +1,11 @@
/****************************************************************************** /******************************************************************************
* @file arm_vec_math.h * @file arm_vec_math.h
* @brief Public header file for CMSIS DSP Library * @brief Public header file for CMSIS DSP Library
* @version V1.7.0 * @version V1.9.0
* @date 15. October 2019 * @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2019 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -1,9 +1,11 @@
/****************************************************************************** /******************************************************************************
* @file arm_vec_math_f16.h * @file arm_vec_math_f16.h
* @brief Public header file for CMSIS DSP Library * @brief Public header file for CMSIS DSP Library
* @version V1.9.0
* @date 17. March 2021
******************************************************************************/ ******************************************************************************/
/* /*
* Copyright (c) 2010-2020 Arm Limited or its affiliates. All rights reserved. * Copyright (c) 2010-2021 Arm Limited or its affiliates. All rights reserved.
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *

@ -84,6 +84,7 @@ option(EMBEDDED "Embedded Mode" ON)
option(FLOAT16TESTS "Float16 tests" OFF) option(FLOAT16TESTS "Float16 tests" OFF)
option(MICROBENCH "Micro benchmarks" OFF) option(MICROBENCH "Micro benchmarks" OFF)
option(EXTERNAL "External benchmarks or tests" OFF) option(EXTERNAL "External benchmarks or tests" OFF)
option(CACHEANALYSIS "Build with cache analysis mode enabled" OFF)
option(DISTINCT "Different generated folder for benchmarking and tests" OFF) option(DISTINCT "Different generated folder for benchmarking and tests" OFF)
@ -121,6 +122,10 @@ if (AUTOVECTORIZE)
target_compile_definitions(TestingLib PRIVATE ARM_MATH_AUTOVECTORIZE) target_compile_definitions(TestingLib PRIVATE ARM_MATH_AUTOVECTORIZE)
endif() endif()
if (CACHEANALYSIS)
target_compile_definitions(FrameworkLib PRIVATE CACHEANALYSIS)
endif()
if (BENCHMARK) if (BENCHMARK)

@ -11,7 +11,7 @@ void cycleMeasurementStop();
Testing::cycles_t getCycles(); Testing::cycles_t getCycles();
#ifdef EXTBENCH #if defined(EXTBENCH) || defined(CACHEANALYSIS)
extern unsigned long sectionCounter; extern unsigned long sectionCounter;
#if defined ( __CC_ARM ) #if defined ( __CC_ARM )

@ -82,18 +82,7 @@ a C++ function pointer from the cycle measurements.
Client::test t = (Client::test)&Calibrate::empty; Client::test t = (Client::test)&Calibrate::empty;
calibration = 0; calibration = 0;
/*
EXTBENCH is set when benchmarking is done through external traces
instead of using internal counters.
Currently the post-processing scripts are only supporting traces generated from
fast models.
*/
#ifdef EXTBENCH
startSection();
#endif
/* /*
@ -152,6 +141,20 @@ the code not in cache.
While for the code itself we have the value for the code in cache. While for the code itself we have the value for the code in cache.
*/ */
/*
EXTBENCH is set when benchmarking is done through external traces
instead of using internal counters.
Currently the post-processing scripts are only supporting traces generated from
fast models.
*/
#if defined(EXTBENCH) || defined(CACHEANALYSIS)
startSection();
#endif
for(int i=0;i < CALIBNB;i++) for(int i=0;i < CALIBNB;i++)
{ {
cycleMeasurementStart(); cycleMeasurementStart();
@ -165,7 +168,7 @@ While for the code itself we have the value for the code in cache.
calibration += current; calibration += current;
cycleMeasurementStop(); cycleMeasurementStop();
} }
#ifdef EXTBENCH #if defined(EXTBENCH) || defined(CACHEANALYSIS)
stopSection(); stopSection();
#endif #endif
@ -275,6 +278,9 @@ While for the code itself we have the value for the code in cache.
__DSB(); __DSB();
__ISB(); __ISB();
#endif #endif
/* If cache analysis mode, we don't force the code to be in cache. */
#if !defined(CACHEANALYSIS)
if (s->isForcedInCache()) if (s->isForcedInCache())
{ {
if (!m_mgr->HasMemError()) if (!m_mgr->HasMemError())
@ -282,19 +288,22 @@ While for the code itself we have the value for the code in cache.
(s->*t)(); (s->*t)();
} }
} }
#endif
// Run the test // Run the test
cycleMeasurementStart(); cycleMeasurementStart();
#ifdef EXTBENCH
#if defined(EXTBENCH) || defined(CACHEANALYSIS)
startSection(); startSection();
#endif #endif
if (!m_mgr->HasMemError()) if (!m_mgr->HasMemError())
{ {
(s->*t)(); (s->*t)();
} }
#ifdef EXTBENCH
#if defined(EXTBENCH) || defined(CACHEANALYSIS)
stopSection(); stopSection();
#endif #endif
#ifndef EXTBENCH #ifndef EXTBENCH
cycles=getCycles(); cycles=getCycles();
cycles=cycles-calibration; cycles=cycles-calibration;

@ -62,7 +62,7 @@ unsigned int startCycles;
#define ENABLE_DIVIDER 0 #define ENABLE_DIVIDER 0
#endif #endif
#ifdef EXTBENCH #if defined(EXTBENCH) || defined(CACHEANALYSIS)
unsigned long sectionCounter=0; unsigned long sectionCounter=0;
#endif #endif

Loading…
Cancel
Save