From bb73a513b85c568610050821eff28b82a81d6e86 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 31 Jan 2020 19:32:44 -0800 Subject: [PATCH] Automated rollback of commit 9cfa34fafa944f0d0392f4e5f237209f9e7cdfb6 PiperOrigin-RevId: 292658591 Change-Id: I6d5ff7925a63ee6874062d599c1d7997105d92e4 --- .../lite/kernels/internal/optimized/sse_check.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tensorflow/lite/kernels/internal/optimized/sse_check.h b/tensorflow/lite/kernels/internal/optimized/sse_check.h index 9804afaa571..7eb3677f271 100644 --- a/tensorflow/lite/kernels/internal/optimized/sse_check.h +++ b/tensorflow/lite/kernels/internal/optimized/sse_check.h @@ -15,14 +15,20 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_SSE_CHECK_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_SSE_CHECK_H_ -#if defined(__SSSE3__) -// SSSE 3 available: Use the SSE code. +#if defined(__SSE4_1__) +// SSE 4.1 available: Use the SSE code. #define SSE_OR_PORTABLE(funcname, ...) Sse##funcname(__VA_ARGS__) #else -// No SSSE 3 available: Use Portable code -#define SSE_OR_PORTABLE(...) Portable##funcname(__VA_ARGS__) +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" + +// No SSE 4.1 available: Fall back to NEON_OR_PORTABLE, potentially used with +// NEON_2_SSE translator library. As the library requires SSSE3, the fallback is +// generally using Portable code, only a narrow subset of processors supporting +// SSSE3 but no SSE4.1 is affected - but that includes the android_x86 ABI (not +// android_x86_64). +#define SSE_OR_PORTABLE(...) NEON_OR_PORTABLE(__VA_ARGS__) #endif #endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_SSE_CHECK_H_