Skip to content

Commit c7195b0

Browse files
sergey-semenovbader
authored andcommitted
[SYCL] Fix image format reported in program manager debug messages (#934)
Replace reported integer values with strings and fix all programs being reported as created using a native image. Signed-off-by: Sergey Semenov <[email protected]>
1 parent c5318c5 commit c7195b0

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

sycl/source/detail/program_manager/program_manager.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,21 @@ static bool isDeviceBinaryTypeSupported(const context &C,
123123
return false;
124124
}
125125

126+
static const char *getFormatStr(RT::PiDeviceBinaryType Format) {
127+
switch (Format) {
128+
case PI_DEVICE_BINARY_TYPE_NONE:
129+
return "none";
130+
case PI_DEVICE_BINARY_TYPE_NATIVE:
131+
return "native";
132+
case PI_DEVICE_BINARY_TYPE_SPIRV:
133+
return "SPIR-V";
134+
case PI_DEVICE_BINARY_TYPE_LLVMIR_BITCODE:
135+
return "LLVM IR";
136+
}
137+
assert(false && "Unknown device image format");
138+
return "unknown";
139+
}
140+
126141
RT::PiProgram ProgramManager::createPIProgram(const DeviceImage &Img,
127142
const context &Context) {
128143
if (DbgProgMgr > 0)
@@ -158,7 +173,8 @@ RT::PiProgram ProgramManager::createPIProgram(const DeviceImage &Img,
158173
: createBinaryProgram(Ctx, Img.BinaryStart, ImgSize);
159174

160175
if (DbgProgMgr > 1)
161-
std::cerr << "created native program: " << Res << "\n";
176+
std::cerr << "created program: " << Res
177+
<< "; image format: " << getFormatStr(Format) << "\n";
162178

163179
return Res;
164180
}
@@ -485,7 +501,8 @@ RT::PiDeviceBinaryType ProgramManager::getFormat(const DeviceImage &Img) const {
485501
for (const auto &Fmt : Fmts) {
486502
if (Hdr == Fmt.Magic) {
487503
if (DbgProgMgr > 1)
488-
std::cerr << "determined image format: " << (int)Fmt.Fmt << "\n";
504+
std::cerr << "determined image format: " << getFormatStr(Fmt.Fmt)
505+
<< "\n";
489506
return Fmt.Fmt;
490507
}
491508
}

0 commit comments

Comments
 (0)