[szs] Misc improvements

Author: snailspeed3

source/szs/benches/deinterlace_bench.rs

@@ -5,10 +5,10 @@ use std::io::Read;
 use szs;
 
 pub fn deinterlace_benchmark(c: &mut Criterion) {
+    /*
     let mut file = File::open("8-43.szs").expect("File not found");
     let mut data = Vec::new();
     file.read_to_end(&mut data).expect("Error reading file");
-    /*
     c.bench_function("deinterlace without C version", |b| {
         b.iter(|| {
             szs::deinterlace(black_box(&data) /*, black_box(false)*/).expect("Deinterlace failed")

source/szs/benches/mkw_bench.rs

@@ -5,7 +5,7 @@ use std::io::Read;
 use szs;
 
 pub fn mkw_benches(c: &mut Criterion) {
-    let mut file = File::open("../../tests/samples/old_koopa_64.arc").expect("File not found");
+    let mut file = File::open("../../tests/samples_szs/old_koopa_64.arc").expect("File not found");
     let mut data = Vec::new();
     file.read_to_end(&mut data).expect("Error reading file");
 
@@ -35,12 +35,31 @@ pub fn mkw_benches(c: &mut Criterion) {
     });
 }
 
+pub fn mk8_benches2(c: &mut Criterion) {
+    let mut file = File::open("../../tests/samples_szs/8-43.arc").expect("File not found");
+    let mut data = Vec::new();
+    file.read_to_end(&mut data).expect("Error reading file");
+
+    
+    c.bench_function("Rust encoder", |b| {
+        b.iter(|| {
+            szs::encode(black_box(&data), black_box(szs::EncodeAlgo::MK8_Rust))
+                .expect("encode failed")
+        })
+    });
+    c.bench_function("C encoder", |b| {
+        b.iter(|| {
+            szs::encode(black_box(&data), black_box(szs::EncodeAlgo::MK8)).expect("encode failed")
+        })
+    });
+}
+
 pub fn configure() -> Criterion {
-    Criterion::default().sample_size(100)
+    Criterion::default()
 }
 criterion_group! {
     name = benches;
     config = configure();
-    targets = mkw_benches
+    targets = mk8_benches2
 }
 criterion_main!(benches);

source/szs/szstool/Cargo.lock

@@ -2,6 +2,7 @@ use anyhow;
 use clap::{Arg, Command};
 use std::fs;
 use std::str::FromStr;
+use std::time::Instant;
 use szs;
 use szs::{encode, EncodeAlgo, Error};
 
@@ -71,18 +72,24 @@ fn main() {
         }
     };
 
-    match szs::encode(&input_data, algorithm) {
-        Ok(encoded_data) => {
-            if let Err(err) = fs::write(output_file, &encoded_data) {
-                eprintln!("Error writing output file: {}", err);
-                std::process::exit(1);
-            } else {
-                println!("Data encoded successfully.");
-            }
-        }
+    // Measure the time taken for the compression
+    let start_time = Instant::now();
+    let encoded_data = match szs::encode(&input_data, algorithm) {
+        Ok(data) => data,
         Err(err) => {
             eprintln!("Error encoding data: {:?}", err);
             std::process::exit(1);
         }
+    };
+    let duration = start_time.elapsed();
+    let compression_rate = encoded_data.len() as f64 / input_data.len() as f64;
+
+    if let Err(err) = fs::write(output_file, &encoded_data) {
+        eprintln!("Error writing output file: {}", err);
+        std::process::exit(1);
     }
+
+    println!("Data encoded successfully.");
+    println!("Time taken for compression: {:?}", duration);
+    println!("Compression rate: {:.2}", compression_rate);
 }