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

Added VOLK support

Browse Source
master
ismagom 11 years ago
parent cfc9e3e5d8
commit f5f1ee186e
5 changed files with 89 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -51,8 +51,8 @@ SET(DATA_DIR share/${CPACK_PACKAGE_NAME})
IF(NOT CMAKE_BUILD_TYPE) IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release") SET(CMAKE_BUILD_TYPE Release)
MESSAGE(STATUS "Build type not specified: defaulting to release.") MESSAGE(STATUS "Build type not specified: defaulting to Release.")
ENDIF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")

29
cmake/modules/FindVolk.cmake
Unescape Escape View File

@ -0,0 +1,29 @@
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PC_VOLK volk QUIET)
FIND_PATH(
VOLK_INCLUDE_DIRS
NAMES volk.h
HINTS $ENV{VOLK_DIR}/include/volk
${CMAKE_INSTALL_PREFIX}/include/volk
${PC_VOLK_INCLUDE_DIR}
PATHS /usr/local/include/volk
/usr/include/volk
)
FIND_LIBRARY(
VOLK_LIBRARIES
NAMES volk
HINTS $ENV{VOLK_DIR}/lib
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
${PC_VOLK_LIBDIR}
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)

68
examples/mib_track.c
Unescape Escape View File

@ -154,6 +154,18 @@ int base_init(int frame_length) {
if (filesource_init(&fsrc, input_file_name, COMPLEX_FLOAT_BIN)) { if (filesource_init(&fsrc, input_file_name, COMPLEX_FLOAT_BIN)) {
return -1; return -1;
} }
} else {
/* open UHD device */
#ifndef DISABLE_UHD
printf("Opening UHD device...\n");
if (cuhd_open(uhd_args,&uhd)) {
fprintf(stderr, "Error opening uhd\n");
return -1;
}
#else
printf("Error UHD not configured. Select an input file\n");
return -1;
#endif
} }
input_buffer = (cf_t*) malloc(frame_length * sizeof(cf_t)); input_buffer = (cf_t*) malloc(frame_length * sizeof(cf_t));
@ -193,26 +205,18 @@ int base_init(int frame_length) {
return -1; return -1;
} }
/* open UHD device */
#ifndef DISABLE_UHD
printf("Opening UHD device...\n");
if (cuhd_open(uhd_args,&uhd)) {
fprintf(stderr, "Error opening uhd\n");
return -1;
}
#endif
return 0; return 0;
} }
void base_free() { void base_free() {
int i; int i;
#ifndef DISABLE_UHD
cuhd_close(&uhd);
#endif
if (input_file_name) { if (input_file_name) {
filesource_free(&fsrc); filesource_free(&fsrc);
} else {
#ifndef DISABLE_UHD
cuhd_close(&uhd);
#endif
} }
sync_free(&sfind); sync_free(&sfind);
@ -280,6 +284,7 @@ int main(int argc, char **argv) {
int nslot; int nslot;
pbch_mib_t mib; pbch_mib_t mib;
float cfo; float cfo;
int n;
int nof_found_mib = 0; int nof_found_mib = 0;
parse_args(argc,argv); parse_args(argc,argv);
@ -292,11 +297,20 @@ int main(int argc, char **argv) {
sync_pss_det_peakmean(&sfind); sync_pss_det_peakmean(&sfind);
sync_pss_det_peakmean(&strack); sync_pss_det_peakmean(&strack);
#ifndef DISABLE_UHD if (!input_file_name) {
INFO("Setting sampling frequency %.2f MHz\n", (float) SAMP_FREQ/MHZ); #ifndef DISABLE_UHD
cuhd_set_rx_srate(uhd, SAMP_FREQ); INFO("Setting sampling frequency %.2f MHz\n", (float) SAMP_FREQ/MHZ);
cuhd_set_rx_gain(uhd, uhd_gain); cuhd_set_rx_srate(uhd, SAMP_FREQ);
#endif cuhd_set_rx_gain(uhd, uhd_gain);
/* set uhd_freq */
cuhd_set_rx_freq(uhd, (double) uhd_freq);
cuhd_rx_wait_lo_locked(uhd);
DEBUG("Set uhd_freq to %.3f MHz\n", (double) uhd_freq);
DEBUG("Starting receiver...\n",0);
cuhd_start_rx_stream(uhd);
#endif
}
state = FIND; state = FIND;
nslot = 0; nslot = 0;
@ -308,21 +322,8 @@ int main(int argc, char **argv) {
sync_set_threshold(&sfind, find_threshold); sync_set_threshold(&sfind, find_threshold);
sync_force_N_id_2(&sfind, -1); sync_force_N_id_2(&sfind, -1);
#ifndef DISABLE_UHD
/* set uhd_freq */
cuhd_set_rx_freq(uhd, (double) uhd_freq);
cuhd_rx_wait_lo_locked(uhd);
DEBUG("Set uhd_freq to %.3f MHz\n", (double) uhd_freq);
DEBUG("Starting receiver...\n",0);
cuhd_start_rx_stream(uhd);
#endif
while(frame_cnt < nof_frames || nof_frames==-1) { while(frame_cnt < nof_frames || nof_frames==-1) {
INFO(" ----- RECEIVING %d SAMPLES ---- \n", FLEN); INFO(" ----- RECEIVING %d SAMPLES ---- \n", FLEN);
#ifndef DISABLE_UHD
cuhd_recv(uhd, input_buffer, FLEN, 1);
#else
if (input_file_name) { if (input_file_name) {
n = filesource_read(&fsrc, input_buffer, FLEN); n = filesource_read(&fsrc, input_buffer, FLEN);
if (n == -1) { if (n == -1) {
@ -333,11 +334,10 @@ int main(int argc, char **argv) {
filesource_read(&fsrc, input_buffer, FLEN); filesource_read(&fsrc, input_buffer, FLEN);
} }
} else { } else {
fprintf(stderr, "UHD is DISABLED but input file name not specified\n"); #ifndef DISABLE_UHD
usage(argv[0]); cuhd_recv(uhd, input_buffer, FLEN, 1);
exit(-1); #endif
} }
#endif
switch(state) { switch(state) {
case FIND: case FIND:

18
lte/lib/CMakeLists.txt
Unescape Escape View File

@ -25,8 +25,15 @@
######################################################################## ########################################################################
FIND_PACKAGE(FFTW3F REQUIRED) # TODO: distribute kissfft instead FIND_PACKAGE(FFTW3F REQUIRED) # TODO: distribute kissfft instead
include_directories(${FFTW3F_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
IF(${DISABLE_VOLK})
IF(${DISABLE_VOLK} EQUAL 0)
FIND_PACKAGE(Volk)
ENDIF(${DISABLE_VOLK} EQUAL 0)
ELSE(${DISABLE_VOLK})
FIND_PACKAGE(Volk)
ENDIF(${DISABLE_VOLK})
######################################################################## ########################################################################
# Recurse subdirectories and compile all source files into the same lib # Recurse subdirectories and compile all source files into the same lib
@ -46,6 +53,15 @@ TARGET_LINK_LIBRARIES(lte m ${FFTW3F_LIBRARIES})
INSTALL(TARGETS lte DESTINATION ${LIBRARY_DIR}) INSTALL(TARGETS lte DESTINATION ${LIBRARY_DIR})
LIBLTE_SET_PIC(lte) LIBLTE_SET_PIC(lte)
IF(VOLK_FOUND)
INCLUDE_DIRECTORIES(${VOLK_INCLUDE_DIRS})
SET_TARGET_PROPERTIES(lte PROPERTIES COMPILE_DEFINITIONS "HAVE_VOLK")
TARGET_LINK_LIBRARIES(lte ${VOLK_LIBRARIES})
MESSAGE(STATUS " Compiling with VOLK SIMD library.")
ELSE(VOLK_FOUND)
MESSAGE(STATUS " VOLK SIMD library NOT found. Using generic implementation.")
ENDIF(VOLK_FOUND)

16
lte/lib/utils/src/vector.c
Unescape Escape View File

@ -31,8 +31,6 @@
#include <complex.h> #include <complex.h>
#include <stdlib.h> #include <stdlib.h>
//#define HAVE_VOLK
#ifdef HAVE_VOLK #ifdef HAVE_VOLK
#include "volk/volk.h" #include "volk/volk.h"
#endif #endif
@ -56,7 +54,7 @@ float vec_acc_ff(float *x, int len) {
return z; return z;
#else #else
float result; float result;
volk_32f_accumulator_s32f_a(&result,x,(unsigned int) len); volk_32f_accumulator_s32f_u(&result,x,(unsigned int) len);
return result; return result;
#endif #endif
} }
@ -94,7 +92,7 @@ void vec_sc_prod_cfc(cf_t *x, float h, cf_t *z, int len) {
cf_t hh; cf_t hh;
__real__ hh = h; __real__ hh = h;
__imag__ hh = 0; __imag__ hh = 0;
volk_32fc_s32fc_multiply_32fc_a(z,x,hh,(unsigned int) len); volk_32fc_s32fc_multiply_32fc_u(z,x,hh,(unsigned int) len);
#endif #endif
} }
@ -105,7 +103,7 @@ void vec_sc_prod_ccc(cf_t *x, cf_t h, cf_t *z, int len) {
z[i] = x[i]*h; z[i] = x[i]*h;
} }
#else #else
volk_32fc_s32fc_multiply_32fc_a(z,x,h,(unsigned int) len); volk_32fc_s32fc_multiply_32fc_u(z,x,h,(unsigned int) len);
#endif #endif
} }
@ -170,7 +168,7 @@ void vec_conj_cc(cf_t *x, cf_t *y, int len) {
y[i] = conjf(x[i]); y[i] = conjf(x[i]);
} }
#else #else
volk_32fc_conjugate_32fc_a(y,x,(unsigned int) len); volk_32fc_conjugate_32fc_u(y,x,(unsigned int) len);
#endif #endif
} }
@ -181,7 +179,7 @@ void vec_prod_ccc(cf_t *x,cf_t *y, cf_t *z, int len) {
z[i] = x[i]*y[i]; z[i] = x[i]*y[i];
} }
#else #else
volk_32fc_x2_multiply_32fc_a(z,x,y,(unsigned int) len); volk_32fc_x2_multiply_32fc_u(z,x,y,(unsigned int) len);
#endif #endif
} }
@ -220,7 +218,7 @@ void vec_abs_cf(cf_t *x, float *abs, int len) {
abs[i] = cabsf(x[i]); abs[i] = cabsf(x[i]);
} }
#else #else
volk_32fc_magnitude_32f_a(abs,x,(unsigned int) len); volk_32fc_magnitude_32f_u(abs,x,(unsigned int) len);
#endif #endif
@ -240,7 +238,7 @@ int vec_max_fi(float *x, int len) {
return p; return p;
#else #else
unsigned int target=0; unsigned int target=0;
volk_32f_index_max_16u_a(&target,x,(unsigned int) len); volk_32f_index_max_16u_u(&target,x,(unsigned int) len);
return (int) target; return (int) target;
#endif #endif
} }

Write Preview
Loading…
Cancel
Save