From 254fa3dbf57981495f87d0d7e3ef112e04d74cf8 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Thu, 29 Jun 2017 17:44:46 -0500 Subject: [PATCH] swr/rast: Fix use of KNL-only intrinsics in SKX build Reviewed-by: Bruce Cherniak --- .../drivers/swr/rasterizer/common/simdlib_128_avx512.inl | 4 ++-- .../drivers/swr/rasterizer/common/simdlib_256_avx512.inl | 4 ++-- .../drivers/swr/rasterizer/common/simdlib_512_avx512.inl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/common/simdlib_128_avx512.inl b/src/gallium/drivers/swr/rasterizer/common/simdlib_128_avx512.inl index 3ab41a23651..aaa74146ad9 100644 --- a/src/gallium/drivers/swr/rasterizer/common/simdlib_128_avx512.inl +++ b/src/gallium/drivers/swr/rasterizer/common/simdlib_128_avx512.inl @@ -167,8 +167,8 @@ SIMD_WRAPPER_3(fmsub_ps); // return (a * b) - c SIMD_WRAPPER_2(max_ps); // return (a > b) ? a : b SIMD_WRAPPER_2(min_ps); // return (a < b) ? a : b SIMD_WRAPPER_2(mul_ps); // return a * b -SIMD_WRAPPER_1_(rcp_ps, rcp28_ps, __mmask16(0xf)); // return 1.0f / a -SIMD_WRAPPER_1_(rsqrt_ps, rsqrt28_ps, __mmask16(0xf)); // return 1.0f / sqrt(a) +SIMD_WRAPPER_1_(rcp_ps, rcp14_ps, __mmask16(0xf)); // return 1.0f / a +SIMD_WRAPPER_1_(rsqrt_ps, rsqrt14_ps, __mmask16(0xf)); // return 1.0f / sqrt(a) SIMD_WRAPPER_2(sub_ps); // return a - b //----------------------------------------------------------------------- diff --git a/src/gallium/drivers/swr/rasterizer/common/simdlib_256_avx512.inl b/src/gallium/drivers/swr/rasterizer/common/simdlib_256_avx512.inl index 76afbd01c05..5103bdafa22 100644 --- a/src/gallium/drivers/swr/rasterizer/common/simdlib_256_avx512.inl +++ b/src/gallium/drivers/swr/rasterizer/common/simdlib_256_avx512.inl @@ -167,8 +167,8 @@ SIMD_WRAPPER_3(fmsub_ps); // return (a * b) - c SIMD_WRAPPER_2(max_ps); // return (a > b) ? a : b SIMD_WRAPPER_2(min_ps); // return (a < b) ? a : b SIMD_WRAPPER_2(mul_ps); // return a * b -//SIMD_WRAPPER_1_(rcp_ps, rcp28_ps, __mmask16(0xff)); // return 1.0f / a -//SIMD_WRAPPER_1_(rsqrt_ps, rsqrt28_ps, __mmask16(0xff)); // return 1.0f / sqrt(a) +SIMD_WRAPPER_1_(rcp_ps, rcp14_ps, __mmask16(0xff)); // return 1.0f / a +SIMD_WRAPPER_1_(rsqrt_ps, rsqrt14_ps, __mmask16(0xff)); // return 1.0f / sqrt(a) SIMD_WRAPPER_2(sub_ps); // return a - b //----------------------------------------------------------------------- diff --git a/src/gallium/drivers/swr/rasterizer/common/simdlib_512_avx512.inl b/src/gallium/drivers/swr/rasterizer/common/simdlib_512_avx512.inl index 535e4ed8ca0..7d90b7d1b05 100644 --- a/src/gallium/drivers/swr/rasterizer/common/simdlib_512_avx512.inl +++ b/src/gallium/drivers/swr/rasterizer/common/simdlib_512_avx512.inl @@ -167,8 +167,8 @@ SIMD_WRAPPER_3(fmsub_ps); // return (a * b) - c SIMD_WRAPPER_2(max_ps); // return (a > b) ? a : b SIMD_WRAPPER_2(min_ps); // return (a < b) ? a : b SIMD_WRAPPER_2(mul_ps); // return a * b -SIMD_WRAPPER_1_(rcp_ps, _mm512_rcp28_ps); // return 1.0f / a -SIMD_WRAPPER_1_(rsqrt_ps, _mm512_rsqrt28_ps); // return 1.0f / sqrt(a) +SIMD_WRAPPER_1_(rcp_ps, _mm512_rcp14_ps); // return 1.0f / a +SIMD_WRAPPER_1_(rsqrt_ps, _mm512_rsqrt14_ps); // return 1.0f / sqrt(a) SIMD_WRAPPER_2(sub_ps); // return a - b template -- 2.30.2