diff options
| author | Haibo Huang <hhb@google.com> | 2020-04-11 03:28:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-11 03:28:30 +0000 |
| commit | 747a2a63e1eb80dda67cc4e3635d5773408b70d4 (patch) | |
| tree | 57818d6b3bebbe6f50c95928e62d54f95de7666a | |
| parent | d0293cd9ba6635febd2d0d6a7b25a1c509248588 (diff) | |
| parent | 00780e1446e90bd60dfffc993038b5d36ef730b8 (diff) | |
| download | psimd-747a2a63e1eb80dda67cc4e3635d5773408b70d4.tar.gz | |
Merge "Upgrade psimd to 88882f601f8179e1987b7e7cf4a8012c9080ad44" am: b505e9873f am: 00780e1446
Change-Id: I093cc30a77773f7d5b951c71e01a77a7b9ad6065
| -rw-r--r-- | METADATA | 12 | ||||
| -rw-r--r-- | include/psimd.h | 2 |
2 files changed, 8 insertions, 6 deletions
@@ -1,7 +1,5 @@ name: "psimd" -description: - "Portable 128-bit SIMD intrinsics" - +description: "Portable 128-bit SIMD intrinsics" third_party { url { type: HOMEPAGE @@ -11,7 +9,11 @@ third_party { type: GIT value: "https://github.com/Maratyszcza/psimd" } - version: "10b4ffc6ea9e2e11668f86969586f88bc82aaefa" - last_upgrade_date { year: 2020 month: 2 day: 3 } + version: "88882f601f8179e1987b7e7cf4a8012c9080ad44" license_type: NOTICE + last_upgrade_date { + year: 2020 + month: 2 + day: 21 + } } diff --git a/include/psimd.h b/include/psimd.h index 1aa1014..9890b82 100644 --- a/include/psimd.h +++ b/include/psimd.h @@ -667,7 +667,7 @@ return (psimd_f32) _mm_fmadd_ps((__m128) c, (__m128) a, (__m128) b); #elif (defined(__x86_64__) || defined(__i386__) || defined(__i686__)) && defined(__FMA4__) return (psimd_f32) _mm_macc_ps((__m128) c, (__m128) a, (__m128) b); - #elif defined(__wasm__) && defined(__wasm_simd128__) && defined(__clang__) + #elif defined(__wasm__) && defined(__wasm_simd128__) && defined(__clang__) && PSIMD_ENABLE_WASM_QFMA return (psimd_f32) __builtin_wasm_qfma_f32x4(a, b, c); #else return a + b * c; |