Skip to content

Commit 9d157dc

Browse files
kcenceleCompute-Runtime-Automation
kcencele
authored and
Compute-Runtime-Automation
committed
Refactor of sharing function
Change arguments in functions from pointer type to referance type Change-Id: If3569ceee2188d9ad572f23e3b7510e7a40e917d
1 parent 83537d5 commit 9d157dc

File tree

12 files changed

+33
-35
lines changed

12 files changed

+33
-35
lines changed

‎runtime/sharings/d3d/d3d_sharing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ D3DSharing<D3D>::~D3DSharing() {
5555
};
5656

5757
template <typename D3D>
58-
void D3DSharing<D3D>::synchronizeObject(UpdateData *updateData) {
58+
void D3DSharing<D3D>::synchronizeObject(UpdateData &updateData) {
5959
void *sharedHandle = nullptr;
6060

6161
sharingFunctions->getDeviceContext(d3dQuery);
@@ -67,7 +67,7 @@ void D3DSharing<D3D>::synchronizeObject(UpdateData *updateData) {
6767
}
6868
sharingFunctions->releaseDeviceContext(d3dQuery);
6969

70-
updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
70+
updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
7171
}
7272

7373
template <typename D3D>

‎runtime/sharings/d3d/d3d_sharing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class D3DSharing : public SharingHandler {
4242

4343
~D3DSharing() override;
4444

45-
void synchronizeObject(UpdateData *updateData) override;
45+
void synchronizeObject(UpdateData &updateData) override;
4646
void releaseResource(MemObj *memObject) override;
4747

4848
D3DResource **getResourceHandler() { return &resource; }

‎runtime/sharings/d3d/d3d_surface.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Image *D3DSurface::create(Context *context, cl_dx9_surface_info_khr *surfaceInfo
115115
return Image::createSharedImage(context, surface, mcsSurfaceInfo, alloc, nullptr, flags, imgInfo, __GMM_NO_CUBE_MAP, 0, 0);
116116
}
117117

118-
void D3DSurface::synchronizeObject(UpdateData *updateData) {
118+
void D3DSurface::synchronizeObject(UpdateData &updateData) {
119119
D3DLOCKED_RECT lockedRect = {};
120120
sharingFunctions->setDevice(resourceDevice);
121121
if (sharedResource && !context->getInteropUserSyncEnabled()) {
@@ -128,15 +128,15 @@ void D3DSurface::synchronizeObject(UpdateData *updateData) {
128128
sharingFunctions->lockRect(d3d9SurfaceStaging, &lockedRect, D3DLOCK_READONLY);
129129
}
130130

131-
auto image = castToObjectOrAbort<Image>(updateData->memObject);
131+
auto image = castToObjectOrAbort<Image>(updateData.memObject);
132132
auto sys = lockedRect.pBits;
133133
auto gpu = context->getMemoryManager()->lockResource(image->getGraphicsAllocation());
134134
auto pitch = static_cast<ULONG>(lockedRect.Pitch);
135135
auto height = static_cast<ULONG>(image->getImageDesc().image_height);
136136

137137
image->getGraphicsAllocation()->gmm->resourceCopyBlt(sys, gpu, pitch, height, 1u, oclPlane);
138138

139-
context->getMemoryManager()->unlockResource(updateData->memObject->getGraphicsAllocation());
139+
context->getMemoryManager()->unlockResource(updateData.memObject->getGraphicsAllocation());
140140

141141
if (lockable) {
142142
sharingFunctions->unlockRect(d3d9Surface);
@@ -146,7 +146,7 @@ void D3DSurface::synchronizeObject(UpdateData *updateData) {
146146

147147
sharingFunctions->flushAndWait(d3dQuery);
148148
}
149-
updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
149+
updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
150150
}
151151

152152
void D3DSurface::releaseResource(MemObj *memObject) {
@@ -314,9 +314,8 @@ cl_int D3DSurface::findImgFormat(D3DFORMAT d3dFormat, cl_image_format &imgFormat
314314
return CL_SUCCESS;
315315
}
316316

317-
int D3DSurface::validateUpdateData(UpdateData *updateData) {
318-
UNRECOVERABLE_IF(updateData == nullptr);
319-
auto image = castToObject<Image>(updateData->memObject);
317+
int D3DSurface::validateUpdateData(UpdateData &updateData) {
318+
auto image = castToObject<Image>(updateData.memObject);
320319
if (!image) {
321320
return CL_INVALID_MEM_OBJECT;
322321
}

‎runtime/sharings/d3d/d3d_surface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class D3DSurface : public D3DSharing<D3DTypesHelper::D3D9> {
3939
static Image *create(Context *context, cl_dx9_surface_info_khr *surfaceInfo, cl_mem_flags flags,
4040
cl_dx9_media_adapter_type_khr adapterType, cl_uint plane, cl_int *retCode);
4141
static cl_int findImgFormat(D3DFORMAT d3dFormat, cl_image_format &imgFormat, cl_uint plane, OCLPlane &oclPlane);
42-
void synchronizeObject(UpdateData *updateData) override;
42+
void synchronizeObject(UpdateData &updateData) override;
4343
void releaseResource(MemObj *memObject) override;
44-
int validateUpdateData(UpdateData *updateData) override;
44+
int validateUpdateData(UpdateData &updateData) override;
4545

4646
cl_dx9_surface_info_khr &getSurfaceInfo() { return surfaceInfo; }
4747
cl_dx9_media_adapter_type_khr &getAdapterType() { return adapterType; }

‎runtime/sharings/sharing.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int SharingHandler::acquire(MemObj *memObj) {
3333
auto currentSharedHandle = memObj->getGraphicsAllocation()->peekSharedHandle();
3434
updateData.sharedHandle = currentSharedHandle;
3535
updateData.memObject = memObj;
36-
int result = synchronizeHandler(&updateData);
36+
int result = synchronizeHandler(updateData);
3737
resolveGraphicsAllocationChange(currentSharedHandle, &updateData);
3838
if (result != CL_SUCCESS) {
3939
return result;
@@ -48,16 +48,15 @@ int SharingHandler::acquire(MemObj *memObj) {
4848
return CL_SUCCESS;
4949
}
5050

51-
int SharingHandler::synchronizeHandler(UpdateData *updateData) {
51+
int SharingHandler::synchronizeHandler(UpdateData &updateData) {
5252
auto result = validateUpdateData(updateData);
5353
if (result == CL_SUCCESS) {
5454
synchronizeObject(updateData);
5555
}
5656
return result;
5757
}
5858

59-
int SharingHandler::validateUpdateData(UpdateData *updateData) {
60-
UNRECOVERABLE_IF(updateData == nullptr);
59+
int SharingHandler::validateUpdateData(UpdateData &updateData) {
6160
return CL_SUCCESS;
6261
}
6362

‎runtime/sharings/sharing.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ class SharingHandler {
5858
virtual void releaseReusedGraphicsAllocation(){};
5959

6060
protected:
61-
virtual int synchronizeHandler(UpdateData *updateData);
62-
virtual int validateUpdateData(UpdateData *updateData);
63-
virtual void synchronizeObject(UpdateData *updateData) { updateData->synchronizationStatus = SYNCHRONIZE_ERROR; }
61+
virtual int synchronizeHandler(UpdateData &updateData);
62+
virtual int validateUpdateData(UpdateData &updateData);
63+
virtual void synchronizeObject(UpdateData &updateData) { updateData.synchronizationStatus = SYNCHRONIZE_ERROR; }
6464
virtual void resolveGraphicsAllocationChange(osHandle currentSharedHandle, UpdateData *updateData);
6565
virtual void releaseResource(MemObj *memObject){};
6666
unsigned int acquireCount = 0u;

‎runtime/sharings/va/va_surface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sh
9999
return image;
100100
}
101101

102-
void VASurface::synchronizeObject(UpdateData *updateData) {
102+
void VASurface::synchronizeObject(UpdateData &updateData) {
103103
if (!interopUserSync) {
104104
sharingFunctions->syncSurface(*surfaceId);
105105
}
106-
updateData->synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
106+
updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
107107
}
108108

109109
void VASurface::getMemObjectInfo(size_t &paramValueSize, void *&paramValue) {

‎runtime/sharings/va/va_surface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class VASurface : VASharing {
3434
cl_mem_flags flags, VASurfaceID *surface, cl_uint plane,
3535
cl_int *errcodeRet);
3636

37-
void synchronizeObject(UpdateData *updateData) override;
37+
void synchronizeObject(UpdateData &updateData) override;
3838

3939
void getMemObjectInfo(size_t &paramValueSize, void *&paramValue) override;
4040

‎unit_tests/command_queue/command_queue_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,8 @@ TEST(CommandQueue, givenEnqueueAcquireSharedObjectsWhenNoObjectsThenReturnSucces
758758

759759
class MockSharingHandler : public SharingHandler {
760760
public:
761-
void synchronizeObject(UpdateData *updateData) override {
762-
updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
761+
void synchronizeObject(UpdateData &updateData) override {
762+
updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
763763
}
764764
};
765765

@@ -902,7 +902,7 @@ TEST(CommandQueue, givenEnqueueReleaseSharedObjectsWhenIncorrectArgumentsThenRet
902902

903903
TEST(CommandQueue, givenEnqueueAcquireSharedObjectsCallWhenAcquireFailsThenCorrectErrorIsReturned) {
904904
class MockSharingHandler : public SharingHandler {
905-
int validateUpdateData(UpdateData *data) override {
905+
int validateUpdateData(UpdateData &data) override {
906906
return CL_INVALID_MEM_OBJECT;
907907
}
908908
};

‎unit_tests/d3d_sharing/d3d_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ TEST(D3DSurfaceTest, givenD3DSurfaceWhenInvalidMemObjectIsPassedToValidateUpdate
14711471
MockBuffer buffer;
14721472
UpdateData updateData;
14731473
updateData.memObject = &buffer;
1474-
auto result = surface->validateUpdateData(&updateData);
1474+
auto result = surface->validateUpdateData(updateData);
14751475
EXPECT_EQ(CL_INVALID_MEM_OBJECT, result);
14761476
}
14771477
} // namespace OCLRT

‎unit_tests/kernel/kernel_image_arg_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ TEST_F(KernelImageArgTest, givenNullKernelWhenClSetKernelArgCalledThenInvalidKer
251251

252252
class MockSharingHandler : public SharingHandler {
253253
public:
254-
void synchronizeObject(UpdateData *updateData) override {
255-
updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
254+
void synchronizeObject(UpdateData &updateData) override {
255+
updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
256256
}
257257
};
258258

‎unit_tests/sharings/sharing_tests.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ using namespace OCLRT;
3030

3131
TEST(sharingHandler, givenBasicSharingHandlerWhenSynchronizeObjectThenErrorIsReturned) {
3232
struct SH : SharingHandler {
33-
int synchronizeHandlerMock(UpdateData *updateData) { return synchronizeHandler(updateData); }
33+
int synchronizeHandlerMock(UpdateData &updateData) { return synchronizeHandler(updateData); }
3434

3535
} sharingHandler;
3636

3737
UpdateData updateData;
38-
sharingHandler.synchronizeHandlerMock(&updateData);
38+
sharingHandler.synchronizeHandlerMock(updateData);
3939
EXPECT_EQ(SynchronizeStatus::SYNCHRONIZE_ERROR, updateData.synchronizationStatus);
4040

4141
size_t paramSize = 0;
@@ -62,8 +62,8 @@ TEST(sharingHandler, givenMemObjWhenAcquireIncrementCounterThenReleaseShouldDecr
6262
SharingHandler::release(memObj);
6363
return acquireCount;
6464
}
65-
void synchronizeObject(UpdateData *updateData) override {
66-
updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
65+
void synchronizeObject(UpdateData &updateData) override {
66+
updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
6767
}
6868
} sharingHandler;
6969

@@ -90,8 +90,8 @@ TEST(sharingHandler, givenMemObjWhenAcquireTwoTimesThenReleaseShouldBeCalledTwoT
9090
SharingHandler::release(memObj);
9191
return acquireCount;
9292
}
93-
void synchronizeObject(UpdateData *updateData) override {
94-
updateData->synchronizationStatus = ACQUIRE_SUCCESFUL;
93+
void synchronizeObject(UpdateData &updateData) override {
94+
updateData.synchronizationStatus = ACQUIRE_SUCCESFUL;
9595
}
9696
void releaseResource(MemObj *memObject) override {
9797
releaseCount++;
@@ -113,7 +113,7 @@ TEST(sharingHandler, givenSharingHandlerWhenValidateUpdateDataIsCalledWithNonNul
113113
};
114114
MockSharingHandler sharingHandler;
115115
UpdateData updateData;
116-
sharingHandler.validateUpdateData(&updateData);
116+
sharingHandler.validateUpdateData(updateData);
117117
}
118118

119119
TEST(sharingHandler, givenSharingHandlerWhenAcquiringThenReturnErrorCode) {

0 commit comments

Comments
 (0)