Consolidated logic for determining if vector instructions are supported

openmmapi/include/openmm/internal/vectorize_neon.h

@@ -40,6 +40,14 @@ typedef int int32_t;
 
 // This file defines classes and functions to simplify vectorizing code with NEON.
 
+/**
+ * Determine whether ivec4 and fvec4 are supported on this processor.
+ */
+static bool isVec4Supported() {
+    uint64_t features = android_getCpuFeatures();
+    return (features & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
+}
+
 class ivec4;
 
 /**

openmmapi/include/openmm/internal/vectorize_sse.h

@@ -33,10 +33,23 @@
  * -------------------------------------------------------------------------- */
 
 #include <smmintrin.h>
-
+#include "hardware.h"
 
 // This file defines classes and functions to simplify vectorizing code with SSE.
 
+/**
+ * Determine whether ivec4 and fvec4 are supported on this processor.
+ */
+static bool isVec4Supported() {
+    int cpuInfo[4];
+    cpuid(cpuInfo, 0);
+    if (cpuInfo[0] >= 1) {
+        cpuid(cpuInfo, 1);
+        return ((cpuInfo[2] & ((int) 1 << 19)) != 0);
+    }
+    return false;
+}
+
 class ivec4;
 
 /**

platforms/cpu/src/CpuPlatform.cpp

@@ -34,7 +34,7 @@
 #include "CpuKernels.h"
 #include "CpuSETTLE.h"
 #include "ReferenceConstraints.h"
-#include "openmm/internal/hardware.h"
+#include "openmm/internal/vectorize.h"
 #include <sstream>
 #include <stdlib.h>
 
@@ -94,20 +94,7 @@ bool CpuPlatform::supportsDoublePrecision() const {
 }
 
 bool CpuPlatform::isProcessorSupported() {
-    // Make sure the CPU supports SSE 4.1 or NEON.
-        
-    #ifdef __ANDROID__
-        uint64_t features = android_getCpuFeatures();
-        return (features & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-    #else
-        int cpuInfo[4];
-        cpuid(cpuInfo, 0);
-        if (cpuInfo[0] >= 1) {
-            cpuid(cpuInfo, 1);
-            return ((cpuInfo[2] & ((int) 1 << 19)) != 0);
-        }
-        return false;
-    #endif
+    return isVec4Supported();
 }
 
 void CpuPlatform::contextCreated(ContextImpl& context, const map<string, string>& properties) const {

plugins/cpupme/src/CpuPmeKernels.cpp

@@ -569,20 +569,7 @@ double CpuCalcPmeReciprocalForceKernel::finishComputation(IO& io) {
 }
 
 bool CpuCalcPmeReciprocalForceKernel::isProcessorSupported() {
-    // Make sure the CPU supports SSE 4.1 or NEON.
-        
-    #ifdef __ANDROID__
-        uint64_t features = android_getCpuFeatures();
-        return (features & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-    #else
-        int cpuInfo[4];
-        cpuid(cpuInfo, 0);
-        if (cpuInfo[0] >= 1) {
-            cpuid(cpuInfo, 1);
-            return ((cpuInfo[2] & ((int) 1 << 19)) != 0);
-        }
-        return false;
-    #endif
+    return isVec4Supported();
 }
 
 int CpuCalcPmeReciprocalForceKernel::findFFTDimension(int minimum) {