From 9e1b8bc95ecedde1dee8d7fc8bd866fa53ae402a Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Fri, 20 Dec 2019 14:13:28 +0100
Subject: [PATCH] disabling certain PHY DL tests that aren't working on ARM due
 to Turbo issues

---
 CMakeLists.txt              |  4 ++--
 lib/test/phy/CMakeLists.txt | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0521d6df7..c2d075544 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -397,6 +397,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIS_ARM -DHAVE_NEON")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_ARM")
+    message(STATUS "Detected ARM processor")
+    set(HAVE_NEON "True")
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
       set(HAVE_NEONv8 "True")
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_NEONv8")
@@ -406,8 +408,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfloat-abi=hard -mfpu=neon")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
     endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
-    message(STATUS "Detected ARM processor")
-    set(HAVE_NEON "True")
   else(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     set(HAVE_NEON "False")
   endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
diff --git a/lib/test/phy/CMakeLists.txt b/lib/test/phy/CMakeLists.txt
index 96396ec46..f91732bed 100644
--- a/lib/test/phy/CMakeLists.txt
+++ b/lib/test/phy/CMakeLists.txt
@@ -25,6 +25,9 @@ add_executable(phy_dl_test phy_dl_test.c)
 target_link_libraries(phy_dl_test srslte_phy srslte_common srslte_phy ${SEC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 add_test(phy_dl_test phy_dl_test)
 
+# Blacklist of tests for ARM
+set(arm_black_list -p6-t2-q-m27 -p6-t3-q-m27 -p6-t4-q-m27 -p25-t3-m28 -p25-t4-m28 -p25-t2-q-m27 -p25-t3-q-m27p25-t4-q-m27)
+
 # All valid number of PRBs for PUSCH
 set(ue_dl_min_mcs 0)
 set(ue_dl_max_mcs 28)
@@ -51,7 +54,13 @@ foreach (cell_n_prb 6 15 25 50 75 100)
                 endif (${allow_256})
                 set(phy_dl_test_args ${phy_dl_test_args} -m ${ue_dl_mcs})
                 string(REGEX REPLACE "\ " "" test_name_args ${phy_dl_test_args})
-                add_test(phy_dl_test${test_name_args} phy_dl_test ${phy_dl_test_args})
+
+                list (FIND arm_black_list "${test_name_args}" _index)
+                if (${_index} GREATER -1 AND ${HAVE_NEON} MATCHES "True" )
+                    message(STATUS "Skipping phy_dl_test${test_name_args} on ARM")
+                else()
+                    add_test(phy_dl_test${test_name_args} phy_dl_test ${phy_dl_test_args})
+                endif()
             endforeach (ue_dl_mcs)
         endforeach (ue_dl_tm)
     endforeach (allow_256 0 1)