5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disabling certain PHY DL tests that aren't working on ARM due to Turbo issues

Browse Source
master
Andre Puschmann 5 years ago
parent 6d4303cd94
commit 9e1b8bc95e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -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") 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_C_FLAGS "${CMAKE_C_FLAGS} -DIS_ARM -DHAVE_NEON")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_ARM") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIS_ARM")
message(STATUS "Detected ARM processor")
set(HAVE_NEON "True")
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(HAVE_NEONv8 "True") set(HAVE_NEONv8 "True")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_NEONv8") 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_C_FLAGS "${CMAKE_C_FLAGS} -mfloat-abi=hard -mfpu=neon")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfloat-abi=hard -mfpu=neon")
endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") 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") else(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(HAVE_NEON "False") set(HAVE_NEON "False")
endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")

9
lib/test/phy/CMakeLists.txt
Unescape Escape View File

@ -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}) 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) 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 # All valid number of PRBs for PUSCH
set(ue_dl_min_mcs 0) set(ue_dl_min_mcs 0)
set(ue_dl_max_mcs 28) set(ue_dl_max_mcs 28)
@ -51,7 +54,13 @@ foreach (cell_n_prb 6 15 25 50 75 100)
endif (${allow_256}) endif (${allow_256})
set(phy_dl_test_args ${phy_dl_test_args} -m ${ue_dl_mcs}) set(phy_dl_test_args ${phy_dl_test_args} -m ${ue_dl_mcs})
string(REGEX REPLACE "\ " "" test_name_args ${phy_dl_test_args}) string(REGEX REPLACE "\ " "" test_name_args ${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}) add_test(phy_dl_test${test_name_args} phy_dl_test ${phy_dl_test_args})
endif()
endforeach (ue_dl_mcs) endforeach (ue_dl_mcs)
endforeach (ue_dl_tm) endforeach (ue_dl_tm)
endforeach (allow_256 0 1) endforeach (allow_256 0 1)

Write Preview
Loading…
Cancel
Save