From 85578f0462e2febc05bc05564d13efdb7b05e6ca Mon Sep 17 00:00:00 2001
From: Anton Mitrokhin <anton.mitrokhin@phystech.edu>
Date: Tue, 3 Feb 2015 14:47:37 +0300
Subject: [PATCH] fixed 64-bit __ashr intrinsic

---
 examples/intrinsics/knc.h | 4 ++--
 fail_db.txt               | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/examples/intrinsics/knc.h b/examples/intrinsics/knc.h
index 20b27351..bbfe0a80 100644
--- a/examples/intrinsics/knc.h
+++ b/examples/intrinsics/knc.h
@@ -1006,8 +1006,8 @@ static FORCEINLINE __vec16_i64 __ashr(__vec16_i64 a, __vec16_i64 b) {
 }
 
 static FORCEINLINE __vec16_i64 __ashr(__vec16_i64 a, unsigned long long b) {
-__vec16_i32 xfer;
-  if (b <= 32) xfer = _mm512_slli_epi32(_mm512_and_epi32(a.v_hi, _mm512_set1_epi32((1<<b)-1)), 32-b);
+  __vec16_i32 xfer;
+  if (b < 32) xfer = _mm512_slli_epi32(_mm512_and_epi32(a.v_hi, _mm512_set1_epi32((1<<b)-1)), 32-b);
   else  xfer = _mm512_srai_epi32(a.v_hi, b-32);
   __vec16_i32 hi = _mm512_srai_epi32(a.v_hi, b);
   __vec16_i32 lo = _mm512_or_epi32(xfer, _mm512_srli_epi32(a.v_lo, b));
diff --git a/fail_db.txt b/fail_db.txt
index a90772e0..6f66260b 100644
--- a/fail_db.txt
+++ b/fail_db.txt
@@ -404,9 +404,7 @@
 ./tests/atomics-uniform-9.ispc compfail  x86-64     generic-16   Linux LLVM 3.6 clang++3.4 -O0 *
 ./tests/acos.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
 ./tests/asin.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
-./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc15.0 -O2 *
 ./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
-./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc15.0 -O2 *
 ./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
 ./tests/aossoa-1.ispc compfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
 ./tests/aossoa-2.ispc compfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O2 *
@@ -548,9 +546,7 @@
 ./tests/struct-nested-5.ispc compfail  x86-64            knc   Linux LLVM 3.4   icpc13.1 -O0 *
 ./tests/acos.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
 ./tests/asin.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
-./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc15.0 -O2 *
 ./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
-./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc15.0 -O2 *
 ./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
 ./tests/ptr-diff-3.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
 ./tests/ptr-diff-5.ispc runfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O2 *
@@ -720,9 +716,7 @@
 ./tests/struct-nested-5.ispc compfail  x86-64            knc   Linux LLVM 3.5   icpc13.1 -O0 *
 ./tests/acos.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
 ./tests/asin.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
-./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc15.0 -O2 *
 ./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
-./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc15.0 -O2 *
 ./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
 ./tests/ptr-diff-3.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
 ./tests/ptr-diff-5.ispc runfail  x86-64            knc   Linux LLVM 3.6   icpc13.1 -O2 *
@@ -1020,8 +1014,6 @@
 ./tests/exclusive-scan-add-7.ispc compfail  x86-64            knc   Linux LLVM 3.6   icpc15.0 -O2 *
 ./tests/funcptr-varying-7.ispc runfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
 ./tests/funcptr-varying-8.ispc runfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
-./tests/gather-int8-2.ispc runfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
-./tests/gather-int8-4.ispc runfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
 ./tests/atomics-6.ispc compfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
 ./tests/atomics-uniform-8.ispc compfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *
 ./tests/atomics-uniform-9.ispc compfail  x86-64            knc   Linux LLVM 3.7   icpc15.0 -O2 *