p85620714
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!49861 [MS][LITE][GPU] Fix running gpu model in adreno 630 

Merge pull request !49861 from moran/master
This commit is contained in:
i-robot 2023-03-08 03:57:32 +00:00 committed by Gitee
parent 96a7881414 4915f749a9
commit f29089c753
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mindspore/lite/src/litert/kernel/gpu/opencl/opencl_allocator.cc
View File

@ -213,7 +213,11 @@ void *OpenCLAllocator::_Malloc(MemType mem_type, void *data, size_t size, const
total_size_ += size; total_size_ += size;
const uint64_t max_size = ocl_runtime_->GetGlobalMemSize() * 0.8; const uint64_t max_size = ocl_runtime_->GetGlobalMemSize() * 0.8;
UNLOCK_AND_RETURN_NULL(total_size_ >= max_size, nullptr); if (total_size_ >= max_size) {
is_oversize_ = true;
} else {
is_oversize_ = false;
}
cl::Buffer *buffer = nullptr; cl::Buffer *buffer = nullptr;
cl::Image2D *image = nullptr; cl::Image2D *image = nullptr;

2
mindspore/lite/src/litert/kernel/gpu/opencl/opencl_allocator.h
View File

@ -83,6 +83,7 @@ class OpenCLAllocator : public mindspore::Allocator {
} }
return ptr; return ptr;
} }
bool IsOverSize() { return is_oversize_; }
private: private:
void Lock(); void Lock();
@ -117,6 +118,7 @@ class OpenCLAllocator : public mindspore::Allocator {
// 6 is empirical value // 6 is empirical value
int shift_factor_ = 6; int shift_factor_ = 6;
bool lock_flag_ = true; bool lock_flag_ = true;
bool is_oversize_{false};
}; };
} // namespace mindspore::lite::opencl } // namespace mindspore::lite::opencl

1
mindspore/lite/src/litert/kernel/opencl/opencl_kernel.cc
View File

@ -277,6 +277,7 @@ int OpenCLKernel::PreProcess() {
} }
output->ResetRefCount(); output->ResetRefCount();
} }
is_oversize_kernel_ = ocl_runtime_->GetAllocator()->IsOverSize();
return RET_OK; return RET_OK;
} }

8
mindspore/lite/src/litert/kernel/opencl/opencl_kernel.h
View File

@ -284,7 +284,12 @@ class OpenCLKernel : public LiteKernel {
int PreProcess() override; int PreProcess() override;
int ReSize() override; int ReSize() override;
int Run() override { return RET_ERROR; } int Run() override { return RET_ERROR; }
int PostProcess() override { return RET_OK; } int PostProcess() override {
if (is_oversize_kernel_) {
return FreeInWorkTensor();
}
return RET_OK;
}
bool MallocDataDone(); bool MallocDataDone();
std::string OpenCLKernelHeader(); std::string OpenCLKernelHeader();
@ -336,6 +341,7 @@ class OpenCLKernel : public LiteKernel {
cl::Event event_; cl::Event event_;
void *restore_quant_data_{nullptr}; void *restore_quant_data_{nullptr};
bool dequant_flag_{false}; bool dequant_flag_{false};
bool is_oversize_kernel_{false};
private: private:
lite::opencl::OpenCLRuntimeInnerWrapper ocl_runtime_wrap_; lite::opencl::OpenCLRuntimeInnerWrapper ocl_runtime_wrap_;