Build time improvement, for MSVC use intrin0.h instead of intrin.h and remove usage of stdio.h in production code

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
This commit is contained in:
Marcus Asteborg 2020-06-05 23:07:46 -07:00 committed by Jean-Marc Valin
parent fe00017a06
commit 09f8f05bce
No known key found for this signature in database
GPG key ID: 5E5DD9A36F9189C8
6 changed files with 23 additions and 14 deletions

View file

@ -49,7 +49,11 @@
This macro should only be used for implementing ec_ilog(), if it is defined. This macro should only be used for implementing ec_ilog(), if it is defined.
All other code should use EC_ILOG() instead.*/ All other code should use EC_ILOG() instead.*/
#if defined(_MSC_VER) && (_MSC_VER >= 1400) #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
# include <intrin0.h> /* Improve compiler throughput. */
#else
# include <intrin.h> # include <intrin.h>
#endif
/*In _DEBUG mode this is not an intrinsic by default.*/ /*In _DEBUG mode this is not an intrinsic by default.*/
# pragma intrinsic(_BitScanReverse) # pragma intrinsic(_BitScanReverse)

View file

@ -39,7 +39,6 @@
#include "opus_defines.h" #include "opus_defines.h"
#include <string.h> #include <string.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
/** Opus wrapper for malloc(). To do your own dynamic allocation, all you need to do is replace this function and opus_free */ /** Opus wrapper for malloc(). To do your own dynamic allocation, all you need to do is replace this function and opus_free */

View file

@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef SIGPROCFIX_API_MACROCOUNT_H #ifndef SIGPROCFIX_API_MACROCOUNT_H
#define SIGPROCFIX_API_MACROCOUNT_H #define SIGPROCFIX_API_MACROCOUNT_H
#include <stdio.h>
#ifdef silk_MACRO_COUNT #ifdef silk_MACRO_COUNT
#include <stdio.h>
#define varDefine opus_int64 ops_count = 0; #define varDefine opus_int64 ops_count = 0;
extern opus_int64 ops_count; extern opus_int64 ops_count;

View file

@ -30,7 +30,10 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#include "debug.h" #include "debug.h"
#if SILK_DEBUG || SILK_TIC_TOC
#include "SigProc_FIX.h" #include "SigProc_FIX.h"
#endif
#if SILK_TIC_TOC #if SILK_TIC_TOC

View file

@ -28,28 +28,29 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef SILK_DEBUG_H #ifndef SILK_DEBUG_H
#define SILK_DEBUG_H #define SILK_DEBUG_H
#include "typedef.h"
#include <stdio.h> /* file writing */
#include <string.h> /* strcpy, strcmp */
#ifdef __cplusplus
extern "C"
{
#endif
unsigned long GetHighResolutionTime(void); /* O time in usec*/
/* Set to 1 to enable DEBUG_STORE_DATA() macros for dumping /* Set to 1 to enable DEBUG_STORE_DATA() macros for dumping
* intermediate signals from the codec. * intermediate signals from the codec.
*/ */
#define SILK_DEBUG 0 #define SILK_DEBUG 0
/* Flag for using timers */ /* Flag for using timers */
#define SILK_TIC_TOC 0 #define SILK_TIC_TOC 0
#if SILK_DEBUG || SILK_TIC_TOC
#include "typedef.h"
#include <string.h> /* strcpy, strcmp */
#include <stdio.h> /* file writing */
#endif
#ifdef __cplusplus
extern "C"
{
#endif
#if SILK_TIC_TOC #if SILK_TIC_TOC
unsigned long GetHighResolutionTime(void); /* O time in usec*/
#if (defined(_WIN32) || defined(_WINCE)) #if (defined(_WIN32) || defined(_WINCE))
#include <windows.h> /* timer */ #include <windows.h> /* timer */
#else /* Linux or Mac*/ #else /* Linux or Mac*/

View file

@ -31,7 +31,9 @@
#define ANALYSIS_C #define ANALYSIS_C
#ifdef MLP_TRAINING
#include <stdio.h> #include <stdio.h>
#endif
#include "mathops.h" #include "mathops.h"
#include "kiss_fft.h" #include "kiss_fft.h"