[cider] minor bug in fxp mult (#2283)

Corrects a regression introduced in #2281. Adds some better error reporting for the data dumps.
calyxir · Sep 16, 2024 · c66451d · c66451d
1 parent d195989
commit c66451d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/interp/src/flatten/primitives/stateful/math.rs b/interp/src/flatten/primitives/stateful/math.rs
@@ -387,7 +387,7 @@ impl<const DEPTH: usize> Primitive for FxpMultPipe<DEPTH> {
                             2 * (self.frac_width + self.int_width),
                         )
                         .slice(
-                            2 * self.frac_width + self.int_width,
+                            (2 * self.frac_width + self.int_width) - 1,
                             self.frac_width,
                         )
                     })

diff --git a/interp/src/serialization/data_dump.rs b/interp/src/serialization/data_dump.rs
@@ -201,8 +201,19 @@ impl DataDump {
         declaration: MemoryDeclaration,
         data: T,
     ) {
-        self.header.memories.push(declaration);
+        let old_len = self.data.len();
         self.data.extend(data);
+        let new_len = self.data.len();
+        let data_segment = new_len - old_len;
+        assert_eq!(
+            declaration.byte_count(),
+            data_segment,
+            "Data segment size does not match the memory declaration {:?}. Expected {} bytes, but got {}",
+            declaration,
+            declaration.byte_count(),
+            data_segment
+        );
+        self.header.memories.push(declaration);
     }
 
     pub fn push_reg<T: IntoIterator<Item = u8>>(
@@ -282,7 +293,10 @@ impl DataDump {
         // instead to avoid allowing incorrect/malformed data files
         let amount_read = reader.read_to_end(&mut data)?;
         if amount_read != header.data_size() {
-            return Err(SerializationError::MalformedData);
+            return Err(SerializationError::MalformedData {
+                expected_size: header.data_size(),
+                given_size: amount_read,
+            });
         }
 
         Ok(DataDump { header, data })
@@ -327,9 +341,12 @@ pub enum SerializationError {
     MalformedHeader,
 
     #[error(
-        "Malformed data dump, data section does not match header description"
+        "Malformed data dump, data section does not match header description. Expected {expected_size} bytes, but got {given_size} bytes"
     )]
-    MalformedData,
+    MalformedData {
+        expected_size: usize,
+        given_size: usize,
+    },
 
     #[error("Input is not a valid data dump")]
     InvalidMagicNumber,