StrafesNET/fixed_wide_vectors
3
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matrix: directly implement dot product to avoid a copy

Browse Source
This commit is contained in:
Quaternions 2024-09-04 12:03:12 -07:00
parent e5f95b97ce
commit 823a05c101
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fixed_wide_vectors/src/macros/fixed_wide.rs
View File

@ -87,16 +87,14 @@ macro_rules! impl_wide_vector_operations {
#[macro_export(local_inner_macros)]
macro_rules! impl_matrix_wide_dot_transpose_helper {
(
$value:ident,
$lhs_axis:expr, $wide_mul:ident, $rhs:ident,
($struct: ident { $($field: ident), + }),
($from_struct: ident { $($from_field: ident), + }),
$static_field: ident
) => {
$struct {
$(
$field: $value.$from_field.$static_field
), +
}
$crate::sum_repeating!(
$( + $lhs_axis.$field.$wide_mul($rhs.$from_field.$static_field) ) +
)
}
}
#[doc(hidden)]
@ -104,7 +102,7 @@ macro_rules! impl_matrix_wide_dot_transpose_helper {
macro_rules! impl_matrix_wide_dot_inner {
(
// MatY<VecX>.MatX<VecZ> = MatY<VecZ>
$lhs:ident, $lhs_field_outer:ident, $wide_dot:ident, $rhs:ident,
$lhs:ident, $lhs_field_outer:ident, $wide_mul:ident, $rhs:ident,
$struct_inner_thru: tt, //VecX
($struct_inner: ident { $($field_inner: ident), + }), //VecX
($rhs_struct_inner: ident { $($rhs_field_inner: ident), + }), //VecZ
@ -112,15 +110,14 @@ macro_rules! impl_matrix_wide_dot_inner {
) => {
$rhs_struct_inner {
$(
$rhs_field_inner: $lhs.$lhs_field_outer.$wide_dot(
//construct a transposed vector with the same width as $struct_outer
$crate::impl_matrix_wide_dot_transpose_helper!{
$rhs,
$struct_inner_thru, //VecZ
$rhs_outer, //MatX
$rhs_field_inner
}
)
//directly dot product to avoid a copy
$rhs_field_inner: $crate::impl_matrix_wide_dot_transpose_helper!{
//lhs.axis.wide_mul(rhs_t.axis)
$lhs.$lhs_field_outer,$wide_mul,$rhs,
$struct_inner_thru, //VecZ
$rhs_outer, //MatX
$rhs_field_inner
}
), +
}
}
@ -130,7 +127,7 @@ macro_rules! impl_matrix_wide_dot_inner {
macro_rules! impl_matrix_wide_dot_outer {
(
// MatY<VecX>.MatX<VecZ> = MatY<VecZ>
$lhs:ident, $wide_dot:ident, $rhs:ident,
$lhs:ident, $wide_mul:ident, $rhs:ident,
//result matrix shape
($struct_outer: ident { $($field_outer: ident), + }),//MatY
$rhs_struct_inner: tt,//VecZ
@ -142,7 +139,7 @@ macro_rules! impl_matrix_wide_dot_outer {
$struct_outer {
$(
$field_outer: $crate::impl_matrix_wide_dot_inner!{
$lhs, $field_outer, $wide_dot, $rhs,
$lhs, $field_outer, $wide_mul, $rhs,
$struct_inner, //VecX
$struct_inner, //VecX
$rhs_struct_inner, //VecZ
@ -182,7 +179,7 @@ macro_rules! impl_matrix_wide_dot {
pub fn [<wide_dot_ $size_outer x $size_inner _ $size_inner x $rhs_size_inner _ $lhs _ $rhs>](self,rhs:$matrix_inner<$rhs_struct_inner<fixed_wide::fixed::Fixed<{$rhs},{$rhs*32}>>>)->$struct_outer<$rhs_struct_inner<fixed_wide::fixed::Fixed<{$lhs+$rhs},{($lhs+$rhs)*32}>>>{
$crate::impl_matrix_wide_dot_outer!(
//constituent idents
self,[<wide_dot_ $lhs _ $rhs>],rhs,
self,[<wide_mul_ $lhs _ $rhs>],rhs,
//result matrix shape
($struct_outer { $($field_outer), + }),
($rhs_struct_inner { $($rhs_field_inner), + }),