diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-17 17:11:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-17 17:27:05 +0200 |
| commit | ab2e6c659ed79c911f1d995567d5162b3b807874 (patch) | |
| tree | 977c1c7c37278edce4d9956f587dcdb0d1952562 | |
| parent | eb6d27321d2d5f9d069c4a3cbcc9bc6e5b4c98ab (diff) | |
Add a bunch of allegedly common opcodes to the default subset for OpenCL
RAND, SIN, COS, TAN, ATAN, EXP, LN, SQRT, NORMSINV, ROUND, POWER, SUMPRODUCT,
PRODUCT and NORMDIST.
Change-Id: I9619a9a3b022fe00e53bf82735e160a2d449f105
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index d4e65eb86ffb..31395a9f977b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1372,8 +1372,7 @@ formula contains only these operators and functions, it might be calculated using OpenCL.</desc> </info> - <!-- numeric values correspond to MIN;MAX;SUM;AVERAGE;SUMIFS --> - <value>222;223;224;226;403</value> + <value>66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403</value> </prop> <prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Formula --> diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index c93d48212835..a8527ad16816 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -39,10 +39,25 @@ void ScCalcConfig::setOpenCLConfigToDefault() mbOpenCLSubsetOnly = true; mbOpenCLAutoSelect = true; mnOpenCLMinimumFormulaGroupSize = 20; + + maOpenCLSubsetOpCodes.insert(ocRandom); + maOpenCLSubsetOpCodes.insert(ocSin); + maOpenCLSubsetOpCodes.insert(ocCos); + maOpenCLSubsetOpCodes.insert(ocTan); + maOpenCLSubsetOpCodes.insert(ocArcTan); + maOpenCLSubsetOpCodes.insert(ocExp); + maOpenCLSubsetOpCodes.insert(ocLn); + maOpenCLSubsetOpCodes.insert(ocSqrt); + maOpenCLSubsetOpCodes.insert(ocSNormInv); + maOpenCLSubsetOpCodes.insert(ocRound); + maOpenCLSubsetOpCodes.insert(ocPower); + maOpenCLSubsetOpCodes.insert(ocSumProduct); maOpenCLSubsetOpCodes.insert(ocMin); maOpenCLSubsetOpCodes.insert(ocMax); maOpenCLSubsetOpCodes.insert(ocSum); + maOpenCLSubsetOpCodes.insert(ocProduct); maOpenCLSubsetOpCodes.insert(ocAverage); + maOpenCLSubsetOpCodes.insert(ocNormDist); maOpenCLSubsetOpCodes.insert(ocSumIfs); // This entry we have had for some time (when blacklisting was |