Skip to content

Commit e2f6479

Browse files
aarongreigaarongreig
committed
Replace exp functions on the sycl side
1 parent d5cd646 commit e2f6479

File tree

19 files changed

+59
-141
lines changed

19 files changed

+59
-141
lines changed

‎sycl/source/backend.cpp

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -226,23 +226,13 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
226226
switch (BinaryType) {
227227
case (UR_PROGRAM_BINARY_TYPE_NONE):
228228
if (State == bundle_state::object) {
229-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramCompileExp>(
230-
UrProgram, 1, &Dev, nullptr);
231-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
232-
Res = Adapter->call_nocheck<UrApiKind::urProgramCompile>(
233-
ContextImpl->getHandleRef(), UrProgram, nullptr);
234-
}
235-
Adapter->checkUrResult<errc::build>(Res);
229+
Adapter->call<errc::build, UrApiKind::urProgramCompile>(UrProgram, 1,
230+
&Dev, nullptr);
236231
}
237232

238233
else if (State == bundle_state::executable) {
239-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramBuildExp>(
240-
UrProgram, 1, &Dev, nullptr);
241-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
242-
Res = Adapter->call_nocheck<UrApiKind::urProgramBuild>(
243-
ContextImpl->getHandleRef(), UrProgram, nullptr);
244-
}
245-
Adapter->checkUrResult<errc::build>(Res);
234+
Adapter->call<errc::build, UrApiKind::urProgramBuild>(UrProgram, 1,
235+
&Dev, nullptr);
246236
}
247237

248238
break;
@@ -255,15 +245,9 @@ make_kernel_bundle(ur_native_handle_t NativeHandle,
255245
detail::codeToString(UR_RESULT_ERROR_INVALID_VALUE));
256246
if (State == bundle_state::executable) {
257247
ur_program_handle_t UrLinkedProgram = nullptr;
258-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramLinkExp>(
248+
Adapter->call<errc::build, UrApiKind::urProgramLink>(
259249
ContextImpl->getHandleRef(), 1, &Dev, 1, &UrProgram, nullptr,
260250
&UrLinkedProgram);
261-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
262-
Res = Adapter->call_nocheck<UrApiKind::urProgramLink>(
263-
ContextImpl->getHandleRef(), 1, &UrProgram, nullptr,
264-
&UrLinkedProgram);
265-
}
266-
Adapter->checkUrResult<errc::build>(Res);
267251
if (UrLinkedProgram != nullptr) {
268252
UrProgram = UrLinkedProgram;
269253
}

‎sycl/source/detail/device_image_impl.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -944,13 +944,8 @@ class device_image_impl {
944944
} // if(!FetchedFromCache)
945945

946946
std::string XsFlags = extractXsFlags(BuildOptions);
947-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramBuildExp>(
947+
Adapter->call<errc::build, UrApiKind::urProgramBuild>(
948948
UrProgram, DeviceVec.size(), DeviceVec.data(), XsFlags.c_str());
949-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
950-
Res = Adapter->call_nocheck<UrApiKind::urProgramBuild>(
951-
ContextImpl->getHandleRef(), UrProgram, XsFlags.c_str());
952-
}
953-
Adapter->checkUrResult<errc::build>(Res);
954949

955950
// Get the number of kernels in the program.
956951
size_t NumKernels;

‎sycl/source/detail/program_manager/program_manager.cpp

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,15 +1323,8 @@ static ur_result_t doCompile(const AdapterPtr &Adapter,
13231323
ur_program_handle_t Program, uint32_t NumDevs,
13241324
ur_device_handle_t *Devs, ur_context_handle_t Ctx,
13251325
const char *Opts) {
1326-
// Try to compile with given devices, fall back to compiling with the program
1327-
// context if unsupported by the adapter
1328-
auto Result = Adapter->call_nocheck<UrApiKind::urProgramCompileExp>(
1329-
Program, NumDevs, Devs, Opts);
1330-
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
1331-
return Adapter->call_nocheck<UrApiKind::urProgramCompile>(Ctx, Program,
1332-
Opts);
1333-
}
1334-
return Result;
1326+
return Adapter->call_nocheck<UrApiKind::urProgramCompile>(Program, NumDevs,
1327+
Devs, Opts);
13351328
}
13361329

13371330
static ur_program_handle_t
@@ -1745,12 +1738,8 @@ ProgramManager::ProgramPtr ProgramManager::build(
17451738
const std::string &Options = LinkOptions.empty()
17461739
? CompileOptions
17471740
: (CompileOptions + " " + LinkOptions);
1748-
ur_result_t Error = Adapter->call_nocheck<UrApiKind::urProgramBuildExp>(
1741+
ur_result_t Error = Adapter->call_nocheck<UrApiKind::urProgramBuild>(
17491742
Program.get(), Devices.size(), Devices.data(), Options.c_str());
1750-
if (Error == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
1751-
Error = Adapter->call_nocheck<UrApiKind::urProgramBuild>(
1752-
Context->getHandleRef(), Program.get(), Options.c_str());
1753-
}
17541743

17551744
if (Error != UR_RESULT_SUCCESS)
17561745
throw detail::set_ur_error(
@@ -1780,16 +1769,10 @@ ProgramManager::ProgramPtr ProgramManager::build(
17801769

17811770
ur_program_handle_t LinkedProg = nullptr;
17821771
auto doLink = [&] {
1783-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramLinkExp>(
1772+
return Adapter->call_nocheck<UrApiKind::urProgramLink>(
17841773
Context->getHandleRef(), Devices.size(), Devices.data(),
17851774
LinkPrograms.size(), LinkPrograms.data(), LinkOptions.c_str(),
17861775
&LinkedProg);
1787-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
1788-
Res = Adapter->call_nocheck<UrApiKind::urProgramLink>(
1789-
Context->getHandleRef(), LinkPrograms.size(), LinkPrograms.data(),
1790-
LinkOptions.c_str(), &LinkedProg);
1791-
}
1792-
return Res;
17931776
};
17941777
ur_result_t Error = doLink();
17951778
if (Error == UR_RESULT_ERROR_OUT_OF_RESOURCES ||
@@ -3008,16 +2991,10 @@ ProgramManager::link(const DevImgPlainWithDeps &ImgWithDeps,
30082991

30092992
ur_program_handle_t LinkedProg = nullptr;
30102993
auto doLink = [&] {
3011-
auto Res = Adapter->call_nocheck<UrApiKind::urProgramLinkExp>(
2994+
return Adapter->call_nocheck<UrApiKind::urProgramLink>(
30122995
ContextImpl->getHandleRef(), URDevices.size(), URDevices.data(),
30132996
URPrograms.size(), URPrograms.data(), LinkOptionsStr.c_str(),
30142997
&LinkedProg);
3015-
if (Res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
3016-
Res = Adapter->call_nocheck<UrApiKind::urProgramLink>(
3017-
ContextImpl->getHandleRef(), URPrograms.size(), URPrograms.data(),
3018-
LinkOptionsStr.c_str(), &LinkedProg);
3019-
}
3020-
return Res;
30212998
};
30222999
ur_result_t Error = doLink();
30233000
if (Error == UR_RESULT_ERROR_OUT_OF_RESOURCES ||

‎sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ int main(int argc, char **argv) {
9292
}
9393

9494
// --- Check that only two JIT compilation happened:
95-
// CHECK-COUNT-2: <--- urProgramBuildExp
96-
// CHECK-NOT: <--- urProgramBuildExp
95+
// CHECK-COUNT-2: <--- urProgramBuild
96+
// CHECK-NOT: <--- urProgramBuild
9797
// --- Check that the test completed with expected results:
9898
// CHECK: passed

‎sycl/test-e2e/ESIMD/sycl_esimd_mix.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ int main(void) {
119119

120120
// Regular SYCL kernel is compiled without -vc-codegen option
121121

122-
// Some backends will call urProgramBuild and some will call
123-
// urProgramBuildExp depending on urProgramBuildExp support.
124-
125-
// CHECK-LABEL: <--- urProgramBuild{{(Exp)?}}
122+
// CHECK-LABEL: <--- urProgramBuild
126123
// CHECK-NOT: -vc-codegen
127124
// CHECK-WITH-VAR: -g
128125
// CHECK-NOT: -vc-codegen
@@ -134,7 +131,7 @@ int main(void) {
134131
// For ESIMD kernels, -vc-codegen option is always preserved,
135132
// regardless of SYCL_PROGRAM_COMPILE_OPTIONS value.
136133

137-
// CHECK-LABEL: <--- urProgramBuild{{(Exp)?}}
134+
// CHECK-LABEL: <--- urProgramBuild
138135
// CHECK-NO-VAR: -vc-codegen
139136
// CHECK-WITH-VAR: -g -vc-codegen
140137
// CHECK: {{.*}}-> UR_RESULT_SUCCESS

‎sycl/test-e2e/Graph/Explicit/kernel_bundle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// CHECK-SAME: .phProgram = {{.*}} ([[PROGRAM_HANDLE1:[0-9a-fA-Fx]+]])
1010

1111
//
12-
// CHECK:<--- urProgramBuildExp(
12+
// CHECK:<--- urProgramBuild(
1313
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]]
1414
//
1515
// CHECK:<--- urProgramRetain(.hProgram = [[PROGRAM_HANDLE1]]) -> UR_RESULT_SUCCESS

‎sycl/test-e2e/Graph/RecordReplay/kernel_bundle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// CHECK-SAME: .phProgram = {{.*}} ([[PROGRAM_HANDLE1:[0-9a-fA-Fx]+]])
1010
// CHECK-SAME: -> UR_RESULT_SUCCESS;
1111
//
12-
// CHECK:<--- urProgramBuildExp(
12+
// CHECK:<--- urProgramBuild(
1313
// CHECK-SAME: .hProgram = [[PROGRAM_HANDLE1]]
1414
//
1515
// CHECK:<--- urProgramRetain(

‎sycl/test-e2e/KernelAndProgram/cache_env_vars.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@
2222
// CPU OCL JIT 0.12 0.12 0.16 1.1 16
2323
// CPU OCL Cache 0.01 0.01 0.01 0.02 0.08
2424

25-
// Some backends will call urProgramBuild and some will call
26-
// urProgramBuildExp depending on urProgramBuildExp support.
27-
2825
// CHECK-BUILD-NOT: <--- urProgramCreateWithBinary(
2926
// CHECK-BUILD: <--- urProgramCreateWithIL(
30-
// CHECK-BUILD: <--- urProgramBuild{{(Exp)?}}(
27+
// CHECK-BUILD: <--- urProgramBuild(
3128

3229
// CHECK-CACHE-NOT: <--- urProgramCreateWithIL(
3330
// CHECK-CACHE: <--- urProgramCreateWithBinary(
34-
// CHECK-CACHE: <--- urProgramBuild{{(Exp)?}}(
31+
// CHECK-CACHE: <--- urProgramBuild(
3532

3633
#include "cache_env_vars.hpp"

‎sycl/test-e2e/KernelAndProgram/cache_env_vars_lin.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-BUILD
2323
// RUN: env SYCL_CACHE_PERSISTENT=1 HOME=%t/cache_dir SYCL_UR_TRACE=2 env -u XDG_CACHE_HOME env -u SYCL_CACHE_DIR %{run} %t.out | FileCheck %s --check-prefixes=CHECK-CACHE
2424

25-
// Some backends will call urProgramBuild and some will call urProgramBuildExp depending on urProgramBuildExp support.
26-
2725
// CHECK-BUILD-NOT: <--- urProgramCreateWithBinary(
2826
// CHECK-BUILD: <--- urProgramCreateWithIL(
29-
// CHECK-BUILD: <--- urProgramBuild{{(Exp)?}}(
27+
// CHECK-BUILD: <--- urProgramBuild(
3028

3129
// CHECK-CACHE-NOT: <--- urProgramCreateWithIL(
3230
// CHECK-CACHE: <--- urProgramCreateWithBinary(
33-
// CHECK-CACHE: <--- urProgramBuild{{(Exp)?}}(
31+
// CHECK-CACHE: <--- urProgramBuild(
3432

3533
#include "cache_env_vars.hpp"

‎sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@
33
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s
44
// UNSUPPORTED: hip
55

6-
// Note that the UR call might be urProgramBuild OR urProgramBuildExp .
7-
// The same is true for Compile and Link.
8-
// We want the first match. Don't put parentheses after.
9-
106
#include "kernel-bundle-merge-options.hpp"
117

12-
// CHECK: <--- urProgramBuild
8+
// CHECK: <--- urProgramBuild(
139
// CHECK-SAME: -g
1410

15-
// CHECK: <--- urProgramCompile
11+
// CHECK: <--- urProgramCompile(
1612
// CHECK-SAME: -g
1713

1814
// TODO: Uncomment when build options are properly passed to link
1915
// commands for kernel_bundle
20-
// xCHECK: <--- urProgramLink
16+
// xCHECK: <--- urProgramLink(
2117
// xCHECK-SAME: -g

‎sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: env SYCL_UR_TRACE=2 %{run} %t_without.out 2>&1 | FileCheck %if system-windows %{ --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %} %else %{ --check-prefix=CHECK-OPT %} %s
99
// RUN: env SYCL_UR_TRACE=2 %{run} %t_default.out 2>&1 | FileCheck --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %s
1010

11-
// CHECK-OPT: <--- urProgramBuildExp(
11+
// CHECK-OPT: <--- urProgramBuild(
1212
// CHECK-SAME-OPT: -ze-intel-enable-auto-large-GRF-mode
1313

1414
#include <sycl/detail/core.hpp>

‎sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ int main() {
3333
sycl::kernel_bundle kernelBundleInput =
3434
sycl::get_kernel_bundle<sycl::bundle_state::input>(ctx, {kid});
3535
// CHECK: urProgramCreateWithIL(
36-
// CHECK: urProgramBuildExp(
36+
// CHECK: urProgramBuild(
3737
auto KernelBundleExe1 = build(kernelBundleInput, {dev1, dev2});
3838
// CHECK: urProgramCreateWithIL(
39-
// CHECK: urProgramBuildExp(
39+
// CHECK: urProgramBuild(
4040
auto KernelBundleExe2 = build(kernelBundleInput, {dev2, dev3});
4141
// No other program creation calls are expected.
4242
// CHECK-NOT: urProgramCreateWithIL(

‎sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ int main() {
7373
// Create and compile the program for required device libraries (2 of them
7474
// in this case).
7575
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCreateWithIL(
76-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompileExp(
76+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompile(
7777
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCreateWithIL(
78-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompileExp(
78+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompile(
7979

8080
// Compile the main program
81-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompileExp(
81+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompile(
8282

8383
// Link main program and device libraries.
84-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramLinkExp(
84+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramLink(
8585

8686
// CHECK-AOT-TRACE: urProgramCreateWithBinary(
87-
// CHECK-AOT-TRACE: urProgramBuildExp(
87+
// CHECK-AOT-TRACE: urProgramBuild(
8888
sycl::kernel_bundle kernelBundleExecutable =
8989
sycl::get_kernel_bundle<sycl::bundle_state::executable>(
9090
ctx, {dev1, dev2, dev3}, {kid});
@@ -131,16 +131,16 @@ int main() {
131131
// creation is expected for device libraries as program handle already
132132
// exists in the per-context cache.
133133
// CHECK-SPIRV-JIT-LINK-TRACE-NOT: urProgramCreateWithIL(
134-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompileExp(
134+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompile(
135135

136136
// Main program will be compiled for new set of devices.
137-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompileExp(
137+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramCompile(
138138

139139
// Main program will be linked with device libraries.
140-
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramLinkExp(
140+
// CHECK-SPIRV-JIT-LINK-TRACE: urProgramLink(
141141

142142
// CHECK-AOT-TRACE: urProgramCreateWithBinary(
143-
// CHECK-AOT-TRACE: urProgramBuildExp(
143+
// CHECK-AOT-TRACE: urProgramBuild(
144144
sycl::kernel_bundle kernelBundleExecutableNewSet =
145145
sycl::get_kernel_bundle<sycl::bundle_state::executable>(
146146
ctx, {dev2, dev3, dev4}, {kid});

‎sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int main() {
4343
}
4444

4545
// --- Check that only a single program is built:
46-
// CHECK: <--- urProgramBuildExp
47-
// CHECK-NOT: <--- urProgramBuildExp
46+
// CHECK: <--- urProgramBuild
47+
// CHECK-NOT: <--- urProgramBuild
4848
// --- Check that the test completed with expected results:
4949
// CHECK: passed

‎sycl/unittests/helpers/RuntimeLinkingCommon.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ static ur_result_t redefined_urProgramCreateWithBinary(void *pParams) {
4848
return UR_RESULT_SUCCESS;
4949
}
5050

51-
static ur_result_t redefined_urProgramLinkExp(void *pParams) {
52-
auto Params = *static_cast<ur_program_link_exp_params_t *>(pParams);
51+
static ur_result_t redefined_urProgramLink(void *pParams) {
52+
auto Params = *static_cast<ur_program_link_params_t *>(pParams);
5353
unsigned ResProgram = 1;
5454
auto Programs = *Params.pphPrograms;
5555
for (uint32_t I = 0; I < *Params.pcount; ++I) {
@@ -82,8 +82,8 @@ static void setupRuntimeLinkingMock() {
8282
redefined_urProgramCreateWithIL);
8383
mock::getCallbacks().set_replace_callback(
8484
"urProgramCreateWithBinary", redefined_urProgramCreateWithBinary);
85-
mock::getCallbacks().set_replace_callback("urProgramLinkExp",
86-
redefined_urProgramLinkExp);
85+
mock::getCallbacks().set_replace_callback("urProgramLink",
86+
redefined_urProgramLink);
8787
mock::getCallbacks().set_replace_callback("urKernelCreate",
8888
redefined_urKernelCreate);
8989
}

‎sycl/unittests/kernel-and-program/KernelBuildOptions.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct KernelInfo<BuildOptsTestKernel> : public unittest::MockKernelInfoBase {
3535
} // namespace sycl
3636

3737
static ur_result_t redefinedProgramBuild(void *pParams) {
38-
auto params = *static_cast<ur_program_build_exp_params_t *>(pParams);
38+
auto params = *static_cast<ur_program_build_params_t *>(pParams);
3939
if (*params.ppOptions)
4040
BuildOpts = *params.ppOptions;
4141
else
@@ -44,7 +44,7 @@ static ur_result_t redefinedProgramBuild(void *pParams) {
4444
}
4545

4646
static ur_result_t redefinedProgramCompile(void *pParams) {
47-
auto params = *static_cast<ur_program_compile_exp_params_t *>(pParams);
47+
auto params = *static_cast<ur_program_compile_params_t *>(pParams);
4848
if (*params.ppOptions)
4949
BuildOpts = *params.ppOptions;
5050
else
@@ -53,7 +53,7 @@ static ur_result_t redefinedProgramCompile(void *pParams) {
5353
}
5454

5555
static ur_result_t redefinedProgramLink(void *pParams) {
56-
auto params = *static_cast<ur_program_link_exp_params_t *>(pParams);
56+
auto params = *static_cast<ur_program_link_params_t *>(pParams);
5757
if (*params.ppOptions)
5858
BuildOpts = *params.ppOptions;
5959
else
@@ -63,11 +63,11 @@ static ur_result_t redefinedProgramLink(void *pParams) {
6363

6464
static void setupCommonMockAPIs(sycl::unittest::UrMock<> &Mock) {
6565
using namespace sycl::detail;
66-
mock::getCallbacks().set_before_callback("urProgramCompileExp",
66+
mock::getCallbacks().set_before_callback("urProgramCompile",
6767
&redefinedProgramCompile);
68-
mock::getCallbacks().set_before_callback("urProgramLinkExp",
68+
mock::getCallbacks().set_before_callback("urProgramLink",
6969
&redefinedProgramLink);
70-
mock::getCallbacks().set_before_callback("urProgramBuildExp",
70+
mock::getCallbacks().set_before_callback("urProgramBuild",
7171
&redefinedProgramBuild);
7272
}
7373

‎sycl/unittests/kernel-and-program/OutOfResources.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ TEST_P(OutOfResourcesTestSuite, urProgramLink) {
127127
nProgramLink = 0;
128128
sycl::unittest::UrMock<> Mock;
129129
ErrorCode = GetParam();
130-
mock::getCallbacks().set_before_callback("urProgramLinkExp",
130+
mock::getCallbacks().set_before_callback("urProgramLink",
131131
&redefinedProgramLink);
132132

133133
sycl::platform Plt{sycl::platform()};

0 commit comments

Comments
 (0)