mirrors/ZLUDA
0
0
Fork 0
mirror of https://github.com/vosen/ZLUDA.git synced 2025-08-02 22:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve logging of dumps

Browse source
This commit is contained in:
Andrzej Janik 2021-12-08 00:29:00 +01:00
commit 50e793e869
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zluda_dump/src/dark_api.rs
View file

@ -491,7 +491,8 @@ unsafe fn record_submodules(
if fatbin_file_kind == FATBIN_FILE_HEADER_KIND_PTX { if fatbin_file_kind == FATBIN_FILE_HEADER_KIND_PTX {
let decompressed = decompress_kernel_module(fatbin_file); let decompressed = decompress_kernel_module(fatbin_file);
match decompressed { match decompressed {
Some(decompressed) => { Some(mut decompressed) => {
decompressed.pop(); // remove trailing zero
state.record_new_submodule(module, version, &*decompressed, fn_logger, "ptx") state.record_new_submodule(module, version, &*decompressed, fn_logger, "ptx")
} }
None => fn_logger.log(log::LogEntry::Lz4DecompressionFailure), None => fn_logger.log(log::LogEntry::Lz4DecompressionFailure),

14
zluda_dump/src/log.rs
View file

@ -368,7 +368,7 @@ impl Display for LogEntry {
observed, observed,
} => write!( } => write!(
f, f,
"Unexected field {}. Expected: [{}], observed: {}", #"Unexected field {}. Expected one of: {{{}}}, observed: {}"#,
field_name, field_name,
expected expected
.iter() .iter()
@ -381,7 +381,17 @@ impl Display for LogEntry {
arg_name, arg_name,
expected, expected,
observed, observed,
} => write!(f, "Unexected argument"), } => write!(
f,
"Unexpected argument {}. Expected one of: {{{}}}, observed: {}",
arg_name,
expected
.iter()
.map(|x| x.to_string())
.collect::<Vec<_>>()
.join(", "),
observed
),
LogEntry::MalformedFunctionName(e) => e.fmt(f), LogEntry::MalformedFunctionName(e) => e.fmt(f),
LogEntry::FunctionParameter { name, value } => write!(f, "{}: {}", name, value), LogEntry::FunctionParameter { name, value } => write!(f, "{}: {}", name, value),
} }