Skip to content

Commit edcb15b

Browse files
committed
Pin nightly version
The build is currently failing: <https://github.com/image-rs/jpeg-decoder/runs/5618199478> 1. `aarch64_target_feature` was stabilized in rust-lang/rust#90621 2. `neon`/`fp` must be activated together, which is not yet the case for some intrinsics in `std`. See rust-lang/rust#91608 and rust-lang/rust#95044. Once either of the above solutions lands we can remove `aarch64_target_feature` and unpin nightly again.
1 parent 70ab215 commit edcb15b

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

.github/workflows/rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
strategy:
4545
matrix:
46-
rust: [nightly]
46+
rust: [nightly-2022-03-24]
4747
features: ["", "rayon", "nightly_aarch64_neon"]
4848

4949
steps:

src/arch/neon.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use core::arch::aarch64::*;
33

44
#[cfg(all(feature = "nightly_aarch64_neon", target_arch = "aarch64"))]
55
#[target_feature(enable = "neon")]
6-
#[target_feature(enable = "fp")]
76
unsafe fn idct8(data: &mut [int16x8_t; 8]) {
87
// The fixed-point constants here are obtained by taking the fractional part of the constants
98
// from the non-SIMD implementation and scaling them up by 1<<15. This is because
@@ -84,7 +83,6 @@ unsafe fn idct8(data: &mut [int16x8_t; 8]) {
8483

8584
#[cfg(all(feature = "nightly_aarch64_neon", target_arch = "aarch64"))]
8685
#[target_feature(enable = "neon")]
87-
#[target_feature(enable = "fp")]
8886
unsafe fn transpose8(data: &mut [int16x8_t; 8]) {
8987
// Use NEON's 2x2 matrix transposes (vtrn) to do the transposition in each 4x4 block, then
9088
// combine the 4x4 blocks.
@@ -112,7 +110,6 @@ unsafe fn transpose8(data: &mut [int16x8_t; 8]) {
112110

113111
#[cfg(all(feature = "nightly_aarch64_neon", target_arch = "aarch64"))]
114112
#[target_feature(enable = "neon")]
115-
#[target_feature(enable = "fp")]
116113
pub unsafe fn dequantize_and_idct_block_8x8(
117114
coefficients: &[i16; 64],
118115
quantization_table: &[u16; 64],
@@ -171,7 +168,6 @@ pub unsafe fn dequantize_and_idct_block_8x8(
171168

172169
#[cfg(all(feature = "nightly_aarch64_neon", target_arch = "aarch64"))]
173170
#[target_feature(enable = "neon")]
174-
#[target_feature(enable = "fp")]
175171
pub unsafe fn color_convert_line_ycbcr(y: &[u8], cb: &[u8], cr: &[u8], output: &mut [u8]) -> usize {
176172
assert!(output.len() % 3 == 0);
177173
let num = output.len() / 3;

0 commit comments

Comments
 (0)