Kaydet (Commit) ab2e6c65 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst eb6d2732
...@@ -1372,8 +1372,7 @@ ...@@ -1372,8 +1372,7 @@
formula contains only these operators and functions, it formula contains only these operators and functions, it
might be calculated using OpenCL.</desc> might be calculated using OpenCL.</desc>
</info> </info>
<!-- numeric values correspond to MIN;MAX;SUM;AVERAGE;SUMIFS --> <value>66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403</value>
<value>222;223;224;226;403</value>
</prop> </prop>
<prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false"> <prop oor:name="OpenCLAutoSelect" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options Spreadsheet Formula --> <!-- UIHints: Tools - Options Spreadsheet Formula -->
......
...@@ -39,10 +39,25 @@ void ScCalcConfig::setOpenCLConfigToDefault() ...@@ -39,10 +39,25 @@ void ScCalcConfig::setOpenCLConfigToDefault()
mbOpenCLSubsetOnly = true; mbOpenCLSubsetOnly = true;
mbOpenCLAutoSelect = true; mbOpenCLAutoSelect = true;
mnOpenCLMinimumFormulaGroupSize = 20; 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(ocMin);
maOpenCLSubsetOpCodes.insert(ocMax); maOpenCLSubsetOpCodes.insert(ocMax);
maOpenCLSubsetOpCodes.insert(ocSum); maOpenCLSubsetOpCodes.insert(ocSum);
maOpenCLSubsetOpCodes.insert(ocProduct);
maOpenCLSubsetOpCodes.insert(ocAverage); maOpenCLSubsetOpCodes.insert(ocAverage);
maOpenCLSubsetOpCodes.insert(ocNormDist);
maOpenCLSubsetOpCodes.insert(ocSumIfs); maOpenCLSubsetOpCodes.insert(ocSumIfs);
// This entry we have had for some time (when blacklisting was // This entry we have had for some time (when blacklisting was
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment