jepler/micropython-ulab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed unnecessary pointer shifting in the binary loops

Browse source
This commit is contained in:
Zoltán Vörös 2020-08-07 23:23:32 +02:00
parent 847c49064b
commit b4527192f5
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
code/ndarray.h
View file

@ -159,29 +159,23 @@ ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t );
size_t l = 0;\
do {\
*((type_out *)(array)) = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
(array) += results->strides[ULAB_MAX_DIMS - 1];\
(array) += sizeof(type_out);\
(larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
l++;\
} while(l < results->shape[ULAB_MAX_DIMS - 1]);\
(array) -= results->strides[ULAB_MAX_DIMS-1] * results->shape[ULAB_MAX_DIMS-1];\
(array) += results->strides[ULAB_MAX_DIMS-2];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
k++;\
} while(k < results->shape[ULAB_MAX_DIMS - 2]);\
(array) -= results->strides[ULAB_MAX_DIMS-2] * results->shape[ULAB_MAX_DIMS-2];\
(array) += results->strides[ULAB_MAX_DIMS-3];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 3];\
j++;\
} while(j < results->shape[ULAB_MAX_DIMS - 3]);\
(array) -= results->strides[ULAB_MAX_DIMS-3] * results->shape[ULAB_MAX_DIMS-3];\
(array) += results->strides[ULAB_MAX_DIMS-4];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 3] * results->shape[ULAB_MAX_DIMS-3];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 4];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 3] * results->shape[ULAB_MAX_DIMS-3];\
@ -201,21 +195,17 @@ ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t );
size_t l = 0;\
do {\
*((type_out *)(array)) = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
(array) += results->strides[ULAB_MAX_DIMS - 1];\
(array) += sizeof(type_out);\
(larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
l++;\
} while(l < results->shape[ULAB_MAX_DIMS - 1]);\
(array) -= results->strides[ULAB_MAX_DIMS-1] * results->shape[ULAB_MAX_DIMS-1];\
(array) += results->strides[ULAB_MAX_DIMS-2];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 2];\
k++;\
} while(k < results->shape[ULAB_MAX_DIMS - 2]);\
(array) -= results->strides[ULAB_MAX_DIMS-2] * results->shape[ULAB_MAX_DIMS-2];\
(array) += results->strides[ULAB_MAX_DIMS-3];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 3];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 2] * results->shape[ULAB_MAX_DIMS-2];\
@ -233,13 +223,11 @@ ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t );
size_t l = 0;\
do {\
*((type_out *)(array)) = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
(array) += results->strides[ULAB_MAX_DIMS - 1];\
(array) += sizeof(type_out);\
(larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
l++;\
} while(l < results->shape[ULAB_MAX_DIMS - 1]);\
(array) -= results->strides[ULAB_MAX_DIMS-1] * results->shape[ULAB_MAX_DIMS-1];\
(array) += results->strides[ULAB_MAX_DIMS-2];\
(larray) -= (lstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
(larray) += (lstrides)[ULAB_MAX_DIMS - 2];\
(rarray) -= (rstrides)[ULAB_MAX_DIMS - 1] * results->shape[ULAB_MAX_DIMS-1];\
@ -255,7 +243,7 @@ ndarray_obj_t *ndarray_from_mp_obj(mp_obj_t );
size_t l = 0;\
do {\
*((type_out *)(array)) = *((type_left *)(larray)) OPERATOR *((type_right *)(rarray));\
(array) += results->strides[ULAB_MAX_DIMS - 1];\
(array) += sizeof(type_out);\
(larray) += (lstrides)[ULAB_MAX_DIMS - 1];\
(rarray) += (rstrides)[ULAB_MAX_DIMS - 1];\
l++;\