Skip to content

[L0] Fixed program info binary size query and fix program handle init #1983

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
omarahmed1111 merged 1 commit into from
Aug 16, 2024
Merged

[L0] Fixed program info binary size query and fix program handle init #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions source/adapters/level_zero/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramGetInfo(
uint32_t deviceIndex = 0;
for (auto &ZeDeviceModule : Program->ZeModuleMap) {
size_t binarySize = 0;
ZE2UR_CALL(
zeModuleGetNativeBinary,
(ZeDeviceModule.second, &binarySize, PBinary[deviceIndex++]));
if (PBinary) {
NativeBinaryPtr = PBinary[deviceIndex++];
}
ZE2UR_CALL(zeModuleGetNativeBinary,
(ZeDeviceModule.second, &binarySize, NativeBinaryPtr));
SzBinary += binarySize;
}
} else {
Expand Down
21 changes: 12 additions & 9 deletions source/adapters/level_zero/program.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct ur_program_handle_t_ : _ur_object {
// Construct a program in IL.
ur_program_handle_t_(state St, ur_context_handle_t Context, const void *Input,
size_t Length)
: Context{Context},
: Context{Context}, NativeDevice{nullptr}, NativeProperties{nullptr},
OwnZeModule{true}, State{St}, Code{new uint8_t[Length]},
CodeLength{Length}, ZeModule{nullptr}, ZeBuildLog{nullptr} {
std::memcpy(Code.get(), Input, Length);
Expand All @@ -89,26 +89,29 @@ struct ur_program_handle_t_ : _ur_object {
ur_program_handle_t_(state St, ur_context_handle_t Context,
ze_module_handle_t ZeModule,
ze_module_build_log_handle_t ZeBuildLog)
: Context{Context}, OwnZeModule{true}, State{St}, ZeModule{ZeModule},
ZeBuildLog{ZeBuildLog} {}
: Context{Context}, NativeDevice{nullptr}, NativeProperties{nullptr},
OwnZeModule{true}, State{St}, ZeModule{ZeModule}, ZeBuildLog{
ZeBuildLog} {}

// Construct a program in Exe state (interop).
ur_program_handle_t_(state St, ur_context_handle_t Context,
ze_module_handle_t ZeModule, bool OwnZeModule)
: Context{Context}, OwnZeModule{OwnZeModule}, State{St},
ZeModule{ZeModule}, ZeBuildLog{nullptr} {}
: Context{Context}, NativeDevice{nullptr}, NativeProperties{nullptr},
OwnZeModule{OwnZeModule}, State{St}, ZeModule{ZeModule}, ZeBuildLog{
nullptr} {}

// Construct a program from native handle
ur_program_handle_t_(state St, ur_context_handle_t Context,
ze_module_handle_t ZeModule)
: Context{Context}, OwnZeModule{true}, State{St}, ZeModule{ZeModule},
ZeBuildLog{nullptr} {}
: Context{Context}, NativeDevice{nullptr}, NativeProperties{nullptr},
OwnZeModule{true}, State{St}, ZeModule{ZeModule}, ZeBuildLog{nullptr} {}

// Construct a program in Invalid state with a custom error message.
ur_program_handle_t_(state St, ur_context_handle_t Context,
const std::string &ErrorMessage)
: Context{Context}, OwnZeModule{true}, ErrorMessage{ErrorMessage},
State{St}, ZeModule{nullptr}, ZeBuildLog{nullptr} {}
: Context{Context}, NativeDevice{nullptr}, NativeProperties{nullptr},
OwnZeModule{true}, ErrorMessage{ErrorMessage}, State{St},
ZeModule{nullptr}, ZeBuildLog{nullptr} {}

~ur_program_handle_t_();
void ur_release_program_resources(bool deletion);
Expand Down