P4 to Git Change 2034910 by kjayapra@0_HIPWS_LNX1_ROCM on 2019/11/21 19:28:10

SWDEV-145570 - Revering CL#2033779 for now.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#36 edit
This commit is contained in:
foreman
2019-11-21 19:33:05 -05:00
orang tua 06167b8112
melakukan 6cabc4898d
3 mengubah file dengan 6 tambahan dan 33 penghapusan
+4 -4
Melihat File
@@ -231,7 +231,7 @@ void PlatformState::registerVar(const void* hostvar,
void PlatformState::registerFunction(const void* hostFunction,
const DeviceFunction& func) {
amd::ScopedLock lock(lock_);
functions_.insert(std::make_pair(std::string(reinterpret_cast<const char*>(hostFunction)), func));
functions_.insert(std::make_pair(hostFunction, func));
}
bool ihipGetFuncAttributes(const char* func_name, amd::Program* program, hipFuncAttributes* func_attr) {
@@ -272,7 +272,7 @@ bool CL_CALLBACK getSvarInfo(cl_program program, std::string var_name, void** va
hipFunction_t PlatformState::getFunc(const void* hostFunction, int deviceId) {
amd::ScopedLock lock(lock_);
const auto it = functions_.find(std::string(reinterpret_cast<const char*>(hostFunction)));
const auto it = functions_.find(hostFunction);
if (it != functions_.cend()) {
PlatformState::DeviceFunction& devFunc = it->second;
if (devFunc.functions[deviceId] == 0) {
@@ -302,12 +302,12 @@ hipFunction_t PlatformState::getFunc(const void* hostFunction, int deviceId) {
bool PlatformState::getFuncAttr(const void* hostFunction,
hipFuncAttributes* func_attr) {
amd::ScopedLock lock(lock_);
if (func_attr == nullptr) {
return false;
}
const auto it = functions_.find(std::string(reinterpret_cast<const char*>(hostFunction)));
const auto it = functions_.find(hostFunction);
if (it == functions_.cend()) {
return false;
}