[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/opencl opencl/source sc/source

[Laszlo Nemeth]

 include/opencl/openclwrapper.hxx    |    2 -
 opencl/source/openclwrapper.cxx     |   37 ++++++++++++++++++++++++++++++++++--
 sc/source/core/data/formulacell.cxx |    5 +---
 3 files changed, 38 insertions(+), 6 deletions(-)

New commits:
commit 0a2cefe5b6fa010f02da6eecae85c09b308f9fd1
Author: Laszlo Nemeth <nemeth at numbertext.org>
Date:   Mon Jul 25 16:02:10 2016 +0300

    Need to try to avoid TDR also with NVIDIA cards on Windows 7 or earlier
    
    (TDR is Timeout detection and recovery, was introduced in Vista.)
    
    Change-Id: I0be565036c72dadcbec40b6fb9d5154dfacd0860
    Reviewed-on: https://gerrit.libreoffice.org/27519
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index afd34c6..dae1192 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -47,7 +47,7 @@ struct OPENCL_DLLPUBLIC GPUEnv
     int mnCmdQueuePos;
     bool mnKhrFp64Flag;
     bool mnAmdFp64Flag;
-    cl_uint mnPreferredVectorWidthFloat;
+    bool mbNeedsTDRAvoidance;
 
     static bool isOpenCLEnabled();
 };
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 123c2c9..d8d16c3 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -42,6 +42,10 @@
 #define OPENCL_DLL_NAME "libOpenCL.so.1"
 #endif
 
+#ifdef _WIN32_WINNT_WINBLUE
+#include <VersionHelpers.h>
+#endif
+
 #define DEVICE_NAME_LENGTH 1024
 #define DRIVER_VERSION_LENGTH 1024
 #define PLATFORM_VERSION_LENGTH 1024
@@ -455,6 +459,8 @@ void checkDeviceForDoubleSupport(cl_device_id deviceId, bool& bKhrFp64, bool& bA
 bool initOpenCLRunEnv( GPUEnv *gpuInfo )
 {
     OpenCLZone zone;
+    cl_uint nPreferredVectorWidthFloat;
+    char pName[64];
 
     bool bKhrFp64 = false;
     bool bAmdFp64 = false;
@@ -464,11 +470,38 @@ bool initOpenCLRunEnv( GPUEnv *gpuInfo )
     gpuInfo->mnKhrFp64Flag = bKhrFp64;
     gpuInfo->mnAmdFp64Flag = bAmdFp64;
 
-    gpuInfo->mnPreferredVectorWidthFloat = 0;
+    gpuInfo->mbNeedsTDRAvoidance = false;
 
     clGetDeviceInfo(gpuInfo->mpDevID, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT, sizeof(cl_uint),
-                    &gpuInfo->mnPreferredVectorWidthFloat, nullptr);
+                    &nPreferredVectorWidthFloat, nullptr);
+    clGetPlatformInfo(gpuInfo->mpPlatformID, CL_PLATFORM_NAME, 64,
+             pName, nullptr);
+
+    bool bIsNotWinOrIsWin8OrGreater = true;
+
+// the Win32 SDK 8.1 deprecates GetVersionEx()
+#ifdef _WIN32_WINNT_WINBLUE
+    bIsNotWinOrIsWin8OrGreater = IsWindows8OrGreater();
+#elif defined (_WIN32)
+    OSVERSIONINFO aVersionInfo;
+    memset( &aVersionInfo, 0, sizeof(aVersionInfo) );
+    aVersionInfo.dwOSVersionInfoSize = sizeof( aVersionInfo );
+    if (GetVersionEx( &aVersionInfo ))
+    {
+        // Windows 7 or lower?
+        if (aVersionInfo.dwMajorVersion < 6 ||
+           (aVersionInfo.dwMajorVersion == 6 && aVersionInfo.dwMinorVersion < 2))
+            bIsNotWinOrIsWin8OrGreater = false;
+    }
+#endif
 
+    // Heuristic: Certain old low-end OpenCL implementations don't
+    // work for us with too large group lengths. Looking at the preferred
+    // float vector width seems to be a way to detect these devices, except
+    // the non-working NVIDIA cards on Windows older than version 8.
+    gpuInfo->mbNeedsTDRAvoidance = ( nPreferredVectorWidthFloat == 4 ) ||
+        ( !bIsNotWinOrIsWin8OrGreater &&
+          OUString::createFromAscii(pName).indexOf("NVIDIA") > -1 );
     return false;
 }
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index ec4ed8a..04870c1 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4014,9 +4014,8 @@ bool ScFormulaCell::InterpretFormulaGroup()
 #ifdef _WIN32
     // Heuristic: Certain old low-end OpenCL implementations don't
     // work for us with too large group lengths. 1000 was determined
-    // empirically to be a good compromise. Looking at the preferred
-    // float vector width seems to be a way to detect these devices.
-    if (opencl::gpuEnv.mnPreferredVectorWidthFloat == 4)
+    // empirically to be a good compromise.
+    if (opencl::gpuEnv.mbNeedsTDRAvoidance)
         nMaxGroupLength = 1000;
 #endif