Change-Id: Ia5b68bacff634d3d9e5757f515bac50887895bc3
[ROCm/clr commit: c0c3aa3637]
This commit is contained in:
gecommit door
GitHub
bovenliggende
88c3041e15
commit
328aeb758c
@@ -590,8 +590,8 @@ typedef hipError_t (*t_hipMemcpyFromSymbolAsync)(void* dst, const void* symbol,
|
||||
hipStream_t stream);
|
||||
typedef hipError_t (*t_hipMemcpyHtoA)(hipArray_t dstArray, size_t dstOffset, const void* srcHost,
|
||||
size_t count);
|
||||
typedef hipError_t (*t_hipMemcpyHtoD)(hipDeviceptr_t dst, void* src, size_t sizeBytes);
|
||||
typedef hipError_t (*t_hipMemcpyHtoDAsync)(hipDeviceptr_t dst, void* src, size_t sizeBytes,
|
||||
typedef hipError_t (*t_hipMemcpyHtoD)(hipDeviceptr_t dst, const void* src, size_t sizeBytes);
|
||||
typedef hipError_t (*t_hipMemcpyHtoDAsync)(hipDeviceptr_t dst, const void* src, size_t sizeBytes,
|
||||
hipStream_t stream);
|
||||
typedef hipError_t (*t_hipMemcpyParam2D)(const hip_Memcpy2D* pCopy);
|
||||
typedef hipError_t (*t_hipMemcpyParam2DAsync)(const hip_Memcpy2D* pCopy, hipStream_t stream);
|
||||
|
||||
@@ -3133,12 +3133,12 @@ typedef struct hip_api_data_s {
|
||||
} hipMemcpyHtoAAsync;
|
||||
struct {
|
||||
hipDeviceptr_t dst;
|
||||
void* src;
|
||||
const void* src;
|
||||
size_t sizeBytes;
|
||||
} hipMemcpyHtoD;
|
||||
struct {
|
||||
hipDeviceptr_t dst;
|
||||
void* src;
|
||||
const void* src;
|
||||
size_t sizeBytes;
|
||||
hipStream_t stream;
|
||||
} hipMemcpyHtoDAsync;
|
||||
|
||||
@@ -479,8 +479,9 @@ hipError_t hipMemcpyFromSymbol(void* dst, const void* symbol, size_t sizeBytes,
|
||||
hipError_t hipMemcpyFromSymbolAsync(void* dst, const void* symbol, size_t sizeBytes, size_t offset,
|
||||
hipMemcpyKind kind, hipStream_t stream);
|
||||
hipError_t hipMemcpyHtoA(hipArray_t dstArray, size_t dstOffset, const void* srcHost, size_t count);
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, void* src, size_t sizeBytes);
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, void* src, size_t sizeBytes, hipStream_t stream);
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, const void* src, size_t sizeBytes);
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, const void* src, size_t sizeBytes,
|
||||
hipStream_t stream);
|
||||
hipError_t hipMemcpyParam2D(const hip_Memcpy2D* pCopy);
|
||||
hipError_t hipMemcpyParam2DAsync(const hip_Memcpy2D* pCopy, hipStream_t stream);
|
||||
hipError_t hipMemcpyPeer(void* dst, int dstDeviceId, const void* src, int srcDeviceId,
|
||||
|
||||
@@ -755,8 +755,8 @@ hipError_t capturehipMemcpyAsync(hipStream_t& stream, void*& dst, const void*& s
|
||||
return capturehipMemcpy(stream, dst, src, sizeBytes, kind);
|
||||
}
|
||||
|
||||
hipError_t capturehipMemcpyHtoDAsync(hipStream_t& stream, hipDeviceptr_t& dstDevice, void*& srcHost,
|
||||
size_t& ByteCount, hipMemcpyKind& kind) {
|
||||
hipError_t capturehipMemcpyHtoDAsync(hipStream_t& stream, hipDeviceptr_t& dstDevice,
|
||||
const void*& srcHost, size_t& ByteCount, hipMemcpyKind& kind) {
|
||||
ClPrint(amd::LOG_INFO, amd::LOG_API, "[hipGraph] Current capture node MemcpyHtoD on stream : %p",
|
||||
stream);
|
||||
if (!hip::isValid(stream)) {
|
||||
|
||||
@@ -81,8 +81,8 @@ hipError_t capturehipMemcpy3DAsync(hipStream_t& stream, const hipMemcpy3DParms*&
|
||||
hipError_t capturehipMemcpyAsync(hipStream_t& stream, void*& dst, const void*& src,
|
||||
size_t& sizeBytes, hipMemcpyKind& kind);
|
||||
|
||||
hipError_t capturehipMemcpyHtoDAsync(hipStream_t& stream, hipDeviceptr_t& dstDevice, void*& srcHost,
|
||||
size_t& ByteCount, hipMemcpyKind& kind);
|
||||
hipError_t capturehipMemcpyHtoDAsync(hipStream_t& stream, hipDeviceptr_t& dstDevice,
|
||||
const void*& srcHost, size_t& ByteCount, hipMemcpyKind& kind);
|
||||
|
||||
hipError_t capturehipMemcpyDtoDAsync(hipStream_t& stream, hipDeviceptr_t& dstDevice,
|
||||
hipDeviceptr_t& srcDevice, size_t& ByteCount,
|
||||
|
||||
@@ -1591,9 +1591,7 @@ hipError_t hipMemcpyFromSymbolAsync_spt(void* dst, const void* symbol, size_t si
|
||||
HIP_RETURN_DURATION(hipMemcpyFromSymbolAsync_common(dst, symbol, sizeBytes, offset, kind, stream));
|
||||
}
|
||||
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dstDevice,
|
||||
void* srcHost,
|
||||
size_t ByteCount) {
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dstDevice, const void* srcHost, size_t ByteCount) {
|
||||
HIP_INIT_API(hipMemcpyHtoD, dstDevice, srcHost, ByteCount);
|
||||
CHECK_STREAM_CAPTURING();
|
||||
hip::Stream* stream = hip::getStream(nullptr);
|
||||
@@ -1640,7 +1638,7 @@ hipError_t hipMemcpyAsync_spt(void* dst, const void* src, size_t sizeBytes,
|
||||
HIP_RETURN_DURATION(hipMemcpyAsync_common(dst, src, sizeBytes, kind, stream));
|
||||
}
|
||||
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dstDevice, void* srcHost, size_t ByteCount,
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dstDevice, const void* srcHost, size_t ByteCount,
|
||||
hipStream_t stream) {
|
||||
HIP_INIT_API(hipMemcpyHtoDAsync, dstDevice, srcHost, ByteCount, stream);
|
||||
hipMemcpyKind kind = hipMemcpyHostToDevice;
|
||||
|
||||
@@ -1123,10 +1123,11 @@ hipError_t hipMemcpyFromSymbolAsync(void* dst, const void* symbol, size_t sizeBy
|
||||
hipError_t hipMemcpyHtoA(hipArray_t dstArray, size_t dstOffset, const void* srcHost, size_t count) {
|
||||
return hip::GetHipDispatchTable()->hipMemcpyHtoA_fn(dstArray, dstOffset, srcHost, count);
|
||||
}
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, void* src, size_t sizeBytes) {
|
||||
hipError_t hipMemcpyHtoD(hipDeviceptr_t dst, const void* src, size_t sizeBytes) {
|
||||
return hip::GetHipDispatchTable()->hipMemcpyHtoD_fn(dst, src, sizeBytes);
|
||||
}
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, void* src, size_t sizeBytes, hipStream_t stream) {
|
||||
hipError_t hipMemcpyHtoDAsync(hipDeviceptr_t dst, const void* src, size_t sizeBytes,
|
||||
hipStream_t stream) {
|
||||
return hip::GetHipDispatchTable()->hipMemcpyHtoDAsync_fn(dst, src, sizeBytes, stream);
|
||||
}
|
||||
hipError_t hipMemcpyParam2D(const hip_Memcpy2D* pCopy) {
|
||||
|
||||
Verwijs in nieuw issue
Block a user