tests: update resource_grid_doubles

Resource grid doubles was still using cf_t instead of cbf16_t. After
introducing the change, some tests had to be updated, too.

Author: dvdgrgrtt

tests/unittests/phy/lower/modulation/ofdm_demodulator_unittest.cpp

@@ -18,7 +18,7 @@
 #include <random>
 
 /// Defines the maximum allowed error at the OFDM demodulator output.
-static constexpr float ASSERT_MAX_ERROR = 1e-6;
+static constexpr float ASSERT_MAX_ERROR = 1.0F / 128.0F;
 
 using namespace srsran;
 

tests/unittests/phy/lower/modulation/ofdm_demodulator_vectortest.cpp

@@ -15,7 +15,7 @@
 #include "srsran/support/test_utils.h"
 
 /// Defines the maximum allowed error at the OFDM demodulator output.
-static constexpr float ASSERT_MAX_ERROR = 1e-4;
+static constexpr float ASSERT_MAX_ERROR = 5e-3;
 
 using namespace srsran;
 

tests/unittests/phy/lower/modulation/ofdm_modulator_test_data.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-// This file was generated using the following MATLAB class on 14-09-2023 (seed 0):
+// This file was generated using the following MATLAB class on 27-06-2024 (seed 0):
 //   + "srsOFDMModulatorUnittest.m"
 
 #include "srsran/phy/lower/modulation/ofdm_modulator.h"

tests/unittests/phy/lower/modulation/ofdm_modulator_test_data.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd54d4698778a45481639f3f3ab154f227c1d18d021a75f70ce8792d28540555
-size 5836917
+oid sha256:ea539026b2258f3f4f9eea4338435bed20e64a4a3eed866a3ad1533d1966f8b5
+size 5836965

tests/unittests/phy/lower/modulation/ofdm_modulator_vectortest.cpp

@@ -15,7 +15,7 @@
 #include "srsran/support/test_utils.h"
 
 /// Defines the maximum allowed error at the OFDM modulator output.
-static constexpr float ASSERT_MAX_ERROR = 2e-5;
+static constexpr float ASSERT_MAX_ERROR = 5e-5;
 
 using namespace srsran;
 
@@ -72,7 +72,7 @@ int main()
       float error =
           std::abs(output[i] - modulated[i]) / std::sqrt(static_cast<float>(test_case.test_config.config.dft_size));
       TESTASSERT(error < ASSERT_MAX_ERROR,
-                 "Sample index {} error {} exceeds maximum allowed ({}). Expedted symbol {} but got {}.",
+                 "Sample index {} error {} exceeds maximum allowed ({}). Expected symbol {} but got {}.",
                  i,
                  error,
                  ASSERT_MAX_ERROR,

tests/unittests/phy/support/resource_grid_test_doubles.h

@@ -23,6 +23,7 @@
 #include "srsran/support/file_vector.h"
 #include "srsran/support/srsran_assert.h"
 #include "srsran/support/srsran_test.h"
+#include <complex>
 #include <map>
 #include <mutex>
 #include <random>
@@ -139,7 +140,7 @@ class resource_grid_writer_spy : public resource_grid_writer
                  entry.symbol,
                  entry.subcarrier);
 
-      cf_t  value = entries.at(key);
+      cf_t  value = to_cf(entries.at(key));
       float err   = std::abs(entry.value - value);
       TESTASSERT(err < ASSERT_MAX_ERROR, "Mismatched value {} but expected {}", value, entry.value);
     }
@@ -148,7 +149,7 @@ class resource_grid_writer_spy : public resource_grid_writer
   /// \brief Asserts that the mapped resource elements match with a list of expected entries.
   ///
   /// This method asserts that mapped resource elements using the put() methods match a list of expected entries
-  /// without considering any writing order, while using a parametrizable maximkum error threshold.
+  /// without considering any writing order, while using a parametrizable maximum error threshold.
   ///
   /// \param[in] expected_entries Provides a list of golden symbols to assert.
   /// \param[in] max_error Provides the maximum allowable error when comparing the data in the entries.
@@ -167,7 +168,7 @@ class resource_grid_writer_spy : public resource_grid_writer
                  entry.symbol,
                  entry.subcarrier);
 
-      cf_t  value = entries.at(key);
+      cf_t  value = to_cf(entries.at(key));
       float err   = std::abs(entry.value - value);
       TESTASSERT(err < max_error, "Mismatched value {} but expected {}", value, entry.value);
     }
@@ -191,7 +192,7 @@ class resource_grid_writer_spy : public resource_grid_writer
   static constexpr float ASSERT_MAX_ERROR = 1e-6;
 
   /// Stores the resource grid written entries.
-  std::map<entry_key_t, cf_t> entries;
+  std::map<entry_key_t, cbf16_t> entries;
 
   /// Protects concurrent write to entries.
   std::mutex entries_mutex;
@@ -244,7 +245,7 @@ class resource_grid_writer_spy : public resource_grid_writer
                  entries.size() + 1);
 
     // Write element.
-    entries.emplace(key, value);
+    entries.emplace(key, to_cbf16(value));
   }
 };
 
@@ -277,7 +278,7 @@ class resource_grid_reader_spy : public resource_grid_reader
   {
     ++count;
     mask.for_each(0, mask.size(), [&](unsigned i_subc) {
-      symbols.front() = get(static_cast<uint8_t>(port), l, k_init + i_subc);
+      symbols.front() = to_cf(get(static_cast<uint8_t>(port), l, k_init + i_subc));
       symbols         = symbols.last(symbols.size() - 1);
     });
 
@@ -306,7 +307,7 @@ class resource_grid_reader_spy : public resource_grid_reader
     ++count;
     cf_t* symbol_ptr = symbols.data();
     for (unsigned k = k_init, k_end = k_init + stride * symbols.size(); k != k_end; k += stride) {
-      *(symbol_ptr++) = get(port, l, k);
+      *(symbol_ptr++) = to_cf(get(port, l, k));
     }
   }
 
@@ -315,7 +316,7 @@ class resource_grid_reader_spy : public resource_grid_reader
     ++count;
     cbf16_t* symbol_ptr = symbols.data();
     for (unsigned k = k_init, k_end = k_init + symbols.size(); k != k_end; ++k) {
-      *(symbol_ptr++) = to_cbf16(get(port, l, k));
+      *(symbol_ptr++) = get(port, l, k);
     }
   }
 
@@ -328,7 +329,7 @@ class resource_grid_reader_spy : public resource_grid_reader
     std::fill(temp_view.begin(), temp_view.end(), to_cbf16(nan));
 
     // Write the available entries.
-    for (auto& e : entries) {
+    for (const auto& e : entries) {
       if ((std::get<0>(e.first) == port) && (std::get<1>(e.first) == l)) {
         temp_view[std::get<2>(e.first)] = e.second;
       }
@@ -370,12 +371,12 @@ class resource_grid_reader_spy : public resource_grid_reader
   using entry_key_t = std::tuple<uint8_t, uint8_t, uint16_t>;
 
   /// Stores the resource grid written entries.
-  std::map<entry_key_t, cf_t> entries;
+  std::map<entry_key_t, cbf16_t> entries;
 
   /// Temporal storage of the method get_view(). It is overwritten every time get_view() is called.
   mutable std::vector<cbf16_t> temp_view;
 
-  cf_t get(uint8_t port, uint8_t symbol, uint16_t subcarrier) const
+  cbf16_t get(uint8_t port, uint8_t symbol, uint16_t subcarrier) const
   {
     // Generate key.
     entry_key_t key{port, symbol, subcarrier};

tests/unittests/phy/upper/channel_processors/pbch_modulator_test.cpp

@@ -40,8 +40,10 @@ int main()
     // Load output golden data
     const std::vector<resource_grid_writer_spy::expected_entry_t> testvector_symbols = test_case.symbols.read();
 
+    // Tolerance: max BF16 error times sqrt(2), since we are taking the modulus.
+    constexpr float tolerance = M_SQRT2f32 / 256.0;
     // Assert resource grid entries.
-    grid.assert_entries(testvector_symbols);
+    grid.assert_entries(testvector_symbols, tolerance);
   }
   return 0;
 }

tests/unittests/phy/upper/channel_processors/pdcch_modulator_test.cpp

@@ -50,8 +50,10 @@ int main()
     // Load output golden data
     const std::vector<resource_grid_writer_spy::expected_entry_t> testvector_symbols = test_case.symbols.read();
 
+    // Tolerance: max BF16 error times sqrt(2), since we are taking the modulus.
+    constexpr float tolerance = M_SQRT2f32 / 256.0;
     // Assert resource grid entries.
-    grid.assert_entries(testvector_symbols);
+    grid.assert_entries(testvector_symbols, tolerance);
   }
 
   return 0;

tests/unittests/phy/upper/channel_processors/pdcch_processor_vectortest.cpp

@@ -100,8 +100,10 @@ TEST_P(PdcchProcessorFixture, FromVector)
   // Load output golden data
   const std::vector<resource_grid_writer_spy::expected_entry_t> expected = test_case.data.read();
 
+  // Tolerance: max BF16 error times sqrt(2), since we are taking the modulus.
+  constexpr float tolerance = M_SQRT2f32 / 256.0;
   // Assert resource grid entries.
-  grid.assert_entries(expected);
+  grid.assert_entries(expected, tolerance);
 }
 
 // Creates test suite that combines all possible parameters.

tests/unittests/phy/upper/channel_processors/pdsch_modulator_test.cpp

@@ -64,9 +64,11 @@ int main()
     // Read resource grid data.
     std::vector<resource_grid_writer_spy::expected_entry_t> rg_entries = test_case.symbols.read();
 
+    // Tolerance: max BF16 error times sqrt(2), since we are taking the modulus.
+    constexpr float tolerance = M_SQRT2f32 / 256.0;
     // Assert resource grid entries.
-    grid.assert_entries(rg_entries);
+    grid.assert_entries(rg_entries, tolerance);
   }
 
   return 0;
-}
+}