Skip to content

Commit d1e0768

Browse files
Remove unused code
Change-Id: I342f58dc72a6ed5a9b9d9d30d5c43a109da5ff5b Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
1 parent 9790c29 commit d1e0768

File tree

6 files changed

+4
-56
lines changed

6 files changed

+4
-56
lines changed

opencl/source/api/api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5389,7 +5389,7 @@ cl_int CL_API_CALL clSetProgramReleaseCallback(cl_program program,
53895389
reinterpret_cast<void *>(pfnNotify));
53905390

53915391
if (retVal == CL_SUCCESS) {
5392-
retVal = pProgram->setReleaseCallback(pfnNotify, userData);
5392+
retVal = CL_INVALID_OPERATION;
53935393
}
53945394

53955395
return retVal;

opencl/source/helpers/destructor_callback.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ class DestructorCallback {
2828

2929
using ContextDestructorCallback = DestructorCallback<cl_context>;
3030
using MemObjDestructorCallback = DestructorCallback<cl_mem>;
31-
using ProgramReleaseCallback = DestructorCallback<cl_program>;
3231

3332
} // namespace NEO

opencl/source/program/program.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@ Program::Program(ExecutionEnvironment &executionEnvironment, Context *context, b
113113
}
114114

115115
Program::~Program() {
116-
for (auto callback : releaseCallbacks) {
117-
callback->invoke(this);
118-
delete callback;
119-
}
120-
121116
cleanCurrentKernelInfo();
122117

123118
freeBlockResources();
@@ -271,15 +266,6 @@ cl_int Program::updateSpecializationConstant(cl_uint specId, size_t specSize, co
271266
return CL_INVALID_SPEC_ID;
272267
}
273268

274-
cl_int Program::setReleaseCallback(void(CL_CALLBACK *funcNotify)(cl_program, void *),
275-
void *userData) {
276-
auto cb = new ProgramReleaseCallback(funcNotify, userData);
277-
278-
std::unique_lock<std::mutex> theLock(mtx);
279-
releaseCallbacks.push_front(cb);
280-
return CL_SUCCESS;
281-
}
282-
283269
void Program::setDevice(Device *device) {
284270
this->pDevice = device;
285271
}

opencl/source/program/program.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ class Program : public BaseObject<_cl_program> {
151151
cl_int setProgramSpecializationConstant(cl_uint specId, size_t specSize, const void *specValue);
152152
MOCKABLE_VIRTUAL cl_int updateSpecializationConstant(cl_uint specId, size_t specSize, const void *specValue);
153153

154-
cl_int setReleaseCallback(void(CL_CALLBACK *funcNotify)(cl_program, void *),
155-
void *userData);
156-
157154
size_t getNumKernels() const;
158155
const KernelInfo *getKernelInfo(const char *kernelName) const;
159156
const KernelInfo *getKernelInfo(size_t ordinal) const;
@@ -351,8 +348,6 @@ class Program : public BaseObject<_cl_program> {
351348

352349
bool isBuiltIn = false;
353350
bool kernelDebugEnabled = false;
354-
355-
std::list<ProgramReleaseCallback *> releaseCallbacks;
356351
};
357352

358353
} // namespace NEO

opencl/test/unit_test/api/cl_set_program_release_callback.inl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ TEST_F(clSetProgramReleaseCallbackTests, givenPfnNotifyNullptrWhenSettingProgram
2525

2626
void CL_CALLBACK callback(cl_program, void *){};
2727

28-
TEST_F(clSetProgramReleaseCallbackTests, WhenSettingProgramReleaseCallbackThenSucccessIsReturned) {
28+
TEST_F(clSetProgramReleaseCallbackTests, WhenSettingProgramReleaseCallbackThenInvalidOperationErrorIsReturned) {
2929
auto retVal = clSetProgramReleaseCallback(pProgram, callback, nullptr);
30-
EXPECT_EQ(CL_SUCCESS, retVal);
30+
EXPECT_EQ(CL_INVALID_OPERATION, retVal);
3131

3232
auto userData = reinterpret_cast<void *>(0x4321);
3333
retVal = clSetProgramReleaseCallback(pProgram, callback, userData);
34-
EXPECT_EQ(CL_SUCCESS, retVal);
34+
EXPECT_EQ(CL_INVALID_OPERATION, retVal);
3535
}
3636

3737
} // namespace ULT

opencl/test/unit_test/program/program_tests.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3115,35 +3115,3 @@ TEST(ProgramReplaceDeviceBinary, GivenBinaryZebinThenUseAsBothPackedAndUnpackedB
31153115
EXPECT_EQ(0, memcmp(program.packedDeviceBinary.get(), zebin.storage.data(), program.packedDeviceBinarySize));
31163116
EXPECT_EQ(0, memcmp(program.unpackedDeviceBinary.get(), zebin.storage.data(), program.unpackedDeviceBinarySize));
31173117
}
3118-
3119-
TEST(Program, WhenSettingProgramReleaseCallbackThenCallOrderIsPreserved) {
3120-
struct UserDataType {
3121-
cl_program expectedProgram;
3122-
std::vector<size_t> &vectorToModify;
3123-
size_t valueToAdd;
3124-
};
3125-
auto callback = [](cl_program program, void *userData) -> void {
3126-
auto pUserData = reinterpret_cast<UserDataType *>(userData);
3127-
EXPECT_EQ(pUserData->expectedProgram, program);
3128-
pUserData->vectorToModify.push_back(pUserData->valueToAdd);
3129-
};
3130-
3131-
MockExecutionEnvironment executionEnvironment;
3132-
auto pProgram = new MockProgram{executionEnvironment};
3133-
std::vector<size_t> callbacksReturnValues;
3134-
UserDataType userDataArray[]{
3135-
{pProgram, callbacksReturnValues, 1},
3136-
{pProgram, callbacksReturnValues, 2},
3137-
{pProgram, callbacksReturnValues, 3}};
3138-
3139-
for (auto &userData : userDataArray) {
3140-
cl_int retVal = clSetProgramReleaseCallback(pProgram, callback, &userData);
3141-
ASSERT_EQ(CL_SUCCESS, retVal);
3142-
}
3143-
delete pProgram;
3144-
3145-
ASSERT_EQ(3u, callbacksReturnValues.size());
3146-
EXPECT_EQ(3u, callbacksReturnValues[0]);
3147-
EXPECT_EQ(2u, callbacksReturnValues[1]);
3148-
EXPECT_EQ(1u, callbacksReturnValues[2]);
3149-
}

0 commit comments

Comments
 (0)