diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-10-04 15:45:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 15:45:43 +0200 |
| commit | 5bd9ce5cd4f455a113d41bdf481606fc7545e618 (patch) | |
| tree | daf9a8d1d7ae175d27d98789b5f6ec9ab110122c /compiler/rustc_codegen_llvm/src | |
| parent | 80953177ede031b953b5d3fb77051809f8ef4deb (diff) | |
| parent | e41a14412e207aac5f7d686d395bc6a23f643dc9 (diff) | |
| download | rust-5bd9ce5cd4f455a113d41bdf481606fc7545e618.tar.gz rust-5bd9ce5cd4f455a113d41bdf481606fc7545e618.zip | |
Rollup merge of #77504 - Amanieu:select_simd_bitmask, r=ecstatic-morse
Support vectors with fewer than 8 elements for simd_select_bitmask Resolves the issue raised here: https://github.com/rust-lang/stdarch/issues/310#issuecomment-693730094
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/intrinsic.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs index 7f5b09eac4f..e76e86f5651 100644 --- a/compiler/rustc_codegen_llvm/src/intrinsic.rs +++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs @@ -793,14 +793,18 @@ fn generic_simd_intrinsic( require_simd!(arg_tys[1], "argument"); let v_len = arg_tys[1].simd_size(tcx); require!( - m_len == v_len, + // Allow masks for vectors with fewer than 8 elements to be + // represented with a u8 or i8. + m_len == v_len || (m_len == 8 && v_len < 8), "mismatched lengths: mask length `{}` != other vector length `{}`", m_len, v_len ); let i1 = bx.type_i1(); - let i1xn = bx.type_vector(i1, m_len); - let m_i1s = bx.bitcast(args[0].immediate(), i1xn); + let im = bx.type_ix(v_len); + let i1xn = bx.type_vector(i1, v_len); + let m_im = bx.trunc(args[0].immediate(), im); + let m_i1s = bx.bitcast(m_im, i1xn); return Ok(bx.select(m_i1s, args[1].immediate(), args[2].immediate())); } |