Skip to content

Commit

Permalink
Improve device scoring.
Browse files Browse the repository at this point in the history 
Improve searching for the right buffer.
Keep trying all heaps when attempting to allocate memory.
Fixed incorrect type in shader.
Fixed buffer allocation errors.
Added a few more tests for sending the matrix and vectors.
Switched how the matrix is represented in memory.
  • Loading branch information
@zlogic
zlogic committed Jan 28, 2024
1 parent 9bed704 commit ea79d5f
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 80 deletions.
1 change: 1 addition & 0 deletions src/correlation/shaders/cross_check_filter.comp.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ void main() {

// TODO: remove this debug code
img1[0] = ivec2(img1_width, img1_height);
img1[1] = ivec2(img2_width, img2_height);
}
Binary file modified src/correlation/shaders/cross_check_filter.spv
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion src/correlation/shaders/init_out_data.comp.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ layout(std430, set = 0, binding = 3) buffer Internals_Int
{
// Layout:
// Contains [min, max, neighbor_count] for the corridor range
int internals_int[];
ivec3 internals_int[];
};
layout(std430, set = 0, binding = 4) buffer Result_Matches
{
Expand All @@ -69,4 +69,5 @@ void main() {

// TODO: remove this debug code
result_corr[0] = threshold;
result_corr[1] = (fundamental_matrix * vec3(10.0, 5.0, 2.0)).x;
}
Binary file modified src/correlation/shaders/init_out_data.spv
View file
Binary file not shown.
140 changes: 61 additions & 79 deletions src/correlation/vk.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{collections::HashMap, error, ffi::CStr, fmt, slice, time::SystemTime};
use std::{cmp::Ordering, collections::HashMap, error, ffi::CStr, fmt, slice, time::SystemTime};

use ash::{prelude::VkResult, vk};
use nalgebra::Matrix3;
Expand Down Expand Up @@ -33,7 +33,7 @@ struct ShaderParams {
out_height: u32,
scale: f32,
iteration_pass: u32,
fundamental_matrix: [f32; 3 * 4], // matrices are column-major and each column is aligned to 4-component vectors; should be aligned to 16 bytes
fundamental_matrix: [f32; 3 * 4], // matrices are stored row-by-row and each row is aligned to 4-component vectors; should be aligned to 16 bytes
corridor_offset: i32,
corridor_start: u32,
corridor_end: u32,
Expand Down Expand Up @@ -169,6 +169,9 @@ impl GpuContext {
}
let correlation_values = Grid::new(img1_dimensions.0, img1_dimensions.1, None);

// TODO: remove this debug code
let mut fundamental_matrix = Matrix3::zeros();
fundamental_matrix[(2, 0)] = 9.8765;
let params = CorrelationParameters::for_projection(&projection_mode);
let result = GpuContext {
min_stdev: params.min_stdev,
Expand Down Expand Up @@ -426,7 +429,7 @@ impl GpuContext {
let mut f = [0f32; 3 * 4];
for row in 0..3 {
for col in 0..3 {
f[col * 4 + row] = fundamental_matrix[(row, col)] as f32;
f[row * 4 + col] = fundamental_matrix[(row, col)] as f32;
}
}
f
Expand Down Expand Up @@ -813,7 +816,11 @@ impl Device {
});
}
// TODO: remove this debug code
println!("Corr check = {:?}", out_image.val(0, 0));
println!(
"Corr check = {:?} {:?}",
out_image.val(0, 0),
out_image.val(1, 0)
);

if !buffer.host_coherent {
let flush_memory_ranges = vk::MappedMemoryRange::builder()
Expand Down Expand Up @@ -906,7 +913,7 @@ impl Device {
unsafe fn find_device(
instance: &ash::Instance,
max_buffer_size: usize,
) -> Result<(vk::PhysicalDevice, &'static str, u32), Box<dyn error::Error>> {
) -> Result<(vk::PhysicalDevice, String, u32), Box<dyn error::Error>> {
let devices = instance.enumerate_physical_devices()?;
let device = devices
.iter()
Expand All @@ -923,16 +930,7 @@ impl Device {
let queue_index = Device::find_compute_queue(instance, device)?;

let device_name = CStr::from_ptr(props.device_name.as_ptr());
let device_name = device_name.to_str().unwrap();
println!(
"Device {} type {} {}-{}-{}-{}",
device_name,
props.device_type.as_raw(),
props.limits.max_push_constants_size,
props.limits.max_bound_descriptor_sets,
props.limits.max_storage_buffer_range,
max_buffer_size
);
let device_name = String::from_utf8_lossy(device_name.to_bytes()).to_string();
// TODO: allow to specify a device name filter/regex?
let score = match props.device_type {
vk::PhysicalDeviceType::DISCRETE_GPU => 3,
Expand All @@ -941,24 +939,25 @@ impl Device {
_ => 0,
};
// Prefer real devices instead of dzn emulation.
let dzn_multiplier = if device_name
let is_dzn = device_name
.to_lowercase()
.starts_with("microsoft direct3d12")
{
1
} else {
10
};
Some((device, device_name, queue_index, score * dzn_multiplier))
.starts_with("microsoft direct3d12");
let score = (score, is_dzn);
Some((device, device_name, queue_index, score))
})
.max_by_key(|(_device, _name, _queue_index, score)| *score);
let (device, name, queue_index) = if let Some((device, name, queue_index, _score)) = device
{
.max_by(|(_, _, _, a), (_, _, _, b)| {
if a.1 && !b.1 {
return Ordering::Less;
} else if !a.1 && b.1 {
return Ordering::Greater;
}
return a.0.cmp(&b.0);
});
let (device, name, queue_index) = if let Some((device, name, queue_index, score)) = device {
(device, name, queue_index)
} else {
return Err(GpuError::new("Device not found").into());
};
println!("selected device {}", name);
Ok((device, name, queue_index))
}

Expand Down Expand Up @@ -1095,13 +1094,13 @@ impl Device {
buffer_type: BufferType,
) -> Result<Buffer, Box<dyn error::Error>> {
let size = size as u64;
let gpu_local = match buffer_type {
BufferType::GpuOnly | BufferType::GpuDestination | BufferType::GpuSource => true,
BufferType::HostSource | BufferType::HostDestination => false,
};
let host_visible = match buffer_type {
BufferType::HostSource | BufferType::HostDestination => true,
BufferType::GpuOnly | BufferType::GpuDestination | BufferType::GpuSource => false,
let required_memory_properties = match buffer_type {
BufferType::GpuOnly | BufferType::GpuDestination | BufferType::GpuSource => {
vk::MemoryPropertyFlags::DEVICE_LOCAL
}
BufferType::HostSource | BufferType::HostDestination => {
vk::MemoryPropertyFlags::HOST_VISIBLE
}
};
let extra_usage_flags = match buffer_type {
BufferType::HostSource => vk::BufferUsageFlags::TRANSFER_SRC,
Expand All @@ -1122,58 +1121,41 @@ impl Device {
};
let buffer = device.create_buffer(&buffer_create_info, None)?;
let memory_requirements = device.get_buffer_memory_requirements(buffer);
let memory_type_index = memory_properties.memory_types
[..memory_properties.memory_type_count as usize]
.iter()
.enumerate()
.find(|(memory_type_index, memory_type)| {
let buffer_memory = (0..memory_properties.memory_type_count as usize)
.flat_map(|i| {
let memory_type = memory_properties.memory_types[i];
if memory_properties.memory_heaps[memory_type.heap_index as usize].size
< memory_requirements.size
{
return false;
};
if (1 << memory_type_index) & memory_requirements.memory_type_bits == 0 {
return false;
return None;
}

if gpu_local
&& memory_type
.property_flags
.contains(vk::MemoryPropertyFlags::DEVICE_LOCAL)
{
return true;
if ((1 << i) & memory_requirements.memory_type_bits) == 0 {
return None;
}
if host_visible
&& memory_type
.property_flags
.contains(vk::MemoryPropertyFlags::HOST_VISIBLE)
{
return true;
let property_flags = memory_type.property_flags;
if !property_flags.contains(required_memory_properties) {
return None;
}
false
});
let memory_type_index = if let Some((index, _)) = memory_type_index {
index as u32
let host_visible = property_flags.contains(vk::MemoryPropertyFlags::HOST_VISIBLE);
let host_coherent = property_flags.contains(vk::MemoryPropertyFlags::HOST_COHERENT);
let allocate_info = vk::MemoryAllocateInfo {
allocation_size: memory_requirements.size,
memory_type_index: i as u32,
..Default::default()
};
// Some buffers may fill up, in this case allocating memory can fail.
let mem = device.allocate_memory(&allocate_info, None).ok()?;

Some((mem, host_visible, host_coherent))
})
.next();

let (buffer_memory, host_visible, host_coherent) = if let Some(mem) = buffer_memory {
mem
} else {
device.destroy_buffer(buffer, None);
return Err(GpuError::new("Cannot find suitable memory").into());
};
let property_flags =
memory_properties.memory_types[memory_type_index as usize].property_flags;
let host_visible = property_flags.contains(vk::MemoryPropertyFlags::HOST_VISIBLE);
let host_coherent = property_flags.contains(vk::MemoryPropertyFlags::HOST_COHERENT);
let allocate_info = vk::MemoryAllocateInfo {
allocation_size: memory_requirements.size,
memory_type_index,
..Default::default()
};
let buffer_memory = device.allocate_memory(&allocate_info, None);
let buffer_memory = match buffer_memory {
Ok(mem) => mem,
Err(err) => {
device.destroy_buffer(buffer, None);
return Err(err.into());
}
};
let result = Buffer {
buffer,
buffer_memory,
Expand Down Expand Up @@ -1207,10 +1189,10 @@ impl Device {
};
let descriptor_pool_size = [vk::DescriptorPoolSize::builder()
.ty(vk::DescriptorType::STORAGE_BUFFER)
.descriptor_count(2)
.descriptor_count(6)
.build()];
let descriptor_pool_info = vk::DescriptorPoolCreateInfo::builder()
.max_sets(1)
.max_sets(2)
.pool_sizes(&descriptor_pool_size);
let descriptor_pool = device.create_descriptor_pool(&descriptor_pool_info, None)?;
let cleanup_err = |err| {
Expand Down

0 comments on commit ea79d5f

Please sign in to comment.