Removed alignment check on fft/ifft since PRS symbol can be unaligned

williamyang98 · Jan 19, 2024 · 3cdd3b1 · 3cdd3b1
1 parent e5237d6
commit 3cdd3b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/src/ofdm/ofdm_demodulator.cpp b/src/ofdm/ofdm_demodulator.cpp
@@ -877,28 +877,12 @@ void OFDM_Demod::CalculateViterbiBits(tcb::span<const std::complex<float>> vec_b
 
 void OFDM_Demod::CalculateFFT(tcb::span<const std::complex<float>> fft_in, tcb::span<std::complex<float>> fft_out) {
     PROFILE_BEGIN_FUNC();
-    // Guarantee alignment for FFTW3 SIMD
-    // For all DAB transmission modes we have a power of 2 FFT so this should ideally be true 
-    assert((uintptr_t)fft_in.data() % ALIGN_AMOUNT == 0);
-    assert((uintptr_t)fft_out.data() % ALIGN_AMOUNT == 0);
-
-    fftwf_execute_dft(
-        fft_plan,
-        (fftwf_complex*)fft_in.data(),
-        (fftwf_complex*)fft_out.data());
+    fftwf_execute_dft(fft_plan, (fftwf_complex*)fft_in.data(), (fftwf_complex*)fft_out.data());
 }
 
 void OFDM_Demod::CalculateIFFT(tcb::span<const std::complex<float>> fft_in, tcb::span<std::complex<float>> fft_out) {
     PROFILE_BEGIN_FUNC();
-    // Guarantee alignment for FFTW3 SIMD
-    // For all DAB transmission modes we have a power of 2 FFT so this should ideally be true 
-    assert((uintptr_t)fft_in.data() % ALIGN_AMOUNT == 0);
-    assert((uintptr_t)fft_out.data() % ALIGN_AMOUNT == 0);
-
-    fftwf_execute_dft(
-        ifft_plan,
-        (fftwf_complex*)fft_in.data(),
-        (fftwf_complex*)fft_out.data());
+    fftwf_execute_dft(ifft_plan, (fftwf_complex*)fft_in.data(), (fftwf_complex*)fft_out.data());
 }
 
 void OFDM_Demod::CalculateRelativePhase(tcb::span<const std::complex<float>> fft_in, tcb::span<std::complex<float>> arg_out) {

diff --git a/src/ofdm/profiler.h b/src/ofdm/profiler.h
@@ -235,7 +235,7 @@ class InstrumentationTimer
 #define PROFILE_ENABLE_TRACE_LOGGING(is_log) (void)0
 #define PROFILE_ENABLE_TRACE_LOGGING_CONTINUOUS(is_continuous) (void)0
 #else
-#define PROFILE_BEGIN_FUNC() auto timer_##__PRETTY_FUNCTION__ = InstrumentationTimer(__PRETTY_FUNCTION__)
+#define PROFILE_BEGIN_FUNC() auto timer_func = InstrumentationTimer(__PRETTY_FUNCTION__)
 #define PROFILE_BEGIN(label) auto timer_##label = InstrumentationTimer(#label)
 #define PROFILE_END(label) timer_##label.Stop()
 #define PROFILE_TAG_THREAD(label) Instrumentor::Get().GetInstrumentorThread().SetLabel(label)