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

[InstCombine] visitMaskedMerge(): when unfolding, sanitize undef constants (PR45955) 

We can't leave undef vector element constants as-is,
it is a miscompile, so we need to sanitize them.

We have two vectors (C and ~C):
* We can't replace undef with 0 in both of them
* We can't replace undef with 0 in only one of them
* We could replace undef with -1 in both of them
* We could replace undef with -1 in only one(!) of them
* We could replace undef with -1 in one and 0 in another one of them.

Therefore, it seems best to go with the last option, since otherwise
we'd loose knowledge that C and ~C have no common bits set,
which seems more important than preserving partial undef knowledge.

Fixes https://bugs.llvm.org/show_bug.cgi?id=45955
This commit is contained in:
Roman Lebedev 2020-05-17 21:58:55 +03:00
parent a055e3856f
commit fde8eb00e1
No known key found for this signature in database
GPG Key ID: 083C3EBB4A1689E0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
View File

@ -3049,6 +3049,9 @@ static Instruction *visitMaskedMerge(BinaryOperator &I,
Constant *C; Constant *C;
if (D->hasOneUse() && match(M, m_Constant(C))) { if (D->hasOneUse() && match(M, m_Constant(C))) {
// Propagating undef is unsafe. Clamp undef elements to -1.
Type *EltTy = C->getType()->getScalarType();
C = Constant::replaceUndefsWith(C, ConstantInt::getAllOnesValue(EltTy));
// Unfold. // Unfold.
Value *LHS = Builder.CreateAnd(X, C); Value *LHS = Builder.CreateAnd(X, C);
Value *NotC = Builder.CreateNot(C); Value *NotC = Builder.CreateNot(C);

10
llvm/test/Transforms/InstCombine/unfold-masked-merge-with-const-mask-vector.ll
View File

@ -21,8 +21,8 @@ define <2 x i4> @splat (<2 x i4> %x, <2 x i4> %y) {
define <3 x i4> @splat_undef (<3 x i4> %x, <3 x i4> %y) { define <3 x i4> @splat_undef (<3 x i4> %x, <3 x i4> %y) {
; CHECK-LABEL: @splat_undef( ; CHECK-LABEL: @splat_undef(
; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[X:%.*]], <i4 -2, i4 undef, i4 -2> ; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[X:%.*]], <i4 -2, i4 -1, i4 -2>
; CHECK-NEXT: [[TMP2:%.*]] = and <3 x i4> [[Y:%.*]], <i4 1, i4 undef, i4 1> ; CHECK-NEXT: [[TMP2:%.*]] = and <3 x i4> [[Y:%.*]], <i4 1, i4 0, i4 1>
; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], [[TMP2]] ; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], [[TMP2]]
; CHECK-NEXT: ret <3 x i4> [[R]] ; CHECK-NEXT: ret <3 x i4> [[R]]
; ;
@ -85,8 +85,8 @@ define <2 x i4> @in_constant_varx_14_nonsplat(<2 x i4> %x, <2 x i4> %mask) {
define <3 x i4> @in_constant_varx_14_undef(<3 x i4> %x, <3 x i4> %mask) { define <3 x i4> @in_constant_varx_14_undef(<3 x i4> %x, <3 x i4> %mask) {
; CHECK-LABEL: @in_constant_varx_14_undef( ; CHECK-LABEL: @in_constant_varx_14_undef(
; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[X:%.*]], <i4 1, i4 undef, i4 1> ; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[X:%.*]], <i4 1, i4 -1, i4 1>
; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], <i4 -2, i4 undef, i4 6> ; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], <i4 -2, i4 0, i4 6>
; CHECK-NEXT: ret <3 x i4> [[R]] ; CHECK-NEXT: ret <3 x i4> [[R]]
; ;
%n0 = xor <3 x i4> %x, <i4 14, i4 undef, i4 7> ; %x %n0 = xor <3 x i4> %x, <i4 14, i4 undef, i4 7> ; %x
@ -133,7 +133,7 @@ define <2 x i4> @in_constant_14_vary_nonsplat(<2 x i4> %y, <2 x i4> %mask) {
define <3 x i4> @in_constant_14_vary_undef(<3 x i4> %y, <3 x i4> %mask) { define <3 x i4> @in_constant_14_vary_undef(<3 x i4> %y, <3 x i4> %mask) {
; CHECK-LABEL: @in_constant_14_vary_undef( ; CHECK-LABEL: @in_constant_14_vary_undef(
; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[Y:%.*]], <i4 -2, i4 undef, i4 -2> ; CHECK-NEXT: [[TMP1:%.*]] = and <3 x i4> [[Y:%.*]], <i4 -2, i4 0, i4 -2>
; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], <i4 0, i4 undef, i4 1> ; CHECK-NEXT: [[R:%.*]] = or <3 x i4> [[TMP1]], <i4 0, i4 undef, i4 1>
; CHECK-NEXT: ret <3 x i4> [[R]] ; CHECK-NEXT: ret <3 x i4> [[R]]
; ;