From 8076d427b44271737caf6a8c3ebf993fd889a46d Mon Sep 17 00:00:00 2001
From: Ioana Ghiban <ioana.ghiban@arm.com>
Date: Thu, 4 Jul 2024 11:04:01 +0200
Subject: [PATCH 1/2] Fix minMaxVals benchmarks

Make min_max benchmarks consistent with the rest.
---
 scripts/benchmark/run_benchmarks_4K.sh  | 12 ++++++------
 scripts/benchmark/run_benchmarks_FHD.sh | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/benchmark/run_benchmarks_4K.sh b/scripts/benchmark/run_benchmarks_4K.sh
index 3582b7bfe..378b375a4 100755
--- a/scripts/benchmark/run_benchmarks_4K.sh
+++ b/scripts/benchmark/run_benchmarks_4K.sh
@@ -60,11 +60,11 @@ RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL
 RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL Scale_float_1.0 opencv_perf_core '*convertTo*' '(3840x2160, 32FC1, 32FC1, 1, 1, 4.567)')")
 RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL Scale_float opencv_perf_core '*convertTo*' '(3840x2160, 32FC1, 32FC1, 1, 1.234, 4.567)')")
 
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S8_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 8SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_U8_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 8UC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S16_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 16SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_U16_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 16UC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S32_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 32SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_F32_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 32FC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S8_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 8SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_U8_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 8UC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S16_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 16SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_U16_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 16UC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S32_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 32SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_F32_4K opencv_perf_core '*minMaxVals*' '(3840x2160, 32FC1)')")
 
 echo "$RES"
diff --git a/scripts/benchmark/run_benchmarks_FHD.sh b/scripts/benchmark/run_benchmarks_FHD.sh
index 533a17759..6db3a16a5 100755
--- a/scripts/benchmark/run_benchmarks_FHD.sh
+++ b/scripts/benchmark/run_benchmarks_FHD.sh
@@ -60,11 +60,11 @@ RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL
 RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL Scale_float_1.0 opencv_perf_core '*convertTo*' '(1920x1080, 32FC1, 32FC1, 1, 1, 4.567)')")
 RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL Scale_float opencv_perf_core '*convertTo*' '(1920x1080, 32FC1, 32FC1, 1, 1.234, 4.567)')")
 
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S8_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 8SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_U8_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 8UC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S16_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 16SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_U16_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 16UC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_S32_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 32SC1)')")
-RES=$(printf "${RES}\n$(${DEV_DIR}/perf_test_op.sh $CPU $THERMAL MinMax_F32_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 32FC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S8_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 8SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_U8_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 8UC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S16_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 16SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_U16_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 16UC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_S32_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 32SC1)')")
+RES+=$(printf "\n$(${DEV_DIR}/perf_test_op.sh $CUSTOM_BUILD_SUFFIX $CPU $THERMAL MinMax_F32_FHD opencv_perf_core '*minMaxVals*' '(1920x1080, 32FC1)')")
 
 echo "$RES"
-- 
GitLab


From 265fec7a5b7573fe704411b3c4bef4450ba25420 Mon Sep 17 00:00:00 2001
From: Ioana Ghiban <ioana.ghiban@arm.com>
Date: Thu, 4 Jul 2024 11:26:12 +0200
Subject: [PATCH 2/2] Fix min_max conformity tests

* Remove multiple channel tests (not exposed in HAL).
* Add float test.
* Make data type consistent with format.
---
 conformity/opencv/test_min_max.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/conformity/opencv/test_min_max.cpp b/conformity/opencv/test_min_max.cpp
index 9f9731e56..539e5b36c 100644
--- a/conformity/opencv/test_min_max.cpp
+++ b/conformity/opencv/test_min_max.cpp
@@ -86,16 +86,12 @@ bool test_min_max(int index, RecreatedMessageQueue& request_queue,
 std::vector<test>& min_max_tests_get() {
   // clang-format off
   static std::vector<test> tests = {
-    TEST("min_max_u8, 1 channel", (test_min_max<uint8_t, CV_8UC1, false>), (exec_min_max<false>)),
-    TEST("min_max_u8, 2 channel", (test_min_max<uint8_t, CV_8UC2, false>), (exec_min_max<false>)),
     TEST("min_max_s8, 1 channel", (test_min_max<int8_t, CV_8SC1, false>), (exec_min_max<false>)),
-    TEST("min_max_s8, 3 channel", (test_min_max<int8_t, CV_8SC3, false>), (exec_min_max<false>)),
+    TEST("min_max_u8, 1 channel", (test_min_max<uint8_t, CV_8UC1, false>), (exec_min_max<false>)),
+    TEST("min_max_s16, 1 channel", (test_min_max<int16_t, CV_16SC1, false>), (exec_min_max<false>)),
     TEST("min_max_u16, 1 channel", (test_min_max<uint16_t, CV_16UC1, false>), (exec_min_max<false>)),
-    TEST("min_max_u16, 4 channel", (test_min_max<uint16_t, CV_16UC4, false>), (exec_min_max<false>)),
-    TEST("min_max_u16, 1 channel", (test_min_max<int16_t, CV_16SC1, false>), (exec_min_max<false>)),
-    TEST("min_max_u16, 3 channel", (test_min_max<int16_t, CV_16SC3, false>), (exec_min_max<false>)),
-    TEST("min_max_s32, 2 channel", (test_min_max<int32_t, CV_32SC2, false>), (exec_min_max<false>)),
-    TEST("min_max_s32, 4 channel", (test_min_max<int32_t, CV_32SC4, false>), (exec_min_max<false>)),
+    TEST("min_max_s32, 1 channel", (test_min_max<int32_t, CV_32SC1, false>), (exec_min_max<false>)),
+    TEST("min_max_f32, 1 channel", (test_min_max<float, CV_32FC1, false>), (exec_min_max<false>)),
     TEST("min_max_loc_u8", (test_min_max<uint8_t, CV_8UC1, true>), (exec_min_max<true>)),
   };
   // clang-format on
-- 
GitLab