Skip to content

[SYCL] Fix dependency compilation after PI removal #14843

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

Merged
AlexeySachkov merged 2 commits into from
Aug 1, 2024
Merged

[SYCL] Fix dependency compilation after PI removal #14843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e14f1
[SYCL] Fix dependency compilation after PI removal
sergey-semenov Jul 30, 2024
00d42c8
Add unit test
sergey-semenov Jul 31, 2024
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
11 changes: 3 additions & 8 deletions sycl/source/detail/program_manager/program_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,14 +1509,9 @@ ProgramManager::ProgramPtr ProgramManager::build(
LinkPrograms.push_back(Program.get());

for (ur_program_handle_t Prg : ExtraProgramsToLink) {
auto Result =
Plugin->call_nocheck(urProgramCompileExp, Prg, /* num devices =*/1,
&Device, CompileOptions.c_str());
if (Result == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) {
Plugin->call(urProgramCompile, Context->getHandleRef(), Prg,
CompileOptions.c_str());
}
Plugin->checkUrResult(Result);
auto Res = doCompile(Plugin, Prg, /*num devices =*/1, &Device,
Context->getHandleRef(), CompileOptions.c_str());
Plugin->checkUrResult(Res);

LinkPrograms.push_back(Prg);
}
Expand Down
26 changes: 26 additions & 0 deletions sycl/unittests/program_manager/DynamicLinking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,30 @@ TEST(DynamicLinking, AheadOfTime) {
}
}

static ur_result_t redefined_urProgramCompileExp(void *pParams) {
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
}

TEST(DynamicLinking, UnsupportedCompileExp) {
sycl::unittest::UrMock<> Mock;
setupRuntimeLinkingMock();
mock::getCallbacks().set_replace_callback("urProgramCompileExp",
redefined_urProgramCompileExp);

sycl::platform Plt = sycl::platform();
sycl::queue Q(Plt.get_devices()[0]);

CapturedLinkingData.clear();

Q.single_task<DynamicLinkingTest::BasicCaseKernel>([=]() {});
ASSERT_EQ(CapturedLinkingData.NumOfUrProgramCreateCalls, 3u);
// Both programs should be linked together.
ASSERT_EQ(CapturedLinkingData.NumOfUrProgramLinkCalls, 1u);
ASSERT_TRUE(CapturedLinkingData.LinkedProgramsContains(
{BASIC_CASE_PRG, BASIC_CASE_PRG_DEP, BASIC_CASE_PRG_DEP_DEP}));
// And the linked program should be used to create a kernel.
ASSERT_EQ(CapturedLinkingData.ProgramUsedToCreateKernel,
BASIC_CASE_PRG * BASIC_CASE_PRG_DEP * BASIC_CASE_PRG_DEP_DEP);
}

} // anonymous namespace