Merge remote-tracking branch 'origin/release-2019'

[alexxy/gromacs.git] / src / gromacs / nbnxm / nbnxm_setup.cpp

diff --git a/src/gromacs/nbnxm/nbnxm_setup.cpp b/src/gromacs/nbnxm/nbnxm_setup.cpp
index e87e6363c5a09f786daab12d104d321ce2cc8553..8c0b73608336637a0b20eb7ee7d3260c224e0ab2 100644 (file)
--- a/src/gromacs/nbnxm/nbnxm_setup.cpp
+++ b/src/gromacs/nbnxm/nbnxm_setup.cpp
@@ -146,7 +146,7 @@ pick_nbnxn_kernel_cpu(const t_inputrec gmx_unused    *ir,
             kernelSetup.kernelType = KernelType::Cpu4xN_Simd_2xNN;
         }
 
-        if (hardwareInfo.haveAmdZenCpu)
+        if (hardwareInfo.haveAmdZen1Cpu)
         {
             /* One 256-bit FMA per cycle makes 2xNN faster */
             kernelSetup.kernelType = KernelType::Cpu4xN_Simd_2xNN;
@@ -185,7 +185,7 @@ pick_nbnxn_kernel_cpu(const t_inputrec gmx_unused    *ir,
             (GMX_SIMD_REAL_WIDTH >= 8 ||
              (GMX_SIMD_REAL_WIDTH >= 4 && GMX_SIMD_HAVE_FMA && !GMX_DOUBLE)) &&
 #endif
-            !hardwareInfo.haveAmdZenCpu)
+            !hardwareInfo.haveAmdZen1Cpu)
         {
             kernelSetup.ewaldExclusionType = EwaldExclusionType::Analytical;
         }