Skip to content

Commit

Permalink
[spv-in] refactor the matrix stride check
Browse files Browse the repository at this point in the history
  • Loading branch information
kvark committed May 26, 2021
1 parent f57739d commit badf996
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 0 additions & 2 deletions src/front/spv/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,4 @@ pub enum Error {
#[error("invalid barrier memory semantics %{0}")]
InvalidBarrierMemorySemantics(spirv::Word),
// incomplete implementation errors
#[error("unsupported matrix stride {0}")]
UnsupportedMatrixStride(spirv::Word),
}
17 changes: 14 additions & 3 deletions src/front/spv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2965,14 +2965,25 @@ impl<I: Iterator<Item = u32>> Parser<I> {
let offset = decor.offset.unwrap_or(0);

if let crate::TypeInner::Matrix {
columns: _,
columns,
rows,
width,
} = module.types[ty].inner
{
if let Some(stride) = decor.matrix_stride {
if stride.get() != (rows as u32) * (width as u32) {
return Err(Error::UnsupportedMatrixStride(stride.get()));
let rounded_rows = if rows > crate::VectorSize::Bi {
4
} else {
rows as u32
};
if stride.get() != rounded_rows * (width as u32) {
log::warn!(
"Unexpected matrix stride {} for an {}x{} matrix with scalar width={}",
stride.get(),
columns as u8,
rows as u8,
width,
);
}
}
}
Expand Down

0 comments on commit badf996

Please sign in to comment.