Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

support multidimensional threadgroup in dsl (#447)

CCYeh92f8a250df8f
diff --git a/crates/backend-uzu/build/metal/ast.rs b/crates/backend-uzu/build/metal/ast.rs
index f8eaeeb95..d6db93130 100644
--- a/crates/backend-uzu/build/metal/ast.rs
+++ b/crates/backend-uzu/build/metal/ast.rs
@@ -308,7 +308,7 @@ fn parse_argument_type(
}
if c_type.contains("threadgroup") && c_type.contains('*') {
- let lbracket = source.rfind('[').context("threadgroup missing size bracket")? + 1;
+ let lbracket = source.find('[').context("threadgroup missing size bracket")? + 1;
let rbracket = source.rfind(']').context("threadgroup missing size bracket")?;
return Ok(MetalArgumentType::Shared(Some(source[lbracket..rbracket].into())));
}
diff --git a/crates/backend-uzu/build/metal/wrapper.rs b/crates/backend-uzu/build/metal/wrapper.rs
index 12cda6a27..06c465c12 100644
--- a/crates/backend-uzu/build/metal/wrapper.rs
+++ b/crates/backend-uzu/build/metal/wrapper.rs
@@ -231,10 +231,11 @@ fn kernel_wrappers(
let wrapper_arguments = wrapper_arguments.join(", ");
let shared_definitions = kernel.arguments.iter().filter_map(|a| match &a.argument_type {
- MetalArgumentType::Shared(Some(len)) => {
- Some(format!("{} {}[{}]", &a.c_type.replace('*', ""), a.name, len.as_ref(),))
+ MetalArgumentType::Shared(dimensions) => {
+ let element_type = a.c_type.split(['*', '&', '(']).next().unwrap_or_default().trim_end();
+ let dimensions = dimensions.as_deref().map(|d| format!("[{d}]")).unwrap_or_default();
+ Some(format!("{element_type} {}{dimensions}", a.name))
},
- MetalArgumentType::Shared(None) => Some(format!("{} {}", &a.c_type.replace('&', ""), a.name)),
_ => None,
});