Follow crate conventions

This commit is contained in:
Ivar Flakstad
2024-01-01 20:37:56 +01:00
parent 6eb44d1bce
commit e8e24f1284
5 changed files with 75 additions and 77 deletions

View File

@ -5,7 +5,6 @@ use metal::{
};
use std::collections::HashMap;
use std::ffi::c_void;
use std::marker::PhantomData;
use std::sync::RwLock;
const AFFINE: &str = include_str!("affine.metal");
@ -1578,81 +1577,68 @@ fn divide(m: usize, b: usize) -> NSUInteger {
((m + b - 1) / b) as NSUInteger
}
pub struct Unary<T> {
_marker: PhantomData<T>,
pub fn call_fill<T: FillOp>(
device: &Device,
command_buffer: &CommandBufferRef,
kernels: &Kernels,
elem_count: usize,
buffer: &Buffer,
value: T,
) -> Result<(), MetalKernelError> {
let pipeline = kernels.load_pipeline(device, Source::Fill, T::FILL_KERNEL)?;
let encoder = command_buffer.new_compute_command_encoder();
encoder.wait_for_fence(&kernels.fence);
encoder.set_compute_pipeline_state(&pipeline);
encoder.set_threadgroup_memory_length(0, elem_count as NSUInteger);
set_params!(encoder, (buffer, value, elem_count));
let (thread_group_count, thread_group_size) = linear_split(&pipeline, elem_count);
encoder.dispatch_thread_groups(thread_group_count, thread_group_size);
encoder.use_resource(buffer, metal::MTLResourceUsage::Write);
encoder.update_fence(&kernels.fence);
encoder.end_encoding();
Ok(())
}
pub trait FillOp<T> {
const FILL_KERNEL: &'static str;
pub fn call_fill_u8(
command_buffer: &CommandBufferRef,
kernels: &Kernels,
elem_count: usize,
buffer: &Buffer,
value: u8,
) -> Result<(), MetalKernelError> {
let blit = command_buffer.new_blit_command_encoder();
blit.wait_for_fence(&kernels.fence);
blit.fill_buffer(
buffer,
metal::NSRange {
location: 0,
length: elem_count as NSUInteger,
},
value,
);
blit.update_fence(&kernels.fence);
blit.end_encoding();
fn fill(
device: &Device,
command_buffer: &CommandBufferRef,
kernels: &Kernels,
elem_count: usize,
buffer: &Buffer,
value: T,
) -> Result<(), MetalKernelError>;
Ok(())
}
pub trait FillOp: EncoderParam {
const FILL_KERNEL: &'static str;
}
macro_rules ! impl_call_fill {
($($t:ty),*) => {
$(
impl FillOp<$t> for Unary<$t> {
impl FillOp for $t {
const FILL_KERNEL: &'static str = concat!("fill_", stringify!($t));
#[inline(always)]
fn fill(device: &Device, command_buffer: &CommandBufferRef, kernels: &Kernels, elem_count: usize, buffer: &Buffer, value: $t) -> Result<(), MetalKernelError> {
let pipeline = kernels.load_pipeline(device, Source::Fill, Self::FILL_KERNEL)?;
let encoder = command_buffer.new_compute_command_encoder();
encoder.wait_for_fence(&kernels.fence);
encoder.set_compute_pipeline_state(&pipeline);
encoder.set_threadgroup_memory_length(0, elem_count as NSUInteger);
set_params!(encoder, (buffer, value, elem_count));
let (thread_group_count, thread_group_size) = linear_split(&pipeline, elem_count);
encoder.dispatch_thread_groups(thread_group_count, thread_group_size);
encoder.use_resource(buffer, metal::MTLResourceUsage::Write);
encoder.update_fence(&kernels.fence);
encoder.end_encoding();
Ok(())
}
}
)*
};
}
impl_call_fill!(u32, i64, f16, bf16, f32);
impl FillOp<u8> for Unary<u8> {
const FILL_KERNEL: &'static str = "";
#[inline(always)]
fn fill(
_: &Device,
command_buffer: &CommandBufferRef,
kernels: &Kernels,
elem_count: usize,
buffer: &Buffer,
value: u8,
) -> Result<(), MetalKernelError> {
let blit = command_buffer.new_blit_command_encoder();
blit.wait_for_fence(&kernels.fence);
blit.fill_buffer(
&buffer,
metal::NSRange {
location: 0,
length: elem_count as NSUInteger,
},
value,
);
blit.update_fence(&kernels.fence);
blit.end_encoding();
Ok(())
}
}
#[cfg(test)]
mod tests;