aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-04-11 03:41:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-11 03:41:10 +0000
commit48d57767536bec601acff57fcc213a44f707466c (patch)
tree57818d6b3bebbe6f50c95928e62d54f95de7666a
parent507a8f0d5276cafc0f821280fd61095b10edba42 (diff)
parent747a2a63e1eb80dda67cc4e3635d5773408b70d4 (diff)
downloadpsimd-48d57767536bec601acff57fcc213a44f707466c.tar.gz
Merge "Upgrade psimd to 88882f601f8179e1987b7e7cf4a8012c9080ad44" am: b505e9873f am: 00780e1446 am: 747a2a63e1
Change-Id: I9e2d596a4402838ac5de71eaf5246dd5bad3672e
-rw-r--r--METADATA12
-rw-r--r--include/psimd.h2
2 files changed, 8 insertions, 6 deletions
diff --git a/METADATA b/METADATA
index 5b1c1a4..347116a 100644
--- a/METADATA
+++ b/METADATA
@@ -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;