Merge pull request #127 from softwareradiosystems/merge_patch

Merge patch

CMakeLists.txt

@@ -66,6 +66,7 @@ configure_file(
 ########################################################################
 option(ENABLE_SRSUE    "Build srsUE application"                  ON)
 option(ENABLE_SRSENB   "Build srsENB application"                 ON)
+option(DISABLE_SIMD    "disable simd instructions"                OFF)
 
 option(ENABLE_GUI      "Enable GUI (using srsGUI)"                ON)
 option(ENABLE_BLADERF  "Enable BladeRF"                           ON)
@@ -287,9 +288,16 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
     set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -mfpu=neon -march=native -DIS_ARM -DHAVE_NEON")
     message(STATUS "have ARM")
+    set(HAVE_NEON "True")
+  else(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+    set(HAVE_NEON "False")
   endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
   set(CMAKE_REQUIRED_FLAGS ${CMAKE_C_FLAGS})
 
+ if(NOT HAVE_SSE AND NOT HAVE_NEON AND NOT DISABLE_SIMD)
+  message(FATAL_ERROR "no SIMD instructions found")
+ endif(NOT HAVE_SSE AND NOT HAVE_NEON AND NOT DISABLE_SIMD)
+
   if(NOT WIN32)
       ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
   endif(NOT WIN32)

lib/src/phy/fec/test/viterbi_test.h

@@ -52,7 +52,24 @@ static expected_errors_t expected_errors[] = {
     {-1, -1, -1, true, -1.0, -1}
 };
 
-#else
+#elif HAVE_NEON
+
+static expected_errors_t expected_errors[] = {
+    {1000, 1, 40, true, 0.0, 7282},
+    {1000, 1, 40, true, 2.0, 725},
+    {1000, 1, 40, true, 3.0, 176},
+    {1000, 1, 40, true, 4.5, 24},
+
+    {100, 1, 1000, true, 0.0, 13208},
+    {100, 1, 1000, true, 2.0, 939},
+    {100, 1, 1000, true, 3.0, 110},
+    {100, 1, 1000, true, 4.5, 5},
+
+    {-1, -1, -1, true, -1.0, -1}
+};
+
+
+#else 
 
 static expected_errors_t expected_errors[] = {
     {1000, 1, 40, true, 0.0, 5363},