diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-11-16 07:44:18 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-11-16 07:44:18 +0300 |
| commit | b1a9d3371c298947991ce0eb99c88b575939df6d (patch) | |
| tree | fdc7b907981c344cd332d5074e54a6d461b9e3fb | |
| parent | 6c5916482c20d726780db837ae5ef9bdf6e462e0 (diff) | |
Addressing Tim's commentsexp_dnn_rtcd5
| -rw-r--r-- | dnn/fargan.c | 1 | ||||
| -rw-r--r-- | dnn/nnet.h | 2 | ||||
| -rw-r--r-- | dnn/pitchdnn.c | 1 | ||||
| -rw-r--r-- | dnn/x86/nnet_avx2.c | 3 | ||||
| -rw-r--r-- | dnn/x86/nnet_sse2.c | 3 | ||||
| -rw-r--r-- | dnn/x86/nnet_sse4_1.c | 3 |
6 files changed, 10 insertions, 3 deletions
diff --git a/dnn/fargan.c b/dnn/fargan.c index dba0900e..5e01ebd0 100644 --- a/dnn/fargan.c +++ b/dnn/fargan.c @@ -182,7 +182,6 @@ void fargan_init(FARGANState *st) ret = 0; #endif celt_assert(ret == 0); - /* FIXME: perform arch detection. */ } int fargan_load_model(FARGANState *st, const unsigned char *data, int len) { @@ -205,7 +205,7 @@ void compute_activation_c(float *output, const float *input, int N, int activati #endif -#if !defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2) +#if defined(__x86_64__) && !defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_MAY_HAVE_AVX2) #if defined(_MSC_VER) #pragma message ("Only SSE and SSE2 are available. On newer machines, enable SSSE3/AVX/AVX2 to get better performance") #else diff --git a/dnn/pitchdnn.c b/dnn/pitchdnn.c index 67eeb8cc..ae95ca32 100644 --- a/dnn/pitchdnn.c +++ b/dnn/pitchdnn.c @@ -66,7 +66,6 @@ void pitchdnn_init(PitchDNNState *st) ret = 0; #endif celt_assert(ret == 0); - /* FIXME: perform arch detection. */ } int pitchdnn_load_model(PitchDNNState *st, const unsigned char *data, int len) { diff --git a/dnn/x86/nnet_avx2.c b/dnn/x86/nnet_avx2.c index a5d6c17f..f463b324 100644 --- a/dnn/x86/nnet_avx2.c +++ b/dnn/x86/nnet_avx2.c @@ -29,6 +29,9 @@ #include "config.h" #endif +#ifndef __AVX2__ +#error nnet_avx2.c is being compiled without AVX2 enabled +#endif #define RTCD_ARCH avx2 diff --git a/dnn/x86/nnet_sse2.c b/dnn/x86/nnet_sse2.c index 42abb7a8..bcee5ccc 100644 --- a/dnn/x86/nnet_sse2.c +++ b/dnn/x86/nnet_sse2.c @@ -29,6 +29,9 @@ #include "config.h" #endif +#ifndef __SSE2__ +#error nnet_sse2.c is being compiled without SSE2 enabled +#endif #define RTCD_ARCH sse2 diff --git a/dnn/x86/nnet_sse4_1.c b/dnn/x86/nnet_sse4_1.c index 43c0e25c..4b530b65 100644 --- a/dnn/x86/nnet_sse4_1.c +++ b/dnn/x86/nnet_sse4_1.c @@ -29,6 +29,9 @@ #include "config.h" #endif +#ifndef __SSE4_1__ +#error nnet_sse4_1.c is being compiled without SSE4.1 enabled +#endif #define RTCD_ARCH sse4_1 |