[llvm] r320957 - [X86] Fix mistake that I made when splitting up the setOperationAction calls recently.

[Craig Topper via llvm-commits]

Author: ctopper
Date: Sun Dec 17 20:50:05 2017
New Revision: 320957

URL: http://llvm.org/viewvc/llvm-project?rev=320957&view=rev
Log:
[X86] Fix mistake that I made when splitting up the setOperationAction calls recently.

The block I moved things that need BWI and 512-bit or VLX is incorrectly qualified with just hasBWI || hasVLX. Here I've qualified it with hasBWI && (hasAVX512 || hasVLX) where the hasAVX512 will be replaced with allowing 512-bit vectors in an upcoming patch.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=320957&r1=320956&r2=320957&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sun Dec 17 20:50:05 2017
@@ -1502,8 +1502,8 @@ X86TargetLowering::X86TargetLowering(con
     }
   }
 
-  if (!Subtarget.useSoftFloat() &&
-      (Subtarget.hasBWI() || Subtarget.hasVLX())) {
+  if (!Subtarget.useSoftFloat() && Subtarget.hasBWI() &&
+      (Subtarget.hasAVX512() || Subtarget.hasVLX())) {
     for (auto VT : { MVT::v32i8, MVT::v16i8, MVT::v16i16, MVT::v8i16 }) {
       setOperationAction(ISD::MLOAD,  VT, Subtarget.hasVLX() ? Legal : Custom);
       setOperationAction(ISD::MSTORE, VT, Subtarget.hasVLX() ? Legal : Custom);