diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2016-07-11 15:12:38 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2016-07-12 08:39:01 +0000 |
commit | c44726c48228d9c6a5960e302b1c0bd16b0099c4 (patch) | |
tree | 26c3fbd11a29af5de6d555dcec3076dde9701378 /opencl | |
parent | 9c711f05fa10dc70e4257a1f48d43f539353541a (diff) |
desktop: validate OpenCL drivers before use.
OpenCL validation needs to happen before drivers are used in
anger. This should isolate any crashes, and/or mis-behavior to
We use app version, CL driver version and file time-stamp to
trigger re-testing the device. If anything fails: hard disable
OpenCL.
We use an opencl validation sheet (cl-test.ods) and install it.
It is a minimal CL set - it requires a very short formula group
length, and combines several CL functions into few formulae to
test more.
The sheet structure, in particular the manual squaring / SQRT is
necessary to stick within the default CL subset, and ensure that
formulae are CL enabled from the root of the dependency tree up.
Change-Id: I18682dbdf9a8ba9c16d52bad4447e9acce97f0a3
Reviewed-on: https://gerrit.libreoffice.org/27131
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'opencl')
-rw-r--r-- | opencl/inc/opencl_device.hxx | 3 | ||||
-rw-r--r-- | opencl/source/OpenCLZone.cxx | 4 | ||||
-rw-r--r-- | opencl/source/openclwrapper.cxx | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 0963304e8f99..216af72de849 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -16,6 +16,9 @@ namespace opencl { ds_device getDeviceSelection(OUString const & pFileName, bool bForceSelection = false); +struct GPUEnv; +void releaseOpenCLEnv( GPUEnv *gpuInfo ); + } #endif diff --git a/opencl/source/OpenCLZone.cxx b/opencl/source/OpenCLZone.cxx index dc3a9522380b..03521a29c66f 100644 --- a/opencl/source/OpenCLZone.cxx +++ b/opencl/source/OpenCLZone.cxx @@ -7,7 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <opencl/openclwrapper.hxx> #include <opencl/OpenCLZone.hxx> +#include "opencl_device.hxx" #include <memory> @@ -40,6 +42,8 @@ void OpenCLZone::hardDisable() auto xConfProvider = css::configuration::theDefaultProvider::get(comphelper::getProcessComponentContext()); css::uno::Reference<css::util::XFlushable> xFlushable(xConfProvider, css::uno::UNO_QUERY_THROW); xFlushable->flush(); + + releaseOpenCLEnv(&opencl::gpuEnv); } } diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index db6c7e51c09a..2aecdde9338f 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -268,6 +268,8 @@ bool initOpenCLAttr( OpenCLEnv * env ) return false; } +} + void releaseOpenCLEnv( GPUEnv *gpuInfo ) { OpenCLZone zone; @@ -298,6 +300,8 @@ void releaseOpenCLEnv( GPUEnv *gpuInfo ) return; } +namespace { + bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) { cl_int clStatus; @@ -701,7 +705,7 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, size_t& rDeviceId, size_ bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool bForceEvaluation, OUString& rOutSelectedDeviceVersionIDString) { - if(fillOpenCLInfo().empty()) + if(fillOpenCLInfo().empty() || getenv("SAL_DISABLE_OPENCL")) return false; cl_device_id pDeviceId = nullptr; @@ -884,7 +888,7 @@ const char* errorString(cl_int nError) bool GPUEnv::isOpenCLEnabled() { - return gpuEnv.mpDevID; + return gpuEnv.mpDevID && gpuEnv.mpContext; } } |