Revert r372366 "Use getTargetConstant for BLENDI, and add a test to catch it."

This reverts commit 52621307bcab2013e8833f3317cebd63a6db3885.

Tests have been failing all night with

    [0/2] ACTION //llvm/test:check-llvm(//llvm/utils/gn/build/toolchain:unix)
    -- Testing: 33647 tests, 64 threads --
    Testing: 0 .. 10..
    UNRESOLVED: LLVM :: CodeGen/AMDGPU/GlobalISel/isel-blendi-gettargetconstant.ll (6943 of 33647)
    ******************** TEST 'LLVM :: CodeGen/AMDGPU/GlobalISel/isel-blendi-gettargetconstant.ll' FAILED ********************
    Test has no run line!
    ********************

Since there were other concerns on https://reviews.llvm.org/D67785,
I'm just reverting for now.

llvm-svn: 372383

diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index dec3773..58af2b3 100644 (file)
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -17608,7 +17608,7 @@ SDValue X86TargetLowering::LowerINSERT_VECTOR_ELT(SDValue Op,
         // operand form.
         N1 = DAG.getNode(ISD::SCALAR_TO_VECTOR, dl, MVT::v4f32, N1);
         return DAG.getNode(X86ISD::BLENDI, dl, VT, N0, N1,
-                           DAG.getTargetConstant(1, dl, MVT::i8));
+                           DAG.getConstant(1, dl, MVT::i8));
       }
       // Create this as a scalar to vector..
       N1 = DAG.getNode(ISD::SCALAR_TO_VECTOR, dl, MVT::v4f32, N1);

diff --git a/llvm/test/CodeGen/AMDGPU/GlobalISel/isel-blendi-gettargetconstant.ll b/llvm/test/CodeGen/AMDGPU/GlobalISel/isel-blendi-gettargetconstant.ll
deleted file mode 100644 (file)
index 1e416b5..0000000
--- a/llvm/test/CodeGen/AMDGPU/GlobalISel/isel-blendi-gettargetconstant.ll
+++ /dev/null
@@ -1,14 +0,0 @@
-; ModuleID = 'bugpoint-reduced-simplified.bc'
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-grtev4-linux-gnu"
-
-define dso_local void @csrot_(float* %0) local_unnamed_addr #0 align 32 {
-1:
-  %2 = load float, float* %0, align 4
-  %3 = fsub float -0.000000e+00, %2
-  %4 = insertelement <2 x float> <float undef, float -0.000000e+00>, float %3, i32 0
-  store <2 x float> %4, <2 x float>* undef, align 8
-  ret void
-}
-
-attributes #0 = { "target-features"="+aes,+cx8,+fxsr,+mmx,+pclmul,+popcnt,+sse,+sse2,+sse3,+sse4.1,+sse4.2,+ssse3,+x87" }