GlobalISel: Fix CSE handling of buildConstant
This fixes two problems with CSE done in buildConstant. First, this
would hit an assert when used with a vector result type. Solve this by
allowing CSE on the vector elements, but not on the result vector for
now.
Second, this was also performing the CSE based on the input
ConstantInt pointer. The underlying buildConstant could potentially
convert the constant depending on the result type, giving in a
different ConstantInt*. Stop allowing the APInt and ConstantInt forms
from automatically casting to the result type to avoid any similar
problems in the future.
llvm-svn: 353077
diff --git a/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp b/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
index ca25ec5..9a25331 100644
--- a/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
+++ b/llvm/unittests/CodeGen/GlobalISel/MachineIRBuilderTest.cpp
@@ -13,9 +13,6 @@
if (!TM)
return;
- MachineIRBuilder B(*MF);
- B.setInsertPt(*EntryMBB, EntryMBB->begin());
-
B.buildConstant(LLT::scalar(32), 42);
B.buildFConstant(LLT::scalar(32), 1.0);
@@ -27,9 +24,44 @@
CHECK: [[FCONST0:%[0-9]+]]:_(s32) = G_FCONSTANT float 1.000000e+00
CHECK: [[CONST1:%[0-9]+]]:_(s32) = G_CONSTANT i32 99
CHECK: [[VEC0:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[CONST1]]:_(s32), [[CONST1]]:_(s32)
- CHECK: [[FCONST1:%[0-9]+]]:_(s32) = G_FCONSTANT double 2.000000e+00
+ CHECK: [[FCONST1:%[0-9]+]]:_(s32) = G_FCONSTANT float 2.000000e+00
CHECK: [[VEC1:%[0-9]+]]:_(<2 x s32>) = G_BUILD_VECTOR [[FCONST1]]:_(s32), [[FCONST1]]:_(s32)
)";
EXPECT_TRUE(CheckMachineFunction(*MF, CheckStr)) << *MF;
}
+
+
+#ifdef GTEST_HAS_DEATH_TEST
+#ifndef NDEBUG
+
+TEST_F(GISelMITest, TestBuildConstantFConstantDeath) {
+ if (!TM)
+ return;
+
+ LLVMContext &Ctx = MF->getFunction().getContext();
+ APInt APV32(32, 12345);
+
+ // Test APInt version breaks
+ EXPECT_DEATH(B.buildConstant(LLT::scalar(16), APV32),
+ "creating constant with the wrong size");
+ EXPECT_DEATH(B.buildConstant(LLT::vector(2, 16), APV32),
+ "creating constant with the wrong size");
+
+ // Test ConstantInt version breaks
+ ConstantInt *CI = ConstantInt::get(Ctx, APV32);
+ EXPECT_DEATH(B.buildConstant(LLT::scalar(16), *CI),
+ "creating constant with the wrong size");
+ EXPECT_DEATH(B.buildConstant(LLT::vector(2, 16), *CI),
+ "creating constant with the wrong size");
+
+ APFloat DoubleVal(APFloat::IEEEdouble());
+ ConstantFP *CF = ConstantFP::get(Ctx, DoubleVal);
+ EXPECT_DEATH(B.buildFConstant(LLT::scalar(16), *CF),
+ "creating fconstant with the wrong size");
+ EXPECT_DEATH(B.buildFConstant(LLT::vector(2, 16), *CF),
+ "creating fconstant with the wrong size");
+}
+
+#endif
+#endif