diff options
author | I-Jui (Ray) Sung <ray@multicorewareinc.com> | 2013-11-29 01:53:48 -0600 |
---|---|---|
committer | I-Jui (Ray) Sung <ray@multicorewareinc.com> | 2013-12-02 12:50:10 -0600 |
commit | 01ee34e66d94548720487e915186b342a9557f41 (patch) | |
tree | c446ebcf26a929c8e7234ed810f9b8713e3b67dc | |
parent | 027e96f462f6a3003766d3fde91b653af4bbb998 (diff) |
GPU Calc: cache the very last compiled program in memorylibreoffice-4-2-milestone-3
Change-Id: Ib805c31f0c1b57708c38c02a9bdc492af5c7a439
-rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index cc4fc04d52b7..36981a7c8a0d 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2654,10 +2654,7 @@ DynamicKernel::~DynamicKernel() std::cerr<<"Freeing kernel "<< GetMD5() << " kernel\n"; clReleaseKernel(mpKernel); } - if (mpProgram) { - std::cerr<<"Freeing kernel "<< GetMD5() << " program\n"; - clReleaseProgram(mpProgram); - } + // mpProgram is not going to be released here -- it's cached. if (mpCode) delete mpCode; } @@ -2671,23 +2668,41 @@ void DynamicKernel::CreateKernel(void) KernelEnv kEnv; OpenclDevice::setKernelEnv(&kEnv); const char *src = mFullProgramSrc.c_str(); - if (OpenclDevice::buildProgramFromBinary("", - &OpenclDevice::gpuEnv, - (mKernelSignature+GetMD5()).c_str(), 0)) { - mpProgram = OpenclDevice::gpuEnv.mpArryPrograms[0]; - OpenclDevice::gpuEnv.mpArryPrograms[0] = NULL; - } else { - mpProgram = clCreateProgramWithSource(kEnv.mpkContext, 1, - &src, NULL, &err); - if (err != CL_SUCCESS) - throw OpenCLError(err); - err = clBuildProgram(mpProgram, 1, - OpenclDevice::gpuEnv.mpArryDevsID, "", NULL, NULL); - if (err != CL_SUCCESS) - throw OpenCLError(err); - // Generate binary out of compiled kernel. - OpenclDevice::generatBinFromKernelSource(mpProgram, - (mKernelSignature+GetMD5()).c_str()); + static std::string lastKernelHash = ""; + static cl_program lastProgram = NULL; + std::string KernelHash = mKernelSignature+GetMD5(); + if (lastKernelHash == KernelHash && lastProgram) + { + std::cerr<<"cl_program cache hit: "<< KernelHash << "\n"; + mpProgram = lastProgram; + } + else + { // doesn't match the last compiled formula. + + if (lastProgram) { + std::cerr<<"Freeing last program: "<< GetMD5() << "\n"; + clReleaseProgram(lastProgram); + lastProgram = NULL; + } + if (OpenclDevice::buildProgramFromBinary("", + &OpenclDevice::gpuEnv, KernelHash.c_str(), 0)) { + mpProgram = OpenclDevice::gpuEnv.mpArryPrograms[0]; + OpenclDevice::gpuEnv.mpArryPrograms[0] = NULL; + } else { + mpProgram = clCreateProgramWithSource(kEnv.mpkContext, 1, + &src, NULL, &err); + if (err != CL_SUCCESS) + throw OpenCLError(err); + err = clBuildProgram(mpProgram, 1, + OpenclDevice::gpuEnv.mpArryDevsID, "", NULL, NULL); + if (err != CL_SUCCESS) + throw OpenCLError(err); + // Generate binary out of compiled kernel. + OpenclDevice::generatBinFromKernelSource(mpProgram, + (mKernelSignature+GetMD5()).c_str()); + } + lastKernelHash = KernelHash; + lastProgram = mpProgram; } mpKernel = clCreateKernel(mpProgram, kname.c_str(), &err); if (err != CL_SUCCESS) |