Log saved modules

This commit is contained in:
Andrzej Janik 2025-09-16 23:09:53 +00:00
commit 0f04a40e92
2 changed files with 87 additions and 81 deletions

View file

@ -303,6 +303,7 @@ pub(crate) enum ErrorEntry {
}, },
NullPointer(&'static str), NullPointer(&'static str),
UnknownLibrary(CUlibrary), UnknownLibrary(CUlibrary),
SavedModule(String),
} }
unsafe impl Send for ErrorEntry {} unsafe impl Send for ErrorEntry {}
@ -431,6 +432,7 @@ impl Display for ErrorEntry {
CudaDisplay::write(culibrary, "", 0, &mut temp_buffer).ok(); CudaDisplay::write(culibrary, "", 0, &mut temp_buffer).ok();
f.write_str(&unsafe { String::from_utf8_unchecked(temp_buffer) }) f.write_str(&unsafe { String::from_utf8_unchecked(temp_buffer) })
} }
ErrorEntry::SavedModule(file) => write!(f, "Saved module to {file}"),
} }
} }
} }

View file

@ -128,12 +128,11 @@ impl StateTracker {
fn_logger: &mut FnCallLog, fn_logger: &mut FnCallLog,
type_: &'static str, type_: &'static str,
) { ) {
fn_logger.log_io_error(self.writer.save_module( fn_logger.try_(|fn_logger| {
self.library_counter, self.writer
index, .save_module(fn_logger, self.library_counter, index, submodule, type_)
submodule, .map_err(ErrorEntry::IoError)
type_, });
));
if type_ == "ptx" { if type_ == "ptx" {
match CString::new(submodule) { match CString::new(submodule) {
Err(e) => fn_logger.log(log::ErrorEntry::NulInsideModuleText(e)), Err(e) => fn_logger.log(log::ErrorEntry::NulInsideModuleText(e)),
@ -323,6 +322,7 @@ impl DumpWriter {
fn save_module( fn save_module(
&self, &self,
fn_logger: &mut FnCallLog,
module_index: usize, module_index: usize,
submodule_index: Option<(usize, Option<usize>)>, submodule_index: Option<(usize, Option<usize>)>,
buffer: &[u8], buffer: &[u8],
@ -332,9 +332,13 @@ impl DumpWriter {
None => return Ok(()), None => return Ok(()),
Some(d) => d.clone(), Some(d) => d.clone(),
}; };
dump_file.push(Self::get_file_name(module_index, submodule_index, kind)); let file_name = Self::get_file_name(module_index, submodule_index, kind);
dump_file.push(&file_name);
{
let mut file = File::create_new(dump_file)?; let mut file = File::create_new(dump_file)?;
file.write_all(buffer)?; file.write_all(buffer)?;
}
fn_logger.log(ErrorEntry::SavedModule(file_name));
Ok(()) Ok(())
} }
@ -349,7 +353,7 @@ impl DumpWriter {
Some(d) => d.clone(), Some(d) => d.clone(),
}; };
log_file.push(Self::get_file_name(module_index, submodule_index, "log")); log_file.push(Self::get_file_name(module_index, submodule_index, "log"));
let mut file = File::create(log_file)?; let mut file = File::create_new(log_file)?;
for error in errors { for error in errors {
writeln!(file, "{}", error)?; writeln!(file, "{}", error)?;
} }