Merge pull request #66 from falseywinchnet/revert-65-ubkvb7-main/add-new-atan_vectoring_network_experiment

Revert "Add vectorized vec5 cubic and tree32 phase approximations + benchmark updates"

Author: falseywinchnet

examples/atan2_benchmark.cpp

@@ -18,7 +18,6 @@ struct sample {
     double x;
     double y;
     double mag;
-    double phase;
 };
 
 double normalize_phase(double phase) {
@@ -47,7 +46,6 @@ std::vector<sample> make_samples(std::size_t count) {
         value.x = radius * std::cos(angle);
         value.y = radius * std::sin(angle);
         value.mag = radius;
-        value.phase = normalize_phase(angle);
     }
     return samples;
 }
@@ -64,29 +62,6 @@ double time_loop(const std::vector<sample>& samples, Func func, double& sink) {
     return std::chrono::duration<double>(stop - start).count();
 }
 
-#if BRUUN_LEVEL >= 1
-double time_vec5_pair_loop(const std::vector<sample>& samples, double& sink) {
-    const auto start = std::chrono::steady_clock::now();
-    double total = 0.0;
-    std::size_t i = 0;
-    for (; i + 1 < samples.size(); i += 2) {
-        double phase0;
-        double phase1;
-        bruun::bruun_phase_atan2_mag_pair(samples[i].y, samples[i].x, samples[i].mag,
-                                          samples[i + 1].y, samples[i + 1].x, samples[i + 1].mag,
-                                          &phase0, &phase1);
-        total += phase0 + phase1;
-    }
-    for (; i < samples.size(); ++i) {
-        total += bruun::bruun_phase_atan2_core(samples[i].y, samples[i].x, samples[i].mag,
-                                               bruun::bruun_phase_first_octant_vec5_cubic);
-    }
-    const auto stop = std::chrono::steady_clock::now();
-    sink += total;
-    return std::chrono::duration<double>(stop - start).count();
-}
-#endif
-
 } // namespace
 
 int main(int argc, char** argv) {
@@ -111,15 +86,6 @@ int main(int argc, char** argv) {
         return bruun::bruun_phase_atan2_mag(value.y, value.x, value.mag);
     }, sink);
 
-    const double bfft_vec_double_seconds = time_loop(samples, [](const sample& value) {
-        return bruun::bruun_phase_atan2_core(value.y, value.x, value.mag,
-                                             bruun::bruun_phase_first_octant_vec5_cubic);
-    }, sink);
-
-#if BRUUN_LEVEL >= 1
-    const double bfft_vec_pair_double_seconds = time_vec5_pair_loop(samples, sink);
-#endif
-
     const double std_float_seconds = time_loop(samples, [](const sample& value) {
         const float y = static_cast<float>(value.y);
         const float x = static_cast<float>(value.x);
@@ -136,20 +102,7 @@ int main(int argc, char** argv) {
         const float y = static_cast<float>(value.y);
         const float x = static_cast<float>(value.x);
         const float mag = static_cast<float>(value.mag);
-        const double phase = bruun::bruun_phase_atan2_core(y, x, mag,
-                                                          bruun::bruun_phase_first_octant_vec5_cubic);
-        return static_cast<float>(phase);
-    }, sink);
-
-    const double std_sincos_seconds = time_loop(samples, [](const sample& value) {
-        return std::sin(value.phase) + std::cos(value.phase);
-    }, sink);
-
-    const double bfft_sincos_seconds = time_loop(samples, [](const sample& value) {
-        double s_value;
-        double c_value;
-        bruun::bruun_table256_poly3_sincos(value.phase, &s_value, &c_value);
-        return s_value + c_value;
+        return bruun::bruun_phase_atan2_mag_f32(y, x, mag);
     }, sink);
 
     const double std_sincos_seconds = time_loop(samples, [](const sample& value) {

src/detail/bruun_kernel.hpp

@@ -2758,33 +2758,10 @@ class RFFT {
 #endif
         for (; k < N / 2; ++k) {
             const int m = kin[k];
-            output[k].re = work[2*m];
-            output[k].im = -work[2*m + 1];
-        }
-
-        int k = 1;
-#if BRUUN_LEVEL >= 1
-        for (; k + 1 < N / 2; k += 2) {
-            const double re0 = output[k].re;
-            const double im0 = output[k].im;
-            const double re1 = output[k + 1].re;
-            const double im1 = output[k + 1].im;
-            const double mag0 = std::sqrt(re0 * re0 + im0 * im0);
-            const double mag1 = std::sqrt(re1 * re1 + im1 * im1);
-            double phase0;
-            double phase1;
-            bruun_phase_atan2_mag_pair(im0, re0, mag0, im1, re1, mag1, &phase0, &phase1);
-            output[k].re = mag0;
-            output[k].im = phase0;
-            output[k + 1].re = mag1;
-            output[k + 1].im = phase1;
-        }
-#endif
-        for (; k < N / 2; ++k) {
-            const double re = output[k].re;
-            const double im = output[k].im;
+            const double re = work[2*m];
+            const double im = -work[2*m + 1];
             const double mag = std::sqrt(re * re + im * im);
-            double phase = bruun_phase_atan2_core(im, re, mag, bruun_phase_first_octant_vec5_cubic);
+            double phase = bruun_phase_atan2_mag(im, re, mag);
             if (phase < 0.0) {
                 phase += 2.0 * M_PI;
             }