From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 10 Oct 2012 18:44:49 +0000 (+0100)
Subject: gallivm: Don't use llvm.x86.avx.max/min.ps.256 inadvertently.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf2edc776b02a2a63862bf69a23adf666ecfcc57;p=mesa.git

gallivm: Don't use llvm.x86.avx.max/min.ps.256 inadvertently.

Could happen when CPU supports AVX, but LLVM doesn't.
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
index d23ff0bf996..f6310a8ef30 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c
@@ -92,7 +92,7 @@ lp_build_min_simple(struct lp_build_context *bld,
             intrinsic = "llvm.x86.sse.min.ss";
             intr_size = 128;
          }
-         else if (type.length <= 4 || !util_cpu_caps.has_avx) {
+         else if (type.length <= 4 || !util_cpu_caps.has_avx || lp_native_vector_width < 256) {
             intrinsic = "llvm.x86.sse.min.ps";
             intr_size = 128;
          }
@@ -106,7 +106,7 @@ lp_build_min_simple(struct lp_build_context *bld,
             intrinsic = "llvm.x86.sse2.min.sd";
             intr_size = 128;
          }
-         else if (type.length == 2 || !util_cpu_caps.has_avx) {
+         else if (type.length == 2 || !util_cpu_caps.has_avx || lp_native_vector_width < 256) {
             intrinsic = "llvm.x86.sse2.min.pd";
             intr_size = 128;
          }
@@ -182,7 +182,7 @@ lp_build_max_simple(struct lp_build_context *bld,
             intrinsic = "llvm.x86.sse.max.ss";
             intr_size = 128;
          }
-         else if (type.length <= 4 || !util_cpu_caps.has_avx) {
+         else if (type.length <= 4 || !util_cpu_caps.has_avx || lp_native_vector_width < 256) {
             intrinsic = "llvm.x86.sse.max.ps";
             intr_size = 128;
          }
@@ -196,7 +196,7 @@ lp_build_max_simple(struct lp_build_context *bld,
             intrinsic = "llvm.x86.sse2.max.sd";
             intr_size = 128;
          }
-         else if (type.length == 2 || !util_cpu_caps.has_avx) {
+         else if (type.length == 2 || !util_cpu_caps.has_avx || lp_native_vector_width < 256) {
             intrinsic = "llvm.x86.sse2.max.pd";
             intr_size = 128;
          }