add single precision, add aa-vec-sl-soa kernel, updated doc
[LbmBenchmarkKernelsPublic.git] / src / BenchKernelD3Q19Aa.c
index 87a9e33f3cf3011aa5da6fabc3a32c4a181ac453..a6f73fc99715422d8ca40900c417cc9b3fa2fece 100644 (file)
@@ -43,8 +43,8 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
        Assert(kernelData != NULL);
        Assert(cd != NULL);
 
-       Assert(cd->Omega > 0.0);
-       Assert(cd->Omega < 2.0);
+       Assert(cd->Omega > F(0.0));
+       Assert(cd->Omega < F(2.0));
 
        KernelData * kd = (KernelData *)kernelData;
 
@@ -68,24 +68,24 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
 
        PdfT omega = cd->Omega;
        PdfT omegaEven = omega;
-       PdfT magicParam = 1.0 / 12.0;
+       PdfT magicParam = F(1.0) / F(12.0);
        //  1/4: best stability;
        // 1/12: removes third-order advection error (best advection);
        //  1/6: removes fourth-order diffusion error (best diffusion);
        // 3/16: exact location of bounce back for poiseuille flow
 
-       PdfT omegaOdd = 1.0/( 0.5 + magicParam/(1.0/omega - 0.5) );
+       PdfT omegaOdd = F(1.0)/( F(0.5) + magicParam/(F(1.0)/omega - F(0.5)) );
 
-       PdfT evenPart = 0.0;
-       PdfT oddPart = 0.0;
-       PdfT dir_indep_trm = 0.0;
+       PdfT evenPart = F(0.0);
+       PdfT oddPart = F(0.0);
+       PdfT dir_indep_trm = F(0.0);
 
-       PdfT w_0 = 1.0 /  3.0;
-       PdfT w_1 = 1.0 / 18.0;
-       PdfT w_2 = 1.0 / 36.0;
+       PdfT w_0 = F(1.0) /  F(3.0);
+       PdfT w_1 = F(1.0) / F(18.0);
+       PdfT w_2 = F(1.0) / F(36.0);
 
-       PdfT w_1_x3 = w_1 * 3.0;        PdfT w_1_nine_half = w_1 * 9.0/2.0;     PdfT w_1_indep = 0.0;
-       PdfT w_2_x3 = w_2 * 3.0;        PdfT w_2_nine_half = w_2 * 9.0/2.0;     PdfT w_2_indep = 0.0;
+       PdfT w_1_x3 = w_1 * F(3.0);     PdfT w_1_nine_half = w_1 * F(9.0)/F(2.0);       PdfT w_1_indep = F(0.0);
+       PdfT w_2_x3 = w_2 * F(3.0);     PdfT w_2_nine_half = w_2 * F(9.0)/F(2.0);       PdfT w_2_indep = F(0.0);
 
        PdfT ux, uy, uz, ui;
        PdfT dens;
@@ -169,6 +169,11 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
 
                                for (int x = bX; x < eX; ++x) {
                                for (int y = bY; y < eY; ++y) {
+                               #ifdef INTEL_OPT_DIRECTIVES
+                                       #pragma ivdep
+                                       #pragma vector always
+                                       #pragma simd
+                               #endif
                                for (int z = bZ; z < eZ; ++z) {
 
 
@@ -189,9 +194,9 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
 #ifdef LID_DRIVEN_CAVITY
 
                                        if (z == nZ - 4 + oZ && x > 3 + oX && x < (nX - 4 + oX) && y > 3 + oY  && y < (nY - 4 + oY)) {
-                                               ux = 0.1 * 0.577;
-                                               uy = 0.0;
-                                               uz = 0.0;
+                                               ux = F(0.1) * F(0.5)77;
+                                               uy = F(0.0);
+                                               uz = F(0.0);
 
                                        } else {
        #endif
@@ -211,7 +216,7 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                                        pdf_T  + pdf_TN + pdf_TE + pdf_TS + pdf_TW +
                                                        pdf_B  + pdf_BN + pdf_BE + pdf_BS + pdf_BW;
 
-                                       dir_indep_trm = dens - (ux * ux + uy * uy + uz * uz)*3.0/2.0;
+                                       dir_indep_trm = dens - (ux * ux + uy * uy + uz * uz)*F(3.0)/F(2.0);
 
                                        // direction: w_0
                                        src[I(x,   y,   z, D3Q19_C)]  = pdf_C - omegaEven*(pdf_C - w_0*dir_indep_trm);
@@ -220,20 +225,20 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                        w_1_indep = w_1*dir_indep_trm;
 
                                        ui = uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_N + pdf_S) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_N - pdf_S) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_N + pdf_S) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_N - pdf_S) - ui*w_1_x3 );
                                        src[I(x, y, z, D3Q19_S)]  = pdf_N - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_N)]  = pdf_S - evenPart + oddPart;
 
                                        ui = ux;
-                                       evenPart = omegaEven*( 0.5*(pdf_E + pdf_W) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_E - pdf_W) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_E + pdf_W) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_E - pdf_W) - ui*w_1_x3 );
                                        src[I(x, y, z, D3Q19_W)]  = pdf_E - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_E)]  = pdf_W - evenPart + oddPart;
 
                                        ui = uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_T + pdf_B) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_T - pdf_B) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_T + pdf_B) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_T - pdf_B) - ui*w_1_x3 );
                                        src[I(x, y, z, D3Q19_B)]  = pdf_T - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_T)]  = pdf_B - evenPart + oddPart;
 
@@ -241,38 +246,38 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                        w_2_indep = w_2*dir_indep_trm;
 
                                        ui = -ux + uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_NW + pdf_SE) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_NW - pdf_SE) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_NW + pdf_SE) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_NW - pdf_SE) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_SE)] = pdf_NW - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_NW)] = pdf_SE - evenPart + oddPart;
 
                                        ui = ux + uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_NE + pdf_SW) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_NE - pdf_SW) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_NE + pdf_SW) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_NE - pdf_SW) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_SW)] = pdf_NE - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_NE)] = pdf_SW - evenPart + oddPart;
 
                                        ui = -ux + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TW + pdf_BE) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TW - pdf_BE) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TW + pdf_BE) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TW - pdf_BE) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_BE)] = pdf_TW - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_TW)] = pdf_BE - evenPart + oddPart;
 
                                        ui = ux + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TE + pdf_BW) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TE - pdf_BW) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TE + pdf_BW) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TE - pdf_BW) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_BW)] = pdf_TE - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_TE)] = pdf_BW - evenPart + oddPart;
 
                                        ui = -uy + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TS + pdf_BN) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TS - pdf_BN) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TS + pdf_BN) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TS - pdf_BN) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_BN)] = pdf_TS - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_TS)] = pdf_BN - evenPart + oddPart;
 
                                        ui = uy + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TN + pdf_BS) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TN - pdf_BS) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TN + pdf_BS) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TN - pdf_BS) - ui*w_2_x3 );
                                        src[I(x, y, z, D3Q19_BS)] = pdf_TN - evenPart - oddPart;
                                        src[I(x, y, z, D3Q19_TN)] = pdf_BS - evenPart + oddPart;
 
@@ -296,6 +301,9 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                #pragma omp parallel for default(none) \
                                shared(kd, src)
                #endif
+               #ifdef INTEL_OPT_DIRECTIVES
+                       #pragma ivdep
+               #endif
                for (int i = 0; i < kd->nBounceBackPdfs; ++i) {
                        src[kd->BounceBackPdfsSrc[i]] = src[kd->BounceBackPdfsDst[i]];
                }
@@ -369,6 +377,11 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
 
                                for (int x = bX; x < eX; ++x) {
                                for (int y = bY; y < eY; ++y) {
+                               #ifdef INTEL_OPT_DIRECTIVES
+                                       #pragma ivdep
+                                       #pragma vector always
+                                       #pragma simd
+                               #endif
                                for (int z = bZ; z < eZ; ++z) {
 
                                        #define I(x, y, z, dir) P_INDEX_5(gDims, (x), (y), (z), (dir))
@@ -384,9 +397,9 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
 #ifdef LID_DRIVEN_CAVITY
 
                                        if (z == nZ - 4 + oZ && x > 3 + oX && x < (nX - 4 + oX) && y > 3 + oY  && y < (nY - 4 + oY)) {
-                                               ux = 0.1 * 0.577;
-                                               uy = 0.0;
-                                               uz = 0.0;
+                                               ux = F(0.1) * F(0.5)77;
+                                               uy = F(0.0);
+                                               uz = F(0.0);
 
                                        } else {
 #endif
@@ -406,7 +419,7 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                                        pdf_T  + pdf_TN + pdf_TE + pdf_TS + pdf_TW +
                                                        pdf_B  + pdf_BN + pdf_BE + pdf_BS + pdf_BW;
 
-                                       dir_indep_trm = dens - (ux * ux + uy * uy + uz * uz)*3.0/2.0;
+                                       dir_indep_trm = dens - (ux * ux + uy * uy + uz * uz)*F(3.0)/F(2.0);
 
                                        // direction: w_0
                                        src[I(x,   y,   z, D3Q19_C)]  = pdf_C - omegaEven*(pdf_C - w_0*dir_indep_trm);
@@ -415,20 +428,20 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                        w_1_indep = w_1*dir_indep_trm;
 
                                        ui = uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_N + pdf_S) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_N - pdf_S) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_N + pdf_S) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_N - pdf_S) - ui*w_1_x3 );
                                        src[I(x, y + 1,   z, D3Q19_N)]  = pdf_N - evenPart - oddPart;
                                        src[I(x, y - 1,   z, D3Q19_S)]  = pdf_S - evenPart + oddPart;
 
                                        ui = ux;
-                                       evenPart = omegaEven*( 0.5*(pdf_E + pdf_W) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_E - pdf_W) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_E + pdf_W) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_E - pdf_W) - ui*w_1_x3 );
                                        src[I(x + 1,   y,   z, D3Q19_E)]  = pdf_E - evenPart - oddPart;
                                        src[I(x - 1,   y,   z, D3Q19_W)]  = pdf_W - evenPart + oddPart;
 
                                        ui = uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_T + pdf_B) - ui*ui*w_1_nine_half - w_1_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_T - pdf_B) - ui*w_1_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_T + pdf_B) - ui*ui*w_1_nine_half - w_1_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_T - pdf_B) - ui*w_1_x3 );
                                        src[I(x,   y, z + 1, D3Q19_T)]  = pdf_T - evenPart - oddPart;
                                        src[I(x,   y, z - 1, D3Q19_B)]  = pdf_B - evenPart + oddPart;
 
@@ -436,38 +449,38 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                                        w_2_indep = w_2*dir_indep_trm;
 
                                        ui = -ux + uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_NW + pdf_SE) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_NW - pdf_SE) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_NW + pdf_SE) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_NW - pdf_SE) - ui*w_2_x3 );
                                        src[I(x - 1, y + 1,   z, D3Q19_NW)] = pdf_NW - evenPart - oddPart;
                                        src[I(x + 1, y - 1,   z, D3Q19_SE)] = pdf_SE - evenPart + oddPart;
 
                                        ui = ux + uy;
-                                       evenPart = omegaEven*( 0.5*(pdf_NE + pdf_SW) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_NE - pdf_SW) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_NE + pdf_SW) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_NE - pdf_SW) - ui*w_2_x3 );
                                        src[I(x + 1, y + 1,   z, D3Q19_NE)] = pdf_NE - evenPart - oddPart;
                                        src[I(x - 1, y - 1,   z, D3Q19_SW)] = pdf_SW - evenPart + oddPart;
 
                                        ui = -ux + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TW + pdf_BE) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TW - pdf_BE) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TW + pdf_BE) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TW - pdf_BE) - ui*w_2_x3 );
                                        src[I(x - 1,   y, z + 1, D3Q19_TW)] = pdf_TW - evenPart - oddPart;
                                        src[I(x + 1,   y, z - 1, D3Q19_BE)] = pdf_BE - evenPart + oddPart;
 
                                        ui = ux + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TE + pdf_BW) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TE - pdf_BW) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TE + pdf_BW) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TE - pdf_BW) - ui*w_2_x3 );
                                        src[I(x + 1,   y, z + 1, D3Q19_TE)] = pdf_TE - evenPart - oddPart;
                                        src[I(x - 1,   y, z - 1, D3Q19_BW)] = pdf_BW - evenPart + oddPart;
 
                                        ui = -uy + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TS + pdf_BN) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TS - pdf_BN) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TS + pdf_BN) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TS - pdf_BN) - ui*w_2_x3 );
                                        src[I(x, y - 1, z + 1, D3Q19_TS)] = pdf_TS - evenPart - oddPart;
                                        src[I(x, y + 1, z - 1, D3Q19_BN)] = pdf_BN - evenPart + oddPart;
 
                                        ui = uy + uz;
-                                       evenPart = omegaEven*( 0.5*(pdf_TN + pdf_BS) - ui*ui*w_2_nine_half - w_2_indep );
-                                       oddPart = omegaOdd*(0.5*(pdf_TN - pdf_BS) - ui*w_2_x3 );
+                                       evenPart = omegaEven*( F(0.5)*(pdf_TN + pdf_BS) - ui*ui*w_2_nine_half - w_2_indep );
+                                       oddPart = omegaOdd*(F(0.5)*(pdf_TN - pdf_BS) - ui*w_2_x3 );
                                        src[I(x, y + 1, z + 1, D3Q19_TN)] = pdf_TN - evenPart - oddPart;
                                        src[I(x, y - 1, z - 1, D3Q19_BS)] = pdf_BS - evenPart + oddPart;
 
@@ -488,6 +501,9 @@ void FNAME(D3Q19AaKernel)(LatticeDesc * ld, KernelData * kernelData, CaseData *
                #pragma omp parallel for default(none) \
                                shared(kd, src)
                #endif
+               #ifdef INTEL_OPT_DIRECTIVES
+                       #pragma ivdep
+               #endif
                for (int i = 0; i < kd->nBounceBackPdfs; ++i) {
                        src[kd->BounceBackPdfsDst[i]] = src[kd->BounceBackPdfsSrc[i]];
                }
This page took 0.072775 seconds and 5 git commands to generate.