AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 2051060 by michliao@hliao-dev-00-hip.rocm-workspace on 2019/12/30 16:42:07

Browse Source 
SWDEV-145570 - Clean up after `hipError_t` unification.

	- Replace deprecated `hipError_t` enums.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_device_runtime.cpp#24 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_error.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_event.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#94 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#52 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_stream.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_texture.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/api/hip/trace_helper.h#5 edit


[ROCm/clr commit: 955b224ea0]
This commit is contained in:
foreman
2019-12-30 16:46:39 -05:00
parent deaa52db30
commit aa2c3a7b66
8 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/api/hip/hip_event.cpp
+11 -11
View File
@@ -36,7 +36,7 @@ hipError_t Event::query() {
amd::ScopedLock lock(lock_);
if (event_ == nullptr) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
return ready() ? hipSuccess : hipErrorNotReady;
@@ -46,7 +46,7 @@ hipError_t Event::synchronize() {
amd::ScopedLock lock(lock_);
if (event_ == nullptr) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
event_->awaitCompletion();
@@ -59,11 +59,11 @@ hipError_t Event::elapsedTime(Event& eStop, float& ms) {
if (this == &eStop) {
if (event_ == nullptr) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
if (flags & hipEventDisableTiming) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
if (!ready()) {
@@ -77,11 +77,11 @@ hipError_t Event::elapsedTime(Event& eStop, float& ms) {
if (event_ == nullptr ||
eStop.event_ == nullptr) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
if ((flags | eStop.flags) & hipEventDisableTiming) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
if (!ready() || !eStop.ready()) {
@@ -173,7 +173,7 @@ hipError_t ihipEventCreateWithFlags(hipEvent_t* event, unsigned flags) {
hipError_t ihipEventQuery(hipEvent_t event) {
if (event == nullptr) {
return hipErrorInvalidResourceHandle;
return hipErrorInvalidHandle;
}
hip::Event* e = reinterpret_cast<hip::Event*>(event);
@@ -197,7 +197,7 @@ hipError_t hipEventDestroy(hipEvent_t event) {
HIP_INIT_API(hipEventDestroy, event);
if (event == nullptr) {
HIP_RETURN(hipErrorInvalidResourceHandle);
HIP_RETURN(hipErrorInvalidHandle);
}
delete reinterpret_cast<hip::Event*>(event);
@@ -209,7 +209,7 @@ hipError_t hipEventElapsedTime(float *ms, hipEvent_t start, hipEvent_t stop) {
HIP_INIT_API(hipEventElapsedTime, ms, start, stop);
if (start == nullptr || stop == nullptr) {
HIP_RETURN(hipErrorInvalidResourceHandle);
HIP_RETURN(hipErrorInvalidHandle);
}
if (ms == nullptr) {
@@ -226,7 +226,7 @@ hipError_t hipEventRecord(hipEvent_t event, hipStream_t stream) {
HIP_INIT_API(hipEventRecord, event, stream);
if (event == nullptr) {
HIP_RETURN(hipErrorInvalidResourceHandle);
HIP_RETURN(hipErrorInvalidHandle);
}
hip::Event* e = reinterpret_cast<hip::Event*>(event);
@@ -249,7 +249,7 @@ hipError_t hipEventSynchronize(hipEvent_t event) {
HIP_INIT_API(hipEventSynchronize, event);
if (event == nullptr) {
HIP_RETURN(hipErrorInvalidResourceHandle);
HIP_RETURN(hipErrorInvalidHandle);
}
hip::Event* e = reinterpret_cast<hip::Event*>(event);