X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Fgmxlib%2Fgmx_cpuid.c;h=183be905fed5065923bc7d5da9f9347dc6a26200;hb=fe90f1c1c71a3a43a27ec9ba76e772ae54786c7f;hp=ee74bcbb516464bccb161195614d4a9826adfce2;hpb=15191e1aede147b28201efd57b7b0fc2647b9975;p=alexxy%2Fgromacs.git

diff --git a/src/gromacs/gmxlib/gmx_cpuid.c b/src/gromacs/gmxlib/gmx_cpuid.c
index ee74bcbb51..183be905fe 100644
--- a/src/gromacs/gmxlib/gmx_cpuid.c
+++ b/src/gromacs/gmxlib/gmx_cpuid.c
@@ -34,6 +34,7 @@
  */
 #include "gmxpre.h"
 
+/*! \cond */
 #include "gromacs/legacyheaders/gmx_cpuid.h"
 
 #ifdef HAVE_CONFIG_H
@@ -138,7 +139,8 @@ gmx_cpuid_feature_string[GMX_CPUID_NFEATURES] =
     "arm_neon",
     "arm_neon_asimd",
     "QPX",
-    "VMX"
+    "VMX",
+    "VSX"
 };
 
 const char *
@@ -155,6 +157,7 @@ gmx_cpuid_simd_string[GMX_CPUID_NSIMD] =
     "Sparc64 HPC-ACE",
     "IBM_QPX",
     "IBM_VMX",
+    "IBM_VSX",
     "ARM_NEON",
     "ARM_NEON_ASIMD"
 };
@@ -255,6 +258,8 @@ static const enum gmx_cpuid_simd compiled_simd = GMX_CPUID_SIMD_SPARC64_HPC_ACE;
 static const enum gmx_cpuid_simd compiled_simd = GMX_CPUID_SIMD_IBM_QPX;
 #elif defined GMX_SIMD_IBM_VMX
 static const enum gmx_cpuid_simd compiled_simd = GMX_CPUID_SIMD_IBM_VMX;
+#elif defined GMX_SIMD_IBM_VSX
+static const enum gmx_cpuid_simd compiled_simd = GMX_CPUID_SIMD_IBM_VSX;
 #elif defined GMX_SIMD_REFERENCE
 static const enum gmx_cpuid_simd compiled_simd = GMX_CPUID_SIMD_REFERENCE;
 #else
@@ -861,16 +866,24 @@ cpuid_check_ibm(gmx_cpuid_t                cpuid)
             chomp_substring_before_colon(buffer, before_colon, GMX_CPUID_STRLEN);
             chomp_substring_after_colon(buffer, after_colon, GMX_CPUID_STRLEN);
 
+            if (!strcmp(before_colon, "cpu") || !strcmp(before_colon, "Processor"))
+            {
+                strncpy(cpuid->brand, after_colon, GMX_CPUID_STRLEN);
+            }
             if (!strcmp(before_colon, "model name") ||
                 !strcmp(before_colon, "model") ||
                 !strcmp(before_colon, "Processor") ||
                 !strcmp(before_colon, "cpu"))
             {
-                strncpy(cpuid->brand, after_colon, GMX_CPUID_STRLEN);
-
                 if (strstr(after_colon, "altivec"))
                 {
                     cpuid->feature[GMX_CPUID_FEATURE_IBM_VMX] = 1;
+
+                    if (!strstr(after_colon, "POWER6") && !strstr(after_colon, "Power6") &&
+                        !strstr(after_colon, "power6"))
+                    {
+                        cpuid->feature[GMX_CPUID_FEATURE_IBM_VSX] = 1;
+                    }
                 }
             }
         }
@@ -886,6 +899,7 @@ cpuid_check_ibm(gmx_cpuid_t                cpuid)
     strncpy(cpuid->brand, "Unknown CPU brand", GMX_CPUID_STRLEN);
     cpuid->feature[GMX_CPUID_FEATURE_IBM_QPX] = 0;
     cpuid->feature[GMX_CPUID_FEATURE_IBM_VMX] = 0;
+    cpuid->feature[GMX_CPUID_FEATURE_IBM_VSX] = 0;
 #endif
     return 0;
 }
@@ -1238,6 +1252,11 @@ gmx_cpuid_simd_suggest  (gmx_cpuid_t                 cpuid)
         {
             tmpsimd = GMX_CPUID_SIMD_IBM_QPX;
         }
+        else if (gmx_cpuid_feature(cpuid, GMX_CPUID_FEATURE_IBM_VSX))
+        {
+            /* VSX is better than VMX, so we check it first */
+            tmpsimd = GMX_CPUID_SIMD_IBM_VSX;
+        }
         else if (gmx_cpuid_feature(cpuid, GMX_CPUID_FEATURE_IBM_VMX))
         {
             tmpsimd = GMX_CPUID_SIMD_IBM_VMX;
@@ -1387,3 +1406,5 @@ main(int argc, char **argv)
 }
 
 #endif
+
+/*! \endcond */