Revert "Use table Ewald for Skylake"

This reverts commit 80c3f0d8ec228c6266ab721cadcb3dca48aad1d1.

After the bugfix of table (12e9ea41a9cee) this isn't the right
choice anymore.

Change-Id: I4c916c1d038c0e7501b1bd9f91ebc89f5afbd2cd

diff --git a/src/gromacs/mdlib/forcerec.cpp b/src/gromacs/mdlib/forcerec.cpp
index a54d2f9c58e749183dcc954f9379bff9aa7ec28b..aef0c3c112ab1a3f99bc33cdc845033d50033f40 100644 (file)
--- a/src/gromacs/mdlib/forcerec.cpp
+++ b/src/gromacs/mdlib/forcerec.cpp
@@ -1663,10 +1663,9 @@ static void pick_nbnxn_kernel_cpu(const t_inputrec gmx_unused    *ir,
          * With FMA analytical is sometimes faster for a width if 4 as well.
          * On BlueGene/Q, this is faster regardless of precision.
          * In single precision, this is faster on Bulldozer.
-         * On Skylake table is faster in single and double. TODO: Test 5xxx series.
          */
-#if ((GMX_SIMD_REAL_WIDTH >= 8 || (GMX_SIMD_REAL_WIDTH >= 4 && GMX_SIMD_HAVE_FMA && !GMX_DOUBLE)) \
-        && !GMX_SIMD_X86_AVX_512) || GMX_SIMD_IBM_QPX
+#if GMX_SIMD_REAL_WIDTH >= 8 || \
+        (GMX_SIMD_REAL_WIDTH >= 4 && GMX_SIMD_HAVE_FMA && !GMX_DOUBLE) || GMX_SIMD_IBM_QPX
         /* On AMD Zen, tabulated Ewald kernels are faster on all 4 combinations
          * of single or double precision and 128 or 256-bit AVX2.
          */