maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix for PR32740 - Invalid floating type, unreachable between r300969 and r301029 

The bug was introduced by r301018 "[InstCombine] fadd double (sitofp x), y check that the promotion is valid". The patch didn't expect that fadd can be on vectors not necessarily scalars. Add vector support along with the test.

llvm-svn: 301070
This commit is contained in:
Artur Pilipenko 2017-04-22 07:24:52 +00:00
parent 5e113742e7
commit 0632bdc648
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
View File

@ -1391,11 +1391,14 @@ Instruction *InstCombiner::visitFAdd(BinaryOperator &I) {
// analysis can tell us that the result of the addition has less significant // analysis can tell us that the result of the addition has less significant
// bits than the integer type can hold. // bits than the integer type can hold.
auto IsValidPromotion = [](Type *FTy, Type *ITy) { auto IsValidPromotion = [](Type *FTy, Type *ITy) {
Type *FScalarTy = FTy->getScalarType();
Type *IScalarTy = ITy->getScalarType();
// Do we have enough bits in the significand to represent the result of // Do we have enough bits in the significand to represent the result of
// the integer addition? // the integer addition?
unsigned MaxRepresentableBits = unsigned MaxRepresentableBits =
APFloat::semanticsPrecision(FTy->getFltSemantics()); APFloat::semanticsPrecision(FScalarTy->getFltSemantics());
return ITy->getIntegerBitWidth() <= MaxRepresentableBits; return IScalarTy->getIntegerBitWidth() <= MaxRepresentableBits;
}; };
// (fadd double (sitofp x), fpcst) --> (sitofp (add int x, intcst)) // (fadd double (sitofp x), fpcst) --> (sitofp (add int x, intcst))

39
llvm/test/Transforms/InstCombine/add-sitofp.ll
View File

@ -100,3 +100,42 @@ define float @test_3(i32 %a, i32 %b) {
%p = fadd float %o, 1.0 %p = fadd float %o, 1.0
ret float %p ret float %p
} }
define <4 x double> @test_4(<4 x i32> %a, <4 x i32> %b) {
; CHECK-LABEL: @test_4(
; CHECK-NEXT: [[A_AND:%.*]] = and <4 x i32> [[A:%.*]], <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
; CHECK-NEXT: [[B_AND:%.*]] = and <4 x i32> [[B:%.*]], <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
; CHECK-NEXT: [[ADDCONV:%.*]] = add nuw nsw <4 x i32> [[A_AND]], [[B_AND]]
; CHECK-NEXT: [[RES:%.*]] = sitofp <4 x i32> [[ADDCONV]] to <4 x double>
; CHECK-NEXT: ret <4 x double> [[RES]]
;
; Drop two highest bits to guarantee that %a + %b doesn't overflow
%a_and = and <4 x i32> %a, <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
%b_and = and <4 x i32> %b, <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
%a_and_fp = sitofp <4 x i32> %a_and to <4 x double>
%b_and_fp = sitofp <4 x i32> %b_and to <4 x double>
%res = fadd <4 x double> %a_and_fp, %b_and_fp
ret <4 x double> %res
}
define <4 x float> @test_4_neg(<4 x i32> %a, <4 x i32> %b) {
; CHECK-LABEL: @test_4_neg(
; CHECK-NEXT: [[A_AND:%.*]] = and <4 x i32> [[A:%.*]], <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
; CHECK-NEXT: [[B_AND:%.*]] = and <4 x i32> [[B:%.*]], <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
; CHECK-NEXT: [[A_AND_FP:%.*]] = sitofp <4 x i32> [[A_AND]] to <4 x float>
; CHECK-NEXT: [[B_AND_FP:%.*]] = sitofp <4 x i32> [[B_AND]] to <4 x float>
; CHECK-NEXT: [[RES:%.*]] = fadd <4 x float> [[A_AND_FP]], [[B_AND_FP]]
; CHECK-NEXT: ret <4 x float> [[RES]]
;
; Drop two highest bits to guarantee that %a + %b doesn't overflow
%a_and = and <4 x i32> %a, <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
%b_and = and <4 x i32> %b, <i32 1073741823, i32 1073741823, i32 1073741823, i32 1073741823>
%a_and_fp = sitofp <4 x i32> %a_and to <4 x float>
%b_and_fp = sitofp <4 x i32> %b_and to <4 x float>
%res = fadd <4 x float> %a_and_fp, %b_and_fp
ret <4 x float> %res
}