Move noise_device to openair1/SIMULATION/TOOLS

radio/emulator/CMakeLists.txt

@@ -2,4 +2,4 @@
 
 add_library(rf_emulator MODULE rf_emulator.c)
 set_target_properties(rf_emulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-target_link_libraries(rf_emulator PRIVATE noise_device log_headers)
+target_link_libraries(rf_emulator PRIVATE noise_device log_headers noise_device)

radio/emulator/rf_emulator.c

@@ -13,7 +13,7 @@
 #include <common/utils/LOG/log.h>
 #include "common/utils/threadPool/pthread_utils.h"
 #include "common_lib.h"
-#include "radio/vrtsim/noise_device.h"
+#include "noise_device.h"
 #include "simde/x86/avx512.h"
 #include "SIMULATION/TOOLS/sim.h"
 

radio/vrtsim/CMakeLists.txt

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LicenseRef-CSSL-1.0
 
-# Noise device static lib
-add_library(noise_device STATIC noise_device.c)
-target_link_libraries(noise_device PRIVATE log_headers)
-
 # vrtsim module
 add_library(vrtsim MODULE
   vrtsim.c

radio/vrtsim/noise_device.c

@@ -1,75 +0,0 @@
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-#include "assertions.h"
-#include <pthread.h>
-#include <errno.h>
-#include "noise_device.h"
-
-// Use block size equal to cache size
-#define BLOCK_SIZE (64 / sizeof(float)) // 4 bytes per float
-// Use a power of 2 for block size length
-#define NUM_BLOCKS (8192)
-#define NOISE_VECTOR_LENGTH (BLOCK_SIZE * NUM_BLOCKS)
-
-static struct {
-  pthread_t noise_device_thread;
-  float noise[NOISE_VECTOR_LENGTH] __attribute__((aligned(64)));
-  float noise_power;
-  bool running;
-} state;
-
-static uint32_t jz, jsr = 123456789;
-static uint32_t random_uint(void)
-{
-  return SHR3;
-}
-
-static void generate_one_block_noise(int write_block_index, float noise_power)
-{
-  // Generate noise vector
-  float block[BLOCK_SIZE];
-  for (int i = 0; i < BLOCK_SIZE; i++) {
-    block[i] = noise_power * gaussZiggurat(0, 1);
-  }
-  // Write block to noise vector
-  memcpy(state.noise + write_block_index * BLOCK_SIZE, block, sizeof(block));
-}
-
-void *noise_device_thread_function(void *arg)
-{
-  while (state.running) {
-    // Generate noise vector
-    generate_one_block_noise(random_uint() % NUM_BLOCKS, state.noise_power);
-    usleep(10000);
-  }
-  return NULL;
-}
-
-void init_noise_device(float noise_power)
-{
-  for (int i = 0; i < NUM_BLOCKS; i++) {
-    generate_one_block_noise(i, noise_power);
-  }
-  int ret = pthread_create(&state.noise_device_thread, NULL, noise_device_thread_function, NULL);
-  AssertFatal(ret == 0, "pthread_create failed: %d, errno %d (%s)\n", ret, errno, strerror(errno));
-}
-
-void free_noise_device(void)
-{
-  state.running = false;
-  int ret = pthread_join(state.noise_device_thread, NULL);
-  AssertFatal(ret == 0, "pthread_join failed: %d, errno %d (%s)\n", ret, errno, strerror(errno));
-}
-
-void get_noise_vector(float *noise_vector, int length)
-{
-  int start_block = random_uint() % NUM_BLOCKS;
-  while (length > 0) {
-    int copy_size = min(length, (NUM_BLOCKS - start_block) * BLOCK_SIZE);
-    memcpy(noise_vector, &state.noise[start_block * BLOCK_SIZE], copy_size * sizeof(float));
-    start_block = 0;
-    length -= copy_size;
-    noise_vector += copy_size;
-  }
-}

radio/vrtsim/noise_device.h

@@ -1,14 +0,0 @@
-/*
- * SPDX-License-Identifier: LicenseRef-CSSL-1.0
- */
-
-#ifndef NOISE_DEVICE_H
-#define NOISE_DEVICE_H
-
-#include "SIMULATION/TOOLS/sim.h"
-
-void init_noise_device(float noise_power);
-void free_noise_device(void);
-void get_noise_vector(float *noise_vector, int length);
-
-#endif