Create 0001-avcodec-x86-mathops-clip-constants.patch (#33)

ADD: Create patch file `scripts/patch/ffmpeg/0001-avcodec-x86-mathops-clip-constants.patch`
Created a temporary file based patch for FFmpeg This will be removed after version advancement/upgrade to more recent version of FFmpeg:

ADD: Commands to `03_build_raisr_ffmpeg.sh` to reflect the added patch file.

Co-authored by: @djie1

Signed-off-by: Miłosz Linkiewicz <[email protected]>

Author: Mionsz

.github/workflows/build-baremetal-coverity.yml

@@ -85,7 +85,11 @@ jobs:
         token: ${{ secrets.COVERITY_SCAN_TOKEN }}
         build_language: 'cxx'
         build_platform: 'linux64'
-        command: ${{ github.workspace }}/./build.sh -DENABLE_RAISR_OPENCL=ON -DENABLE_AVX512FP16=ON -DENABLE_AVX512=ON
+        command: |
+          "${{ github.workspace }}/build.sh" -DENABLE_RAISR_OPENCL=ON \
+            -DCMAKE_LIBRARY_PATH="/opt/intel/oneapi/ipp/latest/lib;${PREFIX}/lib;" \
+            -DCMAKE_C_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp" \
+            -DCMAKE_CXX_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp"
 
     - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       with:

.github/workflows/build-baremetal-ubuntu.yml

@@ -74,21 +74,27 @@ jobs:
         sudo apt-get update --fix-missing && \
         sudo apt-get install --no-install-recommends -y intel-oneapi-ipp-devel-2022.0
 
-    - name: 'Download and patch ffmpeg repository'
+    - name: 'preparation: download and patch ffmpeg repository'
       run: |
         set -eo pipefail && \
         curl -Lf https://github.com/ffmpeg/ffmpeg/archive/${FFMPEG_COMMIT_ID}.tar.gz | tar -zx --strip-components=1 -C "${BUILD_FFMPEG_DIR}"
         patch -d "${BUILD_FFMPEG_DIR}" -p1 -i <(cat "${{ github.workspace }}/ffmpeg/"*.patch)
         cp "${{ github.workspace }}/ffmpeg/vf_raisr"*.c "${BUILD_FFMPEG_DIR}/libavfilter"
 
-    - name: 'Build RAISR from source code'
+    - name: 'build: building RAISR from source code'
       run: |
         ./build.sh -DENABLE_RAISR_OPENCL=ON \
           -DCMAKE_LIBRARY_PATH="/opt/intel/oneapi/ipp/latest/lib;${PREFIX}/lib;" \
           -DCMAKE_C_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp" \
           -DCMAKE_CXX_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp"
 
-    - name: 'Configure ffmpeg repository'
+    - name: 'post-build: upload build artifacts'
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      with:
+        name: raisr-library-binary
+        path: '${{ github.workspace }}/build/Library'
+
+    - name: 'preparation: configure ffmpeg repository'
       continue-on-error: true
       run: |
         cd "${BUILD_FFMPEG_DIR}"
@@ -109,12 +115,54 @@ jobs:
           --prefix="${PREFIX}" || \
         { tail -n 100 "${BUILD_DIR}/ffmpeg/ffbuild/config.log" && exit 1; }
 
-    - name: 'Build, install and check ffmpeg'
+    - name: 'build: compilation and install of ffmpeg'
       continue-on-error: true
+      working-directory: "${BUILD_FFMPEG_DIR}"
       run: |
-        cd "${BUILD_FFMPEG_DIR}"
         make clean
         make -j"$(nproc)"
         sudo -E make install
+
+    - name: 'checks: check if ffmpeg was build properly'
+      continue-on-error: true
+      working-directory: "${BUILD_FFMPEG_DIR}"
+      run: |
         sudo -E ldconfig
-        ffmpeg -buildconf
+        ./ffmpeg -buildconf || \
+        ffmpeg -buildconf   || \
+        /usr/local/bin/ffmpeg -buildconf
+
+  build-baremetal-using-scripts:
+    runs-on: 'ubuntu-22.04'
+    timeout-minutes: 70
+    steps:
+    - name: 'preparations: Harden Runner'
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      with:
+        egress-policy: audit
+
+    - name: 'preparations: Checkout repository'
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+    - name: 'prerequisites: Download/Pull resources'
+      shell: bash
+      working-directory: scripts
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "Ubuntu Action Runnner"
+
+    - name: 'prerequisites: Download/Pull resources'
+      shell: bash
+      working-directory: scripts
+      run: ./01_pull_resources.sh
+
+    - name: 'prerequisites: Install prerequisites'
+      shell: bash
+      working-directory: scripts
+      run: ./02_install_prerequisites.sh ./raisr.tar.gz
+
+    - name: 'Build raisr and ffmpeg'
+      shell: bash
+      working-directory: scripts
+      run: ./03_build_raisr_ffmpeg.sh ./raisr/Video-Super-Resolution-Library
+

scripts/03_build_raisr_ffmpeg.sh

@@ -31,6 +31,10 @@ pushd "${raisr_path}"
 sudo -E ./build.sh
 popd
 
+# TO-DO: Remove patch apply from bellow lines:
+# Apply a temporary patch - this will be removed after version of FFmpeg gets updated
+patch -d "${raisr_path}/../ffmpeg" -p1 -i <(cat "${raisr_path}/scripts/patch/ffmpeg/"*.patch)
+
 # build ffmpeg
 pushd "${raisr_path}/../ffmpeg"
 cp "${raisr_path}/ffmpeg/vf_raisr.c" libavfilter/

scripts/patch/ffmpeg/0001-avcodec-x86-mathops-clip-constants.patch

@@ -0,0 +1,75 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
+ instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+Signed-off-by: James Almer <[email protected]>
+---
+ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+index 6298f5ed19..ca7e2dffc1 100644
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+ 
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+-- 
+2.34.1