Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenVX 1.3 - GPU backends - bug fix - vxImageContainmentRelationship #643

Merged
merged 11 commits into from
Oct 8, 2021
Merged

OpenVX 1.3 - GPU backends - bug fix - vxImageContainmentRelationship #643

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
10703a6
add U8 for uniformImage
LakshmiKumar23 Sep 10, 2021
f7fb442
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Sep 14, 2021
dbf93bf
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Sep 16, 2021
854f561
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Sep 20, 2021
f1606e8
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Sep 29, 2021
2d2209d
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Oct 6, 2021
490224e
Merge remote-tracking branch 'upstream/master' into lk/imgCont
LakshmiKumar23 Oct 7, 2021
2ab90ab
fixes image containment relationship failure
LakshmiKumar23 Oct 7, 2021
6dac86a
code clean up
LakshmiKumar23 Oct 7, 2021
52a3242
adding comments
LakshmiKumar23 Oct 7, 2021
46037a6
HIP fix for image Containment
LakshmiKumar23 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions amd_openvx/openvx/ago/ago_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ THE SOFTWARE.
#define AGO_BUFFER_SYNC_FLAG_DIRTY_BY_NODE 0x00000002 // buffer dirty by node
#define AGO_BUFFER_SYNC_FLAG_DIRTY_BY_NODE_CL 0x00000004 // OpenCL buffer dirty by node
#define AGO_BUFFER_SYNC_FLAG_DIRTY_SYNCHED 0x00000008 // OpenCL buffer has been synced
#define AGO_BUFFER_SYNC_FLAG_DIRTY_BY_WRITE 0x00000010 // buffer dirty by write

// AGO graph optimizer
#define AGO_GRAPH_OPTIMIZER_FLAG_NO_DIVIDE 0x00000001 // don't run drama divide
Expand Down
13 changes: 10 additions & 3 deletions amd_openvx/openvx/ago/ago_util_opencl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ static void clDumpBuffer(const char * fileNameFormat, cl_command_queue opencl_cm
static int dumpBufferCount = 0; dumpBufferCount++;
char fileName[1024]; sprintf(fileName, fileNameFormat, dumpBufferCount);
cl_mem opencl_buffer = data->opencl_buffer;
cl_uint gpu_buffer_offset = data->gpu_buffer_offset
_buffer_offset;
cl_uint gpu_buffer_offset = data->gpu_buffer_offset;
cl_uint size = (cl_uint)0;
if (data->ref.type == VX_TYPE_IMAGE)
size = (cl_uint)(data->u.img.stride_in_bytes*data->u.img.height);
Expand Down Expand Up @@ -401,6 +400,14 @@ int agoGpuOclAllocBuffer(AgoData * data)
if (data != dataMaster) {
// special handling for image ROI
data->opencl_buffer = dataMaster->opencl_buffer;
if((dataMaster->buffer_sync_flags & AGO_BUFFER_SYNC_FLAG_DIRTY_BY_WRITE)) {
// copy the image into OpenCL or HIP buffer because commits aren't done to this buffer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@LakshmiKumar23 this part of the code is for the OpenCL backend only. Please remove the word HIP from the comment section here. You would also need to make the same change for the HIP backend here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asalmanp Thanks for the pointer. I have made the required changes

cl_int err = clEnqueueWriteBuffer(context->opencl_cmdq, dataMaster->opencl_buffer, CL_TRUE, dataMaster->gpu_buffer_offset, dataMaster->size, dataMaster->buffer, 0, NULL, NULL);
if (err) {
agoAddLogEntry(&context->ref, VX_FAILURE, "ERROR: agoGpuOclAllocBuffer: clEnqueueWriteBuffer() => %d\n", err);
return -1;
}
}
#if defined(CL_VERSION_2_0)
data->opencl_svm_buffer = dataMaster->opencl_svm_buffer;
#endif
Expand Down Expand Up @@ -2454,4 +2461,4 @@ int agoGpuOclSingleNodeWait(AgoGraph * graph, AgoNode * node)
return 0;
}

#endif
#endif
10 changes: 10 additions & 0 deletions amd_openvx/openvx/api/vx_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,6 +2126,11 @@ VX_API_ENTRY vx_status VX_API_CALL vxMapImagePatch(vx_image image_, const vx_rec
}
}
}
else if (usage == VX_WRITE_ONLY)
{
auto dataToSync = img->u.img.isROI ? img->u.img.roiMasterImage : img;
dataToSync->buffer_sync_flags |= AGO_BUFFER_SYNC_FLAG_DIRTY_BY_WRITE;
}
#elif ENABLE_HIP
auto dataToSync = img->u.img.isROI ? img->u.img.roiMasterImage : img;
if (dataToSync->hip_memory && !(dataToSync->buffer_sync_flags & AGO_BUFFER_SYNC_FLAG_DIRTY_SYNCHED)) {
Expand All @@ -2141,6 +2146,11 @@ VX_API_ENTRY vx_status VX_API_CALL vxMapImagePatch(vx_image image_, const vx_rec
dataToSync->buffer_sync_flags |= AGO_BUFFER_SYNC_FLAG_DIRTY_SYNCHED;
}
}
if (usage == VX_WRITE_ONLY)
{
auto dataToSync = img->u.img.isROI ? img->u.img.roiMasterImage : img;
dataToSync->buffer_sync_flags |= AGO_BUFFER_SYNC_FLAG_DIRTY_BY_WRITE;
}
#endif
// get map id and set returned pointer
MappedData item = { img->nextMapId++, ptr_returned, usage, false, 0, plane_index };
Expand Down