From dc7fbb01964d1e82e3af3e5b51a1d85b38958511 Mon Sep 17 00:00:00 2001 From: Denes Tarjan Date: Wed, 24 Jan 2024 13:45:47 +0100 Subject: [PATCH] [NFC] Fix typo in INTRINSICCV_TARGET_FN_ATTRS --- intrinsiccv/include/config.h | 6 ++--- intrinsiccv/src/analysis/canny_neon.cpp | 2 +- .../src/analysis/count_nonzeros_neon.cpp | 10 ++++----- intrinsiccv/src/analysis/min_max_loc_neon.cpp | 2 +- intrinsiccv/src/analysis/min_max_neon.cpp | 2 +- intrinsiccv/src/arithmetics/absdiff_neon.cpp | 2 +- intrinsiccv/src/arithmetics/absdiff_sme2.cpp | 2 +- intrinsiccv/src/arithmetics/absdiff_sve2.cpp | 2 +- .../add_abs_with_threshold_neon.cpp | 8 +++---- .../add_abs_with_threshold_sme2.cpp | 10 ++++----- .../add_abs_with_threshold_sve2.cpp | 10 ++++----- intrinsiccv/src/arithmetics/add_neon.cpp | 2 +- intrinsiccv/src/arithmetics/add_sme2.cpp | 2 +- intrinsiccv/src/arithmetics/add_sve2.cpp | 2 +- intrinsiccv/src/arithmetics/multiply_neon.cpp | 2 +- intrinsiccv/src/arithmetics/multiply_sve2.cpp | 2 +- intrinsiccv/src/arithmetics/scale_neon.cpp | 2 +- intrinsiccv/src/arithmetics/sub_neon.cpp | 2 +- intrinsiccv/src/arithmetics/sub_sme2.cpp | 2 +- intrinsiccv/src/arithmetics/sub_sve2.cpp | 2 +- .../src/arithmetics/threshold_neon.cpp | 2 +- .../src/arithmetics/threshold_sme2.cpp | 4 ++-- .../src/arithmetics/threshold_sve2.cpp | 12 +++++----- .../src/arithmetics/transpose_neon.cpp | 2 +- .../src/conversions/gray_to_rgb_neon.cpp | 4 ++-- intrinsiccv/src/conversions/gray_to_rgb_sc.h | 4 ++-- .../src/conversions/gray_to_rgb_sme2.cpp | 4 ++-- .../src/conversions/gray_to_rgb_sve2.cpp | 17 +++++++------- intrinsiccv/src/conversions/merge_neon.cpp | 2 +- .../src/conversions/rgb_to_rgb_neon.cpp | 12 +++++----- intrinsiccv/src/conversions/rgb_to_rgb_sc.h | 12 +++++----- .../src/conversions/rgb_to_rgb_sme2.cpp | 12 +++++----- .../src/conversions/rgb_to_rgb_sve2.cpp | 12 +++++----- intrinsiccv/src/conversions/split_neon.cpp | 2 +- .../src/conversions/yuv_to_rgb_neon.cpp | 8 +++---- intrinsiccv/src/conversions/yuv_to_rgb_sc.h | 8 +++---- .../src/conversions/yuv_to_rgb_sme2.cpp | 22 ++++++++++--------- .../src/conversions/yuv_to_rgb_sve2.cpp | 8 +++---- .../src/filters/gaussian_blur_neon.cpp | 4 ++-- .../src/filters/gaussian_blur_sme2.cpp | 2 +- .../src/filters/gaussian_blur_sve2.cpp | 2 +- intrinsiccv/src/filters/sobel_neon.cpp | 4 ++-- intrinsiccv/src/filters/sobel_sc.h | 4 ++-- intrinsiccv/src/filters/sobel_sme2.cpp | 4 ++-- intrinsiccv/src/filters/sobel_sve2.cpp | 4 ++-- .../src/morphology/morphology_neon.cpp | 2 +- .../src/morphology/morphology_sme2.cpp | 6 ++--- .../src/morphology/morphology_sve2.cpp | 6 ++--- intrinsiccv/src/resize/resize_neon.cpp | 2 +- intrinsiccv/src/resize/resize_sc.h | 2 +- intrinsiccv/src/resize/resize_sme2.cpp | 2 +- intrinsiccv/src/resize/resize_sve2.cpp | 2 +- 52 files changed, 135 insertions(+), 132 deletions(-) diff --git a/intrinsiccv/include/config.h b/intrinsiccv/include/config.h index d0dde78b8..4777522bf 100644 --- a/intrinsiccv/include/config.h +++ b/intrinsiccv/include/config.h @@ -49,17 +49,17 @@ // Derived configuration switches and macros below. #if INTRINSICCV_TARGET_NEON -#define INTRINSICCV_TARGET_FN_ATTS INTRINSICCV_ATTR_SECTION(".text.neon") +#define INTRINSICCV_TARGET_FN_ATTRS INTRINSICCV_ATTR_SECTION(".text.neon") #endif #if INTRINSICCV_TARGET_SVE2 -#define INTRINSICCV_TARGET_FN_ATTS INTRINSICCV_ATTR_SECTION(".text.sve2") +#define INTRINSICCV_TARGET_FN_ATTRS INTRINSICCV_ATTR_SECTION(".text.sve2") #endif #if INTRINSICCV_TARGET_SME2 #undef INTRINSICCV_SVE2_128 #define INTRINSICCV_SVE2_128 0 -#define INTRINSICCV_TARGET_FN_ATTS INTRINSICCV_ATTR_SECTION(".text.sme2") +#define INTRINSICCV_TARGET_FN_ATTRS INTRINSICCV_ATTR_SECTION(".text.sme2") #define INTRINSICCV_LOCALLY_STREAMING __arm_locally_streaming #define INTRINSICCV_STREAMING_COMPATIBLE __arm_streaming_compatible #else diff --git a/intrinsiccv/src/analysis/canny_neon.cpp b/intrinsiccv/src/analysis/canny_neon.cpp index 46ab5fc09..f3c1d2d93 100644 --- a/intrinsiccv/src/analysis/canny_neon.cpp +++ b/intrinsiccv/src/analysis/canny_neon.cpp @@ -456,7 +456,7 @@ static void perform_hysteresis(StrongEdgeStack &strong_edge_pixels, } } -extern "C" INTRINSICCV_TARGET_FN_ATTS void INTRINSICCV_C_API(canny_u8)( +extern "C" INTRINSICCV_TARGET_FN_ATTRS void INTRINSICCV_C_API(canny_u8)( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, double low_threshold, double high_threshold) { Rectangle dst_rect{width, height}; diff --git a/intrinsiccv/src/analysis/count_nonzeros_neon.cpp b/intrinsiccv/src/analysis/count_nonzeros_neon.cpp index 86f3a6184..0d692a270 100644 --- a/intrinsiccv/src/analysis/count_nonzeros_neon.cpp +++ b/intrinsiccv/src/analysis/count_nonzeros_neon.cpp @@ -51,10 +51,10 @@ static size_t count_nonzeros_impl(Rows src, Rectangle rect) { } // namespace neon template -INTRINSICCV_TARGET_FN_ATTS static size_t count_nonzeros(const T *src, - size_t src_stride, - size_t width, - size_t height) { +INTRINSICCV_TARGET_FN_ATTRS static size_t count_nonzeros(const T *src, + size_t src_stride, + size_t width, + size_t height) { Rectangle rect{width, height}; Rows src_rows{src, src_stride}; return neon::count_nonzeros_impl(src_rows, rect); @@ -62,7 +62,7 @@ INTRINSICCV_TARGET_FN_ATTS static size_t count_nonzeros(const T *src, extern "C" { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS size_t INTRINSICCV_C_API(count_nonzeros_u8)(const uint8_t *src, size_t src_stride, size_t width, size_t height) { diff --git a/intrinsiccv/src/analysis/min_max_loc_neon.cpp b/intrinsiccv/src/analysis/min_max_loc_neon.cpp index b1a586f22..63e25c5b7 100644 --- a/intrinsiccv/src/analysis/min_max_loc_neon.cpp +++ b/intrinsiccv/src/analysis/min_max_loc_neon.cpp @@ -321,7 +321,7 @@ void min_max_loc(const ScalarType *src, size_t src_stride, size_t width, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void min_max_loc( \ + template INTRINSICCV_TARGET_FN_ATTRS void min_max_loc( \ const type *src, size_t src_stride, size_t width, size_t height, \ size_t *min_offset, size_t *max_offset) diff --git a/intrinsiccv/src/analysis/min_max_neon.cpp b/intrinsiccv/src/analysis/min_max_neon.cpp index 6e6b9dd14..d3ec27c56 100644 --- a/intrinsiccv/src/analysis/min_max_neon.cpp +++ b/intrinsiccv/src/analysis/min_max_neon.cpp @@ -60,7 +60,7 @@ void min_max(const ScalarType *src, size_t src_stride, size_t width, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void min_max( \ + template INTRINSICCV_TARGET_FN_ATTRS void min_max( \ const type *src, size_t src_stride, size_t width, size_t height, \ type *min_value, type *max_value) diff --git a/intrinsiccv/src/arithmetics/absdiff_neon.cpp b/intrinsiccv/src/arithmetics/absdiff_neon.cpp index 856605f35..f484941c4 100644 --- a/intrinsiccv/src/arithmetics/absdiff_neon.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_neon.cpp @@ -49,7 +49,7 @@ void saturating_absdiff(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_absdiff( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_absdiff( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/absdiff_sme2.cpp b/intrinsiccv/src/arithmetics/absdiff_sme2.cpp index d3ffc1cbf..2d43fe189 100644 --- a/intrinsiccv/src/arithmetics/absdiff_sme2.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_sme2.cpp @@ -50,7 +50,7 @@ INTRINSICCV_LOCALLY_STREAMING void saturating_absdiff( } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_absdiff( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_absdiff( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/absdiff_sve2.cpp b/intrinsiccv/src/arithmetics/absdiff_sve2.cpp index cc138013d..fae233708 100644 --- a/intrinsiccv/src/arithmetics/absdiff_sve2.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_sve2.cpp @@ -47,7 +47,7 @@ void saturating_absdiff(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_absdiff( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_absdiff( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp b/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp index 63837a62a..ace9f6381 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp @@ -47,10 +47,10 @@ void add_abs_with_threshold(const T *src_a, size_t src_a_stride, const T *src_b, apply_operation_by_rows(operation, rect, src_a_rows, src_b_rows, dst_rows); } -#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void add_abs_with_threshold( \ - const type *src_a, size_t src_a_stride, const type *src_b, \ - size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ +#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ + template INTRINSICCV_TARGET_FN_ATTRS void add_abs_with_threshold( \ + const type *src_a, size_t src_a_stride, const type *src_b, \ + size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height, type threshold) INTRINSICCV_INSTANTIATE_TEMPLATE(int16_t); diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sme2.cpp b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sme2.cpp index 998b54b91..358fe6670 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sme2.cpp +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sme2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sme2 { template -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void add_abs_with_threshold(const T *src_a, size_t src_a_stride, const T *src_b, size_t src_b_stride, T *dst, size_t dst_stride, size_t width, size_t height, T threshold) { @@ -15,10 +15,10 @@ add_abs_with_threshold(const T *src_a, size_t src_a_stride, const T *src_b, dst_stride, width, height, threshold); } -#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void add_abs_with_threshold( \ - const type *src_a, size_t src_a_stride, const type *src_b, \ - size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ +#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ + template INTRINSICCV_TARGET_FN_ATTRS void add_abs_with_threshold( \ + const type *src_a, size_t src_a_stride, const type *src_b, \ + size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height, type threshold) INTRINSICCV_INSTANTIATE_TEMPLATE(int16_t); diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sve2.cpp b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sve2.cpp index 14ad1df2a..f3f0cf2fe 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sve2.cpp +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sve2.cpp @@ -7,17 +7,17 @@ namespace intrinsiccv::sve2 { template -void INTRINSICCV_TARGET_FN_ATTS add_abs_with_threshold( +void INTRINSICCV_TARGET_FN_ATTRS add_abs_with_threshold( const T *src_a, size_t src_a_stride, const T *src_b, size_t src_b_stride, T *dst, size_t dst_stride, size_t width, size_t height, T threshold) { add_abs_with_threshold_sc(src_a, src_a_stride, src_b, src_b_stride, dst, dst_stride, width, height, threshold); } -#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template void INTRINSICCV_TARGET_FN_ATTS add_abs_with_threshold( \ - const type *src_a, size_t src_a_stride, const type *src_b, \ - size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ +#define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ + template void INTRINSICCV_TARGET_FN_ATTRS add_abs_with_threshold( \ + const type *src_a, size_t src_a_stride, const type *src_b, \ + size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height, type threshold) INTRINSICCV_INSTANTIATE_TEMPLATE(int16_t); diff --git a/intrinsiccv/src/arithmetics/add_neon.cpp b/intrinsiccv/src/arithmetics/add_neon.cpp index c431a070d..64cc8d44e 100644 --- a/intrinsiccv/src/arithmetics/add_neon.cpp +++ b/intrinsiccv/src/arithmetics/add_neon.cpp @@ -47,7 +47,7 @@ void saturating_add(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_add( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_add( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/add_sme2.cpp b/intrinsiccv/src/arithmetics/add_sme2.cpp index 1cab9a775..e0bf7b214 100644 --- a/intrinsiccv/src/arithmetics/add_sme2.cpp +++ b/intrinsiccv/src/arithmetics/add_sme2.cpp @@ -36,7 +36,7 @@ INTRINSICCV_LOCALLY_STREAMING void saturating_add( } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_add( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_add( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/add_sve2.cpp b/intrinsiccv/src/arithmetics/add_sve2.cpp index a6ab56cc1..74cdf1e4c 100644 --- a/intrinsiccv/src/arithmetics/add_sve2.cpp +++ b/intrinsiccv/src/arithmetics/add_sve2.cpp @@ -35,7 +35,7 @@ void saturating_add(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_add( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_add( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/multiply_neon.cpp b/intrinsiccv/src/arithmetics/multiply_neon.cpp index 201cf3c25..561013db4 100644 --- a/intrinsiccv/src/arithmetics/multiply_neon.cpp +++ b/intrinsiccv/src/arithmetics/multiply_neon.cpp @@ -79,7 +79,7 @@ void saturating_multiply(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_multiply( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_multiply( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height, double scale) diff --git a/intrinsiccv/src/arithmetics/multiply_sve2.cpp b/intrinsiccv/src/arithmetics/multiply_sve2.cpp index 4077a94c7..eb9090b43 100644 --- a/intrinsiccv/src/arithmetics/multiply_sve2.cpp +++ b/intrinsiccv/src/arithmetics/multiply_sve2.cpp @@ -55,7 +55,7 @@ void saturating_multiply(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_multiply( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_multiply( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height, double scale) diff --git a/intrinsiccv/src/arithmetics/scale_neon.cpp b/intrinsiccv/src/arithmetics/scale_neon.cpp index 9845ddfd9..c5af02925 100644 --- a/intrinsiccv/src/arithmetics/scale_neon.cpp +++ b/intrinsiccv/src/arithmetics/scale_neon.cpp @@ -189,7 +189,7 @@ void scale(const T *src, size_t src_stride, T *dst, size_t dst_stride, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void scale( \ + template INTRINSICCV_TARGET_FN_ATTRS void scale( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, float scale, float shift) diff --git a/intrinsiccv/src/arithmetics/sub_neon.cpp b/intrinsiccv/src/arithmetics/sub_neon.cpp index b8fe9b7a1..826bd05c4 100644 --- a/intrinsiccv/src/arithmetics/sub_neon.cpp +++ b/intrinsiccv/src/arithmetics/sub_neon.cpp @@ -47,7 +47,7 @@ void saturating_sub(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_sub( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_sub( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/sub_sme2.cpp b/intrinsiccv/src/arithmetics/sub_sme2.cpp index 4c0b66e1c..73b722f12 100644 --- a/intrinsiccv/src/arithmetics/sub_sme2.cpp +++ b/intrinsiccv/src/arithmetics/sub_sme2.cpp @@ -36,7 +36,7 @@ INTRINSICCV_LOCALLY_STREAMING void saturating_sub( } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_sub( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_sub( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/sub_sve2.cpp b/intrinsiccv/src/arithmetics/sub_sve2.cpp index 67e08daf3..7c889acae 100644 --- a/intrinsiccv/src/arithmetics/sub_sve2.cpp +++ b/intrinsiccv/src/arithmetics/sub_sve2.cpp @@ -35,7 +35,7 @@ void saturating_sub(const T *src_a, size_t src_a_stride, const T *src_b, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void saturating_sub( \ + template INTRINSICCV_TARGET_FN_ATTRS void saturating_sub( \ const type *src_a, size_t src_a_stride, const type *src_b, \ size_t src_b_stride, type *dst, size_t dst_stride, size_t width, \ size_t height) diff --git a/intrinsiccv/src/arithmetics/threshold_neon.cpp b/intrinsiccv/src/arithmetics/threshold_neon.cpp index 9045bf70d..3f6a43ca0 100644 --- a/intrinsiccv/src/arithmetics/threshold_neon.cpp +++ b/intrinsiccv/src/arithmetics/threshold_neon.cpp @@ -49,7 +49,7 @@ void threshold_binary(const T *src, size_t src_stride, T *dst, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void threshold_binary( \ + template INTRINSICCV_TARGET_FN_ATTRS void threshold_binary( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, type threshold, type value) diff --git a/intrinsiccv/src/arithmetics/threshold_sme2.cpp b/intrinsiccv/src/arithmetics/threshold_sme2.cpp index 60ac7987a..8668aa97a 100644 --- a/intrinsiccv/src/arithmetics/threshold_sme2.cpp +++ b/intrinsiccv/src/arithmetics/threshold_sme2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sme2 { template -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void threshold_binary( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void threshold_binary( const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width, size_t height, T threshold, T value) { intrinsiccv::sve2::threshold_binary_sc(src, src_stride, dst, dst_stride, @@ -15,7 +15,7 @@ INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void threshold_binary( } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void threshold_binary( \ + template INTRINSICCV_TARGET_FN_ATTRS void threshold_binary( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, type threshold, type value) diff --git a/intrinsiccv/src/arithmetics/threshold_sve2.cpp b/intrinsiccv/src/arithmetics/threshold_sve2.cpp index 0ca492741..6ef323dff 100644 --- a/intrinsiccv/src/arithmetics/threshold_sve2.cpp +++ b/intrinsiccv/src/arithmetics/threshold_sve2.cpp @@ -7,17 +7,17 @@ namespace intrinsiccv::sve2 { template -void INTRINSICCV_TARGET_FN_ATTS threshold_binary(const T *src, - size_t src_stride, T *dst, - size_t dst_stride, - size_t width, size_t height, - T threshold, T value) { +void INTRINSICCV_TARGET_FN_ATTRS threshold_binary(const T *src, + size_t src_stride, T *dst, + size_t dst_stride, + size_t width, size_t height, + T threshold, T value) { threshold_binary_sc(src, src_stride, dst, dst_stride, width, height, threshold, value); } #define INTRINSICCV_INSTANTIATE_TEMPLATE(type) \ - template INTRINSICCV_TARGET_FN_ATTS void threshold_binary( \ + template INTRINSICCV_TARGET_FN_ATTRS void threshold_binary( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, type threshold, type value) diff --git a/intrinsiccv/src/arithmetics/transpose_neon.cpp b/intrinsiccv/src/arithmetics/transpose_neon.cpp index d785b4184..c70742078 100644 --- a/intrinsiccv/src/arithmetics/transpose_neon.cpp +++ b/intrinsiccv/src/arithmetics/transpose_neon.cpp @@ -207,7 +207,7 @@ static void transpose(const void *src, size_t src_stride, void *dst, } } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void transpose(const void *src, size_t src_stride, void *dst, size_t dst_stride, size_t src_width, size_t src_height, size_t element_size) { bool inplace = false; diff --git a/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp b/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp index f7dea8100..81ae9e55c 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp @@ -103,7 +103,7 @@ class GrayToRGBA final : public UnrollTwice { #endif }; // end of class GrayToRGBA -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgb_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -113,7 +113,7 @@ void gray_to_rgb_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgba_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; diff --git a/intrinsiccv/src/conversions/gray_to_rgb_sc.h b/intrinsiccv/src/conversions/gray_to_rgb_sc.h index 1340284e8..3c091c45d 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/gray_to_rgb_sc.h @@ -196,7 +196,7 @@ class GrayToRGBA final : #endif // INTRINSICCV_PREFER_INTERLEAVING_LOAD_STORE }; // end of class GrayToRGBA -INTRINSICCV_TARGET_FN_ATTS static void gray_to_rgb_u8_sc( +INTRINSICCV_TARGET_FN_ATTRS static void gray_to_rgb_u8_sc( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { Rectangle rect{width, height}; @@ -211,7 +211,7 @@ INTRINSICCV_TARGET_FN_ATTS static void gray_to_rgb_u8_sc( sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS static void gray_to_rgba_u8_sc( +INTRINSICCV_TARGET_FN_ATTRS static void gray_to_rgba_u8_sc( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { Rectangle rect{width, height}; diff --git a/intrinsiccv/src/conversions/gray_to_rgb_sme2.cpp b/intrinsiccv/src/conversions/gray_to_rgb_sme2.cpp index fbe0e53fb..e373b7ddc 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_sme2.cpp +++ b/intrinsiccv/src/conversions/gray_to_rgb_sme2.cpp @@ -6,14 +6,14 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void gray_to_rgb_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgb_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::gray_to_rgb_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void gray_to_rgba_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgba_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::gray_to_rgba_u8_sc(src, src_stride, dst, dst_stride, width, diff --git a/intrinsiccv/src/conversions/gray_to_rgb_sve2.cpp b/intrinsiccv/src/conversions/gray_to_rgb_sve2.cpp index 7d66892ca..edcfa0022 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_sve2.cpp +++ b/intrinsiccv/src/conversions/gray_to_rgb_sve2.cpp @@ -6,17 +6,18 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS void gray_to_rgb_u8(const uint8_t *src, - size_t src_stride, uint8_t *dst, - size_t dst_stride, size_t width, - size_t height) { - gray_to_rgb_u8_sc(src, src_stride, dst, dst_stride, width, height); -} - -INTRINSICCV_TARGET_FN_ATTS void gray_to_rgba_u8(const uint8_t *src, +INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgb_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { + gray_to_rgb_u8_sc(src, src_stride, dst, dst_stride, width, height); +} + +INTRINSICCV_TARGET_FN_ATTRS void gray_to_rgba_u8(const uint8_t *src, + size_t src_stride, + uint8_t *dst, + size_t dst_stride, + size_t width, size_t height) { gray_to_rgba_u8_sc(src, src_stride, dst, dst_stride, width, height); } diff --git a/intrinsiccv/src/conversions/merge_neon.cpp b/intrinsiccv/src/conversions/merge_neon.cpp index bc61c9ab3..395db8068 100644 --- a/intrinsiccv/src/conversions/merge_neon.cpp +++ b/intrinsiccv/src/conversions/merge_neon.cpp @@ -400,7 +400,7 @@ void merge(const void **srcs, const size_t *src_strides, void *dst, } } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void merge(const void **srcs, const size_t *src_strides, void *dst, size_t dst_stride, size_t width, size_t height, size_t channels, size_t element_size) { diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp b/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp index e035e8feb..a85cb7b89 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp @@ -187,7 +187,7 @@ class RGBAToRGB final : public UnrollTwice { } }; // end of class RGBAToRGB -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -197,7 +197,7 @@ void rgb_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -207,7 +207,7 @@ void rgba_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -217,7 +217,7 @@ void rgb_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_rgba_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -227,7 +227,7 @@ void rgb_to_rgba_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; @@ -237,7 +237,7 @@ void rgba_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_rgb_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { Rectangle rect{width, height}; diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h index 026a4d32f..8bdfa3224 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h @@ -181,7 +181,7 @@ class RGBAToRGB final : public UnrollTwice { } }; // end of class RGBAToRGB -INTRINSICCV_TARGET_FN_ATTS static void rgb_to_bgr_u8_sc( +INTRINSICCV_TARGET_FN_ATTRS static void rgb_to_bgr_u8_sc( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { Rectangle rect{width, height}; @@ -196,7 +196,7 @@ INTRINSICCV_TARGET_FN_ATTS static void rgb_to_bgr_u8_sc( sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void rgba_to_bgra_u8_sc(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { @@ -207,7 +207,7 @@ static void rgba_to_bgra_u8_sc(const uint8_t *src, size_t src_stride, sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void rgb_to_bgra_u8_sc(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { @@ -218,7 +218,7 @@ static void rgb_to_bgra_u8_sc(const uint8_t *src, size_t src_stride, sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void rgb_to_rgba_u8_sc(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { @@ -229,7 +229,7 @@ static void rgb_to_rgba_u8_sc(const uint8_t *src, size_t src_stride, sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void rgba_to_bgr_u8_sc(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { @@ -240,7 +240,7 @@ static void rgba_to_bgr_u8_sc(const uint8_t *src, size_t src_stride, sve2::apply_operation_by_rows(operation, rect, src_rows, dst_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void rgba_to_rgb_u8_sc(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) INTRINSICCV_STREAMING_COMPATIBLE { diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_sme2.cpp b/intrinsiccv/src/conversions/rgb_to_rgb_sme2.cpp index 389599af6..b3ba5d959 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_sme2.cpp +++ b/intrinsiccv/src/conversions/rgb_to_rgb_sme2.cpp @@ -6,42 +6,42 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgb_to_bgr_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgr_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgb_to_bgr_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgba_to_bgra_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgra_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgba_to_bgra_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgb_to_bgra_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgra_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgb_to_bgra_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgb_to_rgba_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgb_to_rgba_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgb_to_rgba_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgba_to_bgr_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgr_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgba_to_bgr_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void rgba_to_rgb_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void rgba_to_rgb_u8( const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { intrinsiccv::sve2::rgba_to_rgb_u8_sc(src, src_stride, dst, dst_stride, width, diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_sve2.cpp b/intrinsiccv/src/conversions/rgb_to_rgb_sve2.cpp index 883ff5346..fe9e695d8 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_sve2.cpp +++ b/intrinsiccv/src/conversions/rgb_to_rgb_sve2.cpp @@ -6,37 +6,37 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgb_to_bgr_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgba_to_bgra_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_bgra_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgb_to_bgra_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgb_to_rgba_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgb_to_rgba_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_bgr_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgba_to_bgr_u8_sc(src, src_stride, dst, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void rgba_to_rgb_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height) { rgba_to_rgb_u8_sc(src, src_stride, dst, dst_stride, width, height); diff --git a/intrinsiccv/src/conversions/split_neon.cpp b/intrinsiccv/src/conversions/split_neon.cpp index 7b61c005e..d125c5491 100644 --- a/intrinsiccv/src/conversions/split_neon.cpp +++ b/intrinsiccv/src/conversions/split_neon.cpp @@ -292,7 +292,7 @@ void split(const void *src_data, const size_t src_stride, void **dst_data, } } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void split(const void *src_data, size_t src_stride, void **dst_data, size_t *dst_strides, size_t width, size_t height, size_t channels, size_t element_size) { diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp b/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp index c872fc3ec..79b34ff53 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp @@ -302,7 +302,7 @@ void yuv2rgbx_operation(OperationType &operation, const ScalarType *src_y, zip_parallel_rows(row_based_operation, rect, y_rows, uv_rows, rgbx_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_rgb_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, @@ -312,7 +312,7 @@ void yuv_sp_to_rgb_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_rgba_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, @@ -322,7 +322,7 @@ void yuv_sp_to_rgba_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_bgr_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, @@ -332,7 +332,7 @@ void yuv_sp_to_bgr_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_bgra_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_sc.h b/intrinsiccv/src/conversions/yuv_to_rgb_sc.h index 0d2ca35c5..f36fafbd9 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/yuv_to_rgb_sc.h @@ -208,7 +208,7 @@ void yuv2rgbx_operation(OperationType &operation, const ScalarType *src_y, zip_parallel_rows(row_based_operation, rect, y_rows, uv_rows, rgbx_rows); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void yuv_sp_to_rgb_u8_sc(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, @@ -219,7 +219,7 @@ static void yuv_sp_to_rgb_u8_sc(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void yuv_sp_to_rgba_u8_sc( const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, @@ -229,7 +229,7 @@ static void yuv_sp_to_rgba_u8_sc( dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void yuv_sp_to_bgr_u8_sc(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, @@ -240,7 +240,7 @@ static void yuv_sp_to_bgr_u8_sc(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void yuv_sp_to_bgra_u8_sc( const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_sme2.cpp b/intrinsiccv/src/conversions/yuv_to_rgb_sme2.cpp index a5088aa88..8b1cb889e 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_sme2.cpp +++ b/intrinsiccv/src/conversions/yuv_to_rgb_sme2.cpp @@ -6,7 +6,7 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_rgb_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_rgb_u8( const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, bool is_nv21) { @@ -15,16 +15,17 @@ INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_rgb_u8( height, is_nv21); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_rgba_u8( - const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, - size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, - size_t height, bool is_nv21) { +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void +yuv_sp_to_rgba_u8(const uint8_t *src_y, size_t src_y_stride, + const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, + size_t dst_stride, size_t width, size_t height, + bool is_nv21) { intrinsiccv::sve2::yuv_sp_to_rgba_u8_sc(src_y, src_y_stride, src_uv, src_uv_stride, dst, dst_stride, width, height, is_nv21); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_bgr_u8( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_bgr_u8( const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, bool is_nv21) { @@ -33,10 +34,11 @@ INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_bgr_u8( height, is_nv21); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void yuv_sp_to_bgra_u8( - const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, - size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, - size_t height, bool is_nv21) { +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void +yuv_sp_to_bgra_u8(const uint8_t *src_y, size_t src_y_stride, + const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, + size_t dst_stride, size_t width, size_t height, + bool is_nv21) { intrinsiccv::sve2::yuv_sp_to_bgra_u8_sc(src_y, src_y_stride, src_uv, src_uv_stride, dst, dst_stride, width, height, is_nv21); diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_sve2.cpp b/intrinsiccv/src/conversions/yuv_to_rgb_sve2.cpp index 73c756893..c15e94e0d 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_sve2.cpp +++ b/intrinsiccv/src/conversions/yuv_to_rgb_sve2.cpp @@ -6,7 +6,7 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_rgb_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, @@ -15,7 +15,7 @@ void yuv_sp_to_rgb_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height, is_nv21); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_rgba_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, @@ -24,7 +24,7 @@ void yuv_sp_to_rgba_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height, is_nv21); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_bgr_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, @@ -33,7 +33,7 @@ void yuv_sp_to_bgr_u8(const uint8_t *src_y, size_t src_y_stride, dst_stride, width, height, is_nv21); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void yuv_sp_to_bgra_u8(const uint8_t *src_y, size_t src_y_stride, const uint8_t *src_uv, size_t src_uv_stride, uint8_t *dst, size_t dst_stride, size_t width, diff --git a/intrinsiccv/src/filters/gaussian_blur_neon.cpp b/intrinsiccv/src/filters/gaussian_blur_neon.cpp index ac67b6ba2..4e29acd38 100644 --- a/intrinsiccv/src/filters/gaussian_blur_neon.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_neon.cpp @@ -161,7 +161,7 @@ void discrete_gaussian_blur(const ScalarType *src, size_t src_stride, workspace->process(rect, src_rows, dst_rows, channels, border_type, filter); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void gaussian_blur_3x3_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels, @@ -171,7 +171,7 @@ void gaussian_blur_3x3_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, height, channels, border_type, params); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void gaussian_blur_5x5_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels, diff --git a/intrinsiccv/src/filters/gaussian_blur_sme2.cpp b/intrinsiccv/src/filters/gaussian_blur_sme2.cpp index 34f9b749b..ccd474a9b 100644 --- a/intrinsiccv/src/filters/gaussian_blur_sme2.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_sme2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void gaussian_blur_5x5_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels, intrinsiccv_border_type_t border_type, diff --git a/intrinsiccv/src/filters/gaussian_blur_sve2.cpp b/intrinsiccv/src/filters/gaussian_blur_sve2.cpp index 67d1d07d5..f0444df23 100644 --- a/intrinsiccv/src/filters/gaussian_blur_sve2.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_sve2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void gaussian_blur_5x5_u8(const uint8_t *src, size_t src_stride, uint8_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels, diff --git a/intrinsiccv/src/filters/sobel_neon.cpp b/intrinsiccv/src/filters/sobel_neon.cpp index cea293099..820c2b0d8 100644 --- a/intrinsiccv/src/filters/sobel_neon.cpp +++ b/intrinsiccv/src/filters/sobel_neon.cpp @@ -116,7 +116,7 @@ class VerticalSobel3x3 { } }; // end of class VerticalSobel3x3 -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_horizontal_s16_u8(const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { @@ -136,7 +136,7 @@ void sobel_3x3_horizontal_s16_u8(const uint8_t *src, size_t src_stride, INTRINSICCV_BORDER_TYPE_REPLICATE, filter); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_vertical_s16_u8(const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { diff --git a/intrinsiccv/src/filters/sobel_sc.h b/intrinsiccv/src/filters/sobel_sc.h index a4f0d96ec..d3c172f56 100644 --- a/intrinsiccv/src/filters/sobel_sc.h +++ b/intrinsiccv/src/filters/sobel_sc.h @@ -115,7 +115,7 @@ class VerticalSobel3x3 { } }; // end of class VerticalSobel3x3 -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void sobel_3x3_horizontal_s16_u8_sc( const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, @@ -137,7 +137,7 @@ static void sobel_3x3_horizontal_s16_u8_sc( INTRINSICCV_BORDER_TYPE_REPLICATE, filter); } -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS static void sobel_3x3_vertical_s16_u8_sc( const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, diff --git a/intrinsiccv/src/filters/sobel_sme2.cpp b/intrinsiccv/src/filters/sobel_sme2.cpp index 7b4550758..2d973850c 100644 --- a/intrinsiccv/src/filters/sobel_sme2.cpp +++ b/intrinsiccv/src/filters/sobel_sme2.cpp @@ -6,7 +6,7 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_horizontal_s16_u8(const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { @@ -14,7 +14,7 @@ sobel_3x3_horizontal_s16_u8(const uint8_t *src, size_t src_stride, int16_t *dst, src, src_stride, dst, dst_stride, width, height, channels); } -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_vertical_s16_u8(const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { diff --git a/intrinsiccv/src/filters/sobel_sve2.cpp b/intrinsiccv/src/filters/sobel_sve2.cpp index 4db53d918..bfa3185ac 100644 --- a/intrinsiccv/src/filters/sobel_sve2.cpp +++ b/intrinsiccv/src/filters/sobel_sve2.cpp @@ -6,14 +6,14 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS void sobel_3x3_horizontal_s16_u8( +INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_horizontal_s16_u8( const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { sobel_3x3_horizontal_s16_u8_sc(src, src_stride, dst, dst_stride, width, height, channels); } -INTRINSICCV_TARGET_FN_ATTS void sobel_3x3_vertical_s16_u8( +INTRINSICCV_TARGET_FN_ATTRS void sobel_3x3_vertical_s16_u8( const uint8_t *src, size_t src_stride, int16_t *dst, size_t dst_stride, size_t width, size_t height, size_t channels) { sobel_3x3_vertical_s16_u8_sc(src, src_stride, dst, dst_stride, width, height, diff --git a/intrinsiccv/src/morphology/morphology_neon.cpp b/intrinsiccv/src/morphology/morphology_neon.cpp index f2da2cd72..eab1d0b40 100644 --- a/intrinsiccv/src/morphology/morphology_neon.cpp +++ b/intrinsiccv/src/morphology/morphology_neon.cpp @@ -567,7 +567,7 @@ void erode(const T *src, size_t src_stride, T *dst, size_t dst_stride, } #define INTRINSICCV_INSTANTIATE_TEMPLATE(name, type) \ - template INTRINSICCV_TARGET_FN_ATTS void name( \ + template INTRINSICCV_TARGET_FN_ATTRS void name( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, \ const intrinsiccv_morphology_params_t *params) diff --git a/intrinsiccv/src/morphology/morphology_sme2.cpp b/intrinsiccv/src/morphology/morphology_sme2.cpp index a3c70f0b9..d91ea0b95 100644 --- a/intrinsiccv/src/morphology/morphology_sme2.cpp +++ b/intrinsiccv/src/morphology/morphology_sme2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sme2 { template -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void dilate( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void dilate( const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width, size_t height, const intrinsiccv_morphology_params_t *params) { intrinsiccv::sve2::dilate_sc(src, src_stride, dst, dst_stride, width, @@ -15,7 +15,7 @@ INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void dilate( } template -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void erode( +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void erode( const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width, size_t height, const intrinsiccv_morphology_params_t *params) { intrinsiccv::sve2::erode_sc(src, src_stride, dst, dst_stride, width, @@ -23,7 +23,7 @@ INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void erode( } #define INTRINSICCV_INSTANTIATE_TEMPLATE(name, type) \ - template INTRINSICCV_TARGET_FN_ATTS void name( \ + template INTRINSICCV_TARGET_FN_ATTRS void name( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, \ const intrinsiccv_morphology_params_t *params) diff --git a/intrinsiccv/src/morphology/morphology_sve2.cpp b/intrinsiccv/src/morphology/morphology_sve2.cpp index e0d6c16bf..55332d1f4 100644 --- a/intrinsiccv/src/morphology/morphology_sve2.cpp +++ b/intrinsiccv/src/morphology/morphology_sve2.cpp @@ -7,21 +7,21 @@ namespace intrinsiccv::sve2 { template -void INTRINSICCV_TARGET_FN_ATTS +void INTRINSICCV_TARGET_FN_ATTRS dilate(const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width, size_t height, const intrinsiccv_morphology_params_t *params) { dilate_sc(src, src_stride, dst, dst_stride, width, height, params); } template -void INTRINSICCV_TARGET_FN_ATTS +void INTRINSICCV_TARGET_FN_ATTRS erode(const T *src, size_t src_stride, T *dst, size_t dst_stride, size_t width, size_t height, const intrinsiccv_morphology_params_t *params) { erode_sc(src, src_stride, dst, dst_stride, width, height, params); } #define INTRINSICCV_INSTANTIATE_TEMPLATE(name, type) \ - template INTRINSICCV_TARGET_FN_ATTS void name( \ + template INTRINSICCV_TARGET_FN_ATTRS void name( \ const type *src, size_t src_stride, type *dst, size_t dst_stride, \ size_t width, size_t height, \ const intrinsiccv_morphology_params_t *params) diff --git a/intrinsiccv/src/resize/resize_neon.cpp b/intrinsiccv/src/resize/resize_neon.cpp index 8b0d845cf..4d69a2cf6 100644 --- a/intrinsiccv/src/resize/resize_neon.cpp +++ b/intrinsiccv/src/resize/resize_neon.cpp @@ -8,7 +8,7 @@ namespace intrinsiccv::neon { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void resize_to_quarter_u8(const uint8_t *src, size_t src_stride, size_t src_width, size_t src_height, uint8_t *dst, size_t dst_stride, size_t dst_width, diff --git a/intrinsiccv/src/resize/resize_sc.h b/intrinsiccv/src/resize/resize_sc.h index 107d345b2..1e417114e 100644 --- a/intrinsiccv/src/resize/resize_sc.h +++ b/intrinsiccv/src/resize/resize_sc.h @@ -139,7 +139,7 @@ static inline void process_single_row( } } -INTRINSICCV_TARGET_FN_ATTS static void resize_to_quarter_u8_sc( +INTRINSICCV_TARGET_FN_ATTRS static void resize_to_quarter_u8_sc( const uint8_t *src, size_t src_stride, size_t src_width, size_t src_height, uint8_t *dst, size_t dst_stride, size_t dst_width, size_t dst_height) INTRINSICCV_STREAMING_COMPATIBLE { diff --git a/intrinsiccv/src/resize/resize_sme2.cpp b/intrinsiccv/src/resize/resize_sme2.cpp index 3dee4382c..428ac023d 100644 --- a/intrinsiccv/src/resize/resize_sme2.cpp +++ b/intrinsiccv/src/resize/resize_sme2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sme2 { -INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTS void +INTRINSICCV_LOCALLY_STREAMING INTRINSICCV_TARGET_FN_ATTRS void resize_to_quarter_u8(const uint8_t *src, size_t src_stride, size_t src_width, size_t src_height, uint8_t *dst, size_t dst_stride, size_t dst_width, size_t dst_height) { diff --git a/intrinsiccv/src/resize/resize_sve2.cpp b/intrinsiccv/src/resize/resize_sve2.cpp index 8c3bb36b9..2fe08bed6 100644 --- a/intrinsiccv/src/resize/resize_sve2.cpp +++ b/intrinsiccv/src/resize/resize_sve2.cpp @@ -7,7 +7,7 @@ namespace intrinsiccv::sve2 { -INTRINSICCV_TARGET_FN_ATTS +INTRINSICCV_TARGET_FN_ATTRS void resize_to_quarter_u8(const uint8_t *src, size_t src_stride, size_t src_width, size_t src_height, uint8_t *dst, size_t dst_stride, size_t dst_width, -- GitLab