From 7b249298c0c014c99132d4fe5bc40c2e7d617bbb Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 18 Oct 2017 13:17:09 -0500
Subject: [PATCH] Uncomment _mm256_mpsadbw_epu8 (#128)

Just needed some `constify_imm8!` treatment

Closes #59
---
 library/stdarch/ci/run.sh       |  3 ---
 library/stdarch/src/x86/avx2.rs | 13 +++++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh
index 0c8dbf742f43..0f338c9e4666 100755
--- a/library/stdarch/ci/run.sh
+++ b/library/stdarch/ci/run.sh
@@ -2,9 +2,6 @@
 
 set -ex
 
-# FIXME(rust-lang/rust#45201) shouldn't need to specify one codegen unit
-export RUSTFLAGS="$RUSTFLAGS -C codegen-units=1"
-
 # Tests are all super fast anyway, and they fault often enough on travis that
 # having only one thread increases debuggability to be worth it.
 export RUST_TEST_THREADS=1
diff --git a/library/stdarch/src/x86/avx2.rs b/library/stdarch/src/x86/avx2.rs
index 75471658b5bb..c055ba1dce31 100644
--- a/library/stdarch/src/x86/avx2.rs
+++ b/library/stdarch/src/x86/avx2.rs
@@ -573,9 +573,6 @@ pub unsafe fn _mm256_movemask_epi8(a: i8x32) -> i32 {
     pmovmskb(a)
 }
 
-/*
-LLVM ERROR: Cannot select: intrinsic %llvm.x86.avx2.mpsadbw
-
 /// Compute the sum of absolute differences (SADs) of quadruplets of unsigned
 /// 8-bit integers in `a` compared to those in `b`, and store the 16-bit
 /// results in dst. Eight SADs are performed for each 128-bit lane using one
@@ -585,11 +582,13 @@ LLVM ERROR: Cannot select: intrinsic %llvm.x86.avx2.mpsadbw
 /// starting at the offset specified in `imm8`.
 #[inline(always)]
 #[target_feature = "+avx2"]
-#[cfg_attr(test, assert_instr(vmpsadbw))]
+#[cfg_attr(test, assert_instr(vmpsadbw, imm8 = 0))]
 pub unsafe fn _mm256_mpsadbw_epu8(a: u8x32, b: u8x32, imm8: i32) -> u16x16 {
-    mpsadbw(a, b, imm8)
+    macro_rules! call {
+        ($imm8:expr) => (mpsadbw(a, b, $imm8))
+    }
+    constify_imm8!(imm8, call)
 }
-*/
 
 /// Multiply the low 32-bit integers from each packed 64-bit element in
 /// `a` and `b`
@@ -1767,7 +1766,6 @@ mod tests {
         assert_eq!(r, e);
     }
 
-    /*
     #[simd_test = "avx2"]
     unsafe fn _mm256_mpsadbw_epu8() {
         let a = u8x32::splat(2);
@@ -1776,7 +1774,6 @@ mod tests {
         let e = u16x16::splat(8);
         assert_eq!(r, e);
     }
-    */
 
     #[simd_test = "avx2"]
     unsafe fn _mm256_mul_epi32() {