Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SPIR-V validation of image ops with offsets #2575

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Fix SPIR-V validation of image ops with offsets #2575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a66db
Fix SPIR-V validation of image op functions with offsets
LDeakin Oct 14, 2024
2b62d7c
Rename signed `get_constant_*` functions
LDeakin Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions vulkano/src/pipeline/shader/validate_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ use crate::{
},
shader::{
reflect::{
get_constant, get_constant_composite, get_constant_composite_composite,
get_constant_float_composite, get_constant_maybe_composite, size_of_type,
get_constant, get_constant_composite, get_constant_float_composite,
get_constant_signed_composite_composite, get_constant_signed_maybe_composite,
size_of_type,
},
spirv::{
Capability, Decoration, Dim, ExecutionMode, ExecutionModel, FunctionInfo, Id,
Expand Down Expand Up @@ -2468,10 +2469,10 @@ impl<'a> RuntimeValidator<'a> {
if let Some(components) = image_operands
.const_offset
.or(image_operands.offset)
.and_then(|offset| get_constant_maybe_composite(self.spirv, offset))
.and_then(|offset| get_constant_signed_maybe_composite(self.spirv, offset))
{
for offset in components {
if offset < properties.min_texel_gather_offset as u64 {
if offset < properties.min_texel_gather_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImage*Gather` instruction is performed, but \
its `Offset`, `ConstOffset` or `ConstOffsets` \
Expand All @@ -2483,7 +2484,7 @@ impl<'a> RuntimeValidator<'a> {
}));
}

if offset > properties.max_texel_gather_offset as u64 {
if offset > properties.max_texel_gather_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImage*Gather` instruction is performed, but \
its `Offset`, `ConstOffset` or `ConstOffsets` \
Expand All @@ -2497,11 +2498,11 @@ impl<'a> RuntimeValidator<'a> {
}
} else if let Some(elements) = image_operands
.const_offsets
.and_then(|id| get_constant_composite_composite(self.spirv, id))
.and_then(|id| get_constant_signed_composite_composite(self.spirv, id))
{
for components in elements {
for offset in components {
if offset < properties.min_texel_gather_offset as u64 {
if offset < properties.min_texel_gather_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImage*Gather` instruction is performed, \
but its `Offset`, `ConstOffset` or `ConstOffsets` \
Expand All @@ -2513,7 +2514,7 @@ impl<'a> RuntimeValidator<'a> {
}));
}

if offset > properties.max_texel_gather_offset as u64 {
if offset > properties.max_texel_gather_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImage*Gather` instruction is performed, \
but its `Offset`, `ConstOffset` or `ConstOffsets` \
Expand All @@ -2534,10 +2535,10 @@ impl<'a> RuntimeValidator<'a> {
if let Some(image_operands) = instruction.image_operands() {
if let Some(components) = image_operands
.const_offset
.and_then(|offset| get_constant_maybe_composite(self.spirv, offset))
.and_then(|offset| get_constant_signed_maybe_composite(self.spirv, offset))
{
for offset in components {
if offset < properties.min_texel_offset as u64 {
if offset < properties.min_texel_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImageSample*` or `OpImageFetch*` instruction \
is performed, but its `ConstOffset` image operand \
Expand All @@ -2549,7 +2550,7 @@ impl<'a> RuntimeValidator<'a> {
}));
}

if offset > properties.max_texel_offset as u64 {
if offset > properties.max_texel_offset as i64 {
return Err(Box::new(ValidationError {
problem: "an `OpImageSample*` or `OpImageFetch*` instruction \
is performed, but its `ConstOffset` image operand \
Expand Down
71 changes: 53 additions & 18 deletions vulkano/src/shader/reflect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,22 +1214,57 @@ pub(crate) fn get_constant_float_composite(spirv: &Spirv, id: Id) -> Option<Smal
}
}

pub(crate) fn get_constant_maybe_composite(spirv: &Spirv, id: Id) -> Option<SmallVec<[u64; 4]>> {
fn integer_constant_to_i64(spirv: &Spirv, value: &[u32], result_type_id: Id) -> i64 {
let type_id_instruction = spirv.id(result_type_id).instruction();
match type_id_instruction {
Instruction::TypeInt {
width, signedness, ..
} => {
if *width == 64 {
assert_eq!(value.len(), 2);
} else {
assert_eq!(value.len(), 1);
}

match (signedness, width) {
(0, 8) => value[0] as u8 as i64,
(0, 16) => value[0] as u16 as i64,
(0, 32) => value[0] as i64,
(0, 64) => i64::try_from((value[0] as u64) | ((value[1] as u64) << 32)).unwrap(),
(1, 8) => value[0] as i8 as i64,
(1, 16) => value[0] as i16 as i64,
(1, 32) => value[0] as i32 as i64,
(1, 64) => (value[0] as i64) | ((value[1] as i64) << 32),
_ => unimplemented!(),
}
}
_ => unreachable!(),
}
}

pub(crate) fn get_constant_signed_maybe_composite(
spirv: &Spirv,
id: Id,
) -> Option<SmallVec<[i64; 4]>> {
match spirv.id(id).instruction() {
Instruction::Constant { value, .. } => match value.len() {
1 => Some(smallvec![value[0] as u64]),
2 => Some(smallvec![value[0] as u64 | (value[1] as u64) << 32]),
_ => panic!("constant {} is larger than 64 bits", id),
},
Instruction::Constant {
value,
result_type_id,
..
} => Some(smallvec![integer_constant_to_i64(
spirv,
value,
*result_type_id
)]),
Instruction::ConstantComposite { constituents, .. } => Some(
constituents
.iter()
.map(|&id| match spirv.id(id).instruction() {
Instruction::Constant { value, .. } => match value.len() {
1 => value[0] as u64,
2 => value[0] as u64 | (value[1] as u64) << 32,
_ => panic!("constant {} is larger than 64 bits", id),
},
Instruction::Constant {
value,
result_type_id,
..
} => integer_constant_to_i64(spirv, value, *result_type_id),
_ => unreachable!(),
})
.collect(),
Expand All @@ -1238,10 +1273,10 @@ pub(crate) fn get_constant_maybe_composite(spirv: &Spirv, id: Id) -> Option<Smal
}
}

pub(crate) fn get_constant_composite_composite(
pub(crate) fn get_constant_signed_composite_composite(
spirv: &Spirv,
id: Id,
) -> Option<SmallVec<[SmallVec<[u64; 4]>; 4]>> {
) -> Option<SmallVec<[SmallVec<[i64; 4]>; 4]>> {
match spirv.id(id).instruction() {
Instruction::ConstantComposite { constituents, .. } => Some(
constituents
Expand All @@ -1250,11 +1285,11 @@ pub(crate) fn get_constant_composite_composite(
Instruction::ConstantComposite { constituents, .. } => constituents
.iter()
.map(|&id| match spirv.id(id).instruction() {
Instruction::Constant { value, .. } => match value.len() {
1 => value[0] as u64,
2 => value[0] as u64 | (value[1] as u64) << 32,
_ => panic!("constant {} is larger than 64 bits", id),
},
Instruction::Constant {
value,
result_type_id,
..
} => integer_constant_to_i64(spirv, value, *result_type_id),
_ => unreachable!(),
})
.collect(),
Expand Down