jxl-render (backport): Fix aarch64 forward DCT bug (#150)

* jxl-render: Fix aarch64 forward DCT bug * Run workflows on maintenance branches
tirr-c · Dec 23, 2023 · ef8538a · ef8538a
1 parent 1aceecd
commit ef8538a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - main
+      - v*.x
   workflow_dispatch: {}
 name: Build
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,9 +2,11 @@ on:
   push:
     branches:
       - main
+      - v*.x
   pull_request:
     branches:
       - main
+      - v*.x
 name: Continuous integration
 
 jobs:

diff --git a/crates/jxl-render/src/dct/aarch64.rs b/crates/jxl-render/src/dct/aarch64.rs
@@ -104,10 +104,7 @@ unsafe fn dct8_vec_forward(vl: Lane, vr: Lane) -> (Lane, Lane) {
     let output1_shifted = vextq_f32(output1, Lane::zero(), 1);
     let output1_mul = vsetq_lane_f32(std::f32::consts::SQRT_2, Lane::splat_f32(1.0), 0);
     let output1 = output1.muladd(output1_mul, output1_shifted);
-    (
-        vcombine_f32(vget_low_f32(output0), vget_low_f32(output1)),
-        vcombine_f32(vget_high_f32(output0), vget_high_f32(output1)),
-    )
+    (vzip1q_f32(output0, output1), vzip2q_f32(output0, output1))
 }
 
 unsafe fn dct8_vec_inverse(vl: Lane, vr: Lane) -> (Lane, Lane) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ on: @@
       push:
         branches:
           - main
+          - v*.x
       workflow_dispatch: {}
     name: Build
@@ Expand Down @@