diff options
| -rw-r--r-- | desktop/source/app/opencl.cxx | 12 | ||||
| -rw-r--r-- | include/opencl/openclwrapper.hxx | 1 | ||||
| -rw-r--r-- | opencl/source/openclwrapper.cxx | 1 | ||||
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 7 |
4 files changed, 21 insertions, 0 deletions
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 09f2204e07ca..4c75ae76c269 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -46,6 +46,8 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r bool bSuccess = false; css::uno::Reference< css::lang::XComponent > xComponent; + sal_uInt64 nKernelFailures = opencl::kernelFailures; + SAL_INFO("opencl", "Starting CL test spreadsheet"); try { @@ -95,11 +97,21 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message); } + if (nKernelFailures != opencl::kernelFailures) + { + // tdf#100883 - defeat SEH exception handling fallbacks. + SAL_WARN("opencl", "OpenCL kernels failed to compile, " + "or took SEH exceptions " + << nKernelFailures << " != " << opencl::kernelFailures); + bSuccess = false; + } + if (!bSuccess) OpenCLZone::hardDisable(); if (xComponent.is()) xComponent->dispose(); + return bSuccess; } diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx index b173d89ba2f3..afd34c680fbc 100644 --- a/include/opencl/openclwrapper.hxx +++ b/include/opencl/openclwrapper.hxx @@ -53,6 +53,7 @@ struct OPENCL_DLLPUBLIC GPUEnv }; extern OPENCL_DLLPUBLIC GPUEnv gpuEnv; +extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures; OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const char * clFileName ); OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuEnv, const char* filename, int idx); diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 2aecdde9338f..9156ec26154e 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -58,6 +58,7 @@ using namespace std; namespace opencl { GPUEnv gpuEnv; +sal_uInt64 kernelFailures = 0; namespace { diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index cc82df9ef2c6..6747bc90e2a8 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -4059,6 +4059,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& rConfig, ScTokenArray& // OpenCLError used to go to the catch-all below, and not delete pDynamicKernel. Was that // intentional, should we not do it here then either? delete pDynamicKernel; + ::opencl::kernelFailures++; return nullptr; } catch (const Unhandled& uh) @@ -4068,6 +4069,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& rConfig, ScTokenArray& // Unhandled used to go to the catch-all below, and not delete pDynamicKernel. Was that // intentional, should we not do it here then either? delete pDynamicKernel; + ::opencl::kernelFailures++; return nullptr; } catch (...) @@ -4075,6 +4077,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& rConfig, ScTokenArray& // FIXME: Do we really want to catch random exceptions here? SAL_WARN("sc.opencl", "Dynamic formula compiler: unexpected exception"); // FIXME: Not deleting pDynamicKernel here!?, is that intentional? + ::opencl::kernelFailures++; return nullptr; } return pDynamicKernel; @@ -4185,21 +4188,25 @@ public: catch (const UnhandledToken& ut) { SAL_INFO("sc.opencl", "Dynamic formula compiler: UnhandledToken: " << ut.mMessage << " at " << ut.mFile << ":" << ut.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (const OpenCLError& oce) { SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from " << oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << oce.mFile << ":" << oce.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (const Unhandled& uh) { SAL_INFO("sc.opencl", "Dynamic formula compiler: Unhandled at " << uh.mFile << ":" << uh.mLineNumber); + ::opencl::kernelFailures++; return CLInterpreterResult(); } catch (...) { SAL_WARN("sc.opencl", "Dynamic formula compiler: unexpected exception"); + ::opencl::kernelFailures++; return CLInterpreterResult(); } |