From 8578610d78e194f89f17c0939116300ae7c45983 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Fri, 16 Dec 2022 19:06:18 +0300 Subject: [PATCH] Remove more ARM suppressions in perf tests (#84) * Restore QR code tests on ARM after resize fix. * Remove supressions for QR perf test on ARM. --- .github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml | 2 +- .github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml | 2 +- .github/workflows/OCV-PR-4.x-ARM64.yaml | 2 +- .github/workflows/OCV-PR-4.x-macOS-ARM64.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml index 16ba8e2a..043773ad 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml @@ -24,7 +24,7 @@ env: OPENCV_TEST_DATA_PATH: '/home/ci/opencv_extra/testdata' OPENCV_CONTRIB_DOCKER_WORKDIR: '/home/ci/opencv_contrib' DNN_MODELS: '/home/ci/dnn-models' - GTEST_FILTER_STRING: '-tracking_GOTURN.GOTURN/*:Objdetect_QRCode_Close.regression/0:Perf_Objdetect_QRCode.detect/2:Perf_Objdetect_QRCode_Multi.detectMulti/0:Perf_Objdetect_QRCode_Multi.detectMulti/1:Perf_Objdetect_QRCode_Multi.detectMulti/3:Perf_Objdetect_QRCode_Multi.detectMulti/5:Perf_Objdetect_QRCode_Multi.detectMulti/6:Perf_Objdetect_QRCode_Multi.decodeMulti/0:Perf_Objdetect_QRCode_Multi.decodeMulti/1:Perf_Objdetect_QRCode_Multi.decodeMulti/3:Perf_Objdetect_QRCode_Multi.decodeMulti/6' + GTEST_FILTER_STRING: '-tracking_GOTURN.GOTURN/*' PARALLEL_JOBS: 16 jobs: diff --git a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml index 0bd7eeed..011c5180 100644 --- a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml @@ -21,7 +21,7 @@ env: ANT_HOME: '/usr/share/ant' PYTHONPATH: '${{ github.workspace }}/build/python_loader:$PYTHONPATH' OPENCV_TEST_DATA_PATH: '${{ github.workspace }}/opencv_extra/testdata' - GTEST_FILTER_STRING: '-Objdetect_QRCode_Close.regression/0:Perf_Objdetect_QRCode.detect/2:Perf_Objdetect_QRCode_Multi.detectMulti/0:Perf_Objdetect_QRCode_Multi.detectMulti/1:Perf_Objdetect_QRCode_Multi.detectMulti/3:Perf_Objdetect_QRCode_Multi.detectMulti/4:Perf_Objdetect_QRCode_Multi.detectMulti/5:Perf_Objdetect_QRCode_Multi.detectMulti/6:Perf_Objdetect_QRCode_Multi.decodeMulti/0:Perf_Objdetect_QRCode_Multi.decodeMulti/1:Perf_Objdetect_QRCode_Multi.decodeMulti/3:Perf_Objdetect_QRCode_Multi.decodeMulti/5:Perf_Objdetect_QRCode_Multi.decodeMulti/6:GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio_dynamic.basic_write:Tracking_Boosting.Boosting/0:Tracking_Boosting.Boosting/1:Tracking_Boosting.Boosting/2:Tracking_TLD.TLD/0:Tracking_TLD.TLD/1:Tracking_TLD.TLD/2:Tracking/DistanceAndOverlap.TLD/2:Tracking/DistanceAndOverlap.Scaled_Data_TLD/2:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67' + GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio_dynamic.basic_write:Tracking_Boosting.Boosting/0:Tracking_Boosting.Boosting/1:Tracking_Boosting.Boosting/2:Tracking_TLD.TLD/0:Tracking_TLD.TLD/1:Tracking_TLD.TLD/2:Tracking/DistanceAndOverlap.TLD/2:Tracking/DistanceAndOverlap.Scaled_Data_TLD/2:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67' jobs: BuildAndTest: diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml index b0262acb..5e382b0d 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64.yaml @@ -197,7 +197,7 @@ jobs: - name: Performance:objdetect timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} - run: cd $HOME/build && xvfb-run -a bin/opencv_perf_objdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} --gtest_filter="-Perf_Objdetect_QRCode.detect/2:Perf_Objdetect_QRCode_Multi.decodeMulti*:Perf_Objdetect_QRCode_Multi.detectMulti*" + run: cd $HOME/build && xvfb-run -a bin/opencv_perf_objdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }} - name: Performance:photo timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml index e144467f..19a708eb 100644 --- a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml @@ -21,7 +21,7 @@ env: ANT_HOME: '/usr/share/ant' PYTHONPATH: '${{ github.workspace }}/build/python_loader:$PYTHONPATH' OPENCV_TEST_DATA_PATH: '${{ github.workspace }}/opencv_extra/testdata' - GTEST_FILTER_STRING: '-Objdetect_QRCode_Close.regression/0:GOTURN.memory_usage:DaSiamRPN.memory_usage:Perf_Objdetect_QRCode.detect/2:Perf_Objdetect_QRCode_Multi.detectMulti/0:Perf_Objdetect_QRCode_Multi.detectMulti/1:Perf_Objdetect_QRCode_Multi.detectMulti/3:Perf_Objdetect_QRCode_Multi.detectMulti/4:Perf_Objdetect_QRCode_Multi.detectMulti/5:Perf_Objdetect_QRCode_Multi.detectMulti/6:Perf_Objdetect_QRCode_Multi.decodeMulti/0:Perf_Objdetect_QRCode_Multi.decodeMulti/1:Perf_Objdetect_QRCode_Multi.decodeMulti/3:Perf_Objdetect_QRCode_Multi.decodeMulti/5:Perf_Objdetect_QRCode_Multi.decodeMulti/6:videoio_dynamic.basic_write:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67' + GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio_dynamic.basic_write:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67' jobs: BuildAndTest: