Refactor dot_block

Author: adamant-pwn

cp-algo/math/cvector.hpp

@@ -119,18 +119,13 @@ namespace cp_algo::math::fft {
             auto [Bvx, Bvy] = B.vget(k);
             auto [Brvx, Brvy] = vpoint(Bvx, Bvy) * vpoint(real(rt), imag(rt));
             auto [Ax, Ay] = A.vget(k);
-            alignas(32) ftype Bx[2 * flen];
-            alignas(32) ftype By[2 * flen];
-            Bvx.copy_to(Bx + flen, stdx::vector_aligned);
-            Bvy.copy_to(By + flen, stdx::vector_aligned);
-            Brvx.copy_to(Bx, stdx::vector_aligned);
-            Brvy.copy_to(By, stdx::vector_aligned);
+            vftype Bx[2] = {Brvx, Bvx}, By[2] = {Brvy, Bvy};
             vpoint res = {0, 0};
-            for(size_t i = 0; i < flen; i++) {
+            for (size_t i = 0; i < flen; i++) {
                 vftype Bsx, Bsy;
-                Bsx.copy_from(Bx + flen - i, stdx::element_aligned);
-                Bsy.copy_from(By + flen - i, stdx::element_aligned);
-                res += vpoint(Ax[i], Ay[i]) * vpoint(Bsx, Bsy);
+                Bsx.copy_from((ftype*)Bx + flen - i, stdx::element_aligned);
+                Bsy.copy_from((ftype*)By + flen - i, stdx::element_aligned);
+                res += vpoint(Ax[i], Ay[i]) * vpoint{Bsx, Bsy};
             }
             return res;
         }

cp-algo/math/fft.hpp

@@ -50,32 +50,20 @@ namespace cp_algo::math::fft {
                 auto [Dvx, Dvy] = D.vget(k);
                 auto [Crvx, Crvy] = vpoint(Cvx, Cvy) * vpoint(real(rt), imag(rt));
                 auto [Drvx, Drvy] = vpoint(Dvx, Dvy) * vpoint(real(rt), imag(rt));
-                alignas(32) ftype Cx[2 * flen];
-                alignas(32) ftype Cy[2 * flen];
-                alignas(32) ftype Dx[2 * flen];
-                alignas(32) ftype Dy[2 * flen];
-                Cvx.copy_to(Cx + flen, std::experimental::vector_aligned);
-                Cvy.copy_to(Cy + flen, std::experimental::vector_aligned);
-                Dvx.copy_to(Dx + flen, std::experimental::vector_aligned);
-                Dvy.copy_to(Dy + flen, std::experimental::vector_aligned);
-                Crvx.copy_to(Cx, std::experimental::vector_aligned);
-                Crvy.copy_to(Cy, std::experimental::vector_aligned);
-                Drvx.copy_to(Dx, std::experimental::vector_aligned);
-                Drvy.copy_to(Dy, std::experimental::vector_aligned);
+                vftype Cx[2] = {Crvx, Cvx}, Cy[2] = {Crvy, Cvy};
+                vftype Dx[2] = {Drvx, Dvx}, Dy[2] = {Drvy, Dvy};
                 vpoint AC, AD, BC, BD;
                 AC = AD = BC = BD = {0, 0};
                 for(size_t i = 0; i < flen; i++) {
                     vftype Csx, Csy, Dsx, Dsy;
-                    Csx.copy_from(Cx + flen - i, std::experimental::element_aligned);
-                    Csy.copy_from(Cy + flen - i, std::experimental::element_aligned);
-                    Dsx.copy_from(Dx + flen - i, std::experimental::element_aligned);
-                    Dsy.copy_from(Dy + flen - i, std::experimental::element_aligned);
+                    Csx.copy_from((ftype*)Cx + flen - i, stdx::element_aligned);
+                    Csy.copy_from((ftype*)Cy + flen - i, stdx::element_aligned);
+                    Dsx.copy_from((ftype*)Dx + flen - i, stdx::element_aligned);
+                    Dsy.copy_from((ftype*)Dy + flen - i, stdx::element_aligned);
                     vpoint As = {Ax[i], Ay[i]}, Bs = {Bx[i], By[i]};
                     vpoint Cs = {Csx, Csy}, Ds = {Dsx, Dsy};
-                    AC += As * Cs;
-                    AD += As * Ds;
-                    BC += Bs * Cs;
-                    BD += Bs * Ds;
+                    AC += As * Cs; AD += As * Ds;
+                    BC += Bs * Cs; BD += Bs * Ds;
                 }
                 A.set(k, AC);
                 C.set(k, AD + BC);