Skip to content

VT: don't create undef in isBytewiseValue #119411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

VT: don't create undef in isBytewiseValue #119411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions llvm/include/llvm/Analysis/ValueTracking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,8 +617,7 @@ inline std::optional<bool> computeKnownFPSignBit(const Value *V, unsigned Depth,
/// return the i8 value that it is represented with. This is true for all i8
/// values obviously, but is also true for i32 0, i32 -1, i16 0xF0F0, double
/// 0.0 etc. If the value can't be handled with a repeated byte store (e.g.
/// i16 0x1234), return null. If the value is entirely undef and padding,
/// return undef.
/// i16 0x1234), return null. If the value is undef, also return null.
Value *isBytewiseValue(Value *V, const DataLayout &DL);

/// Given an aggregate and an sequence of indices, see if the scalar value
Expand Down
22 changes: 13 additions & 9 deletions llvm/lib/Analysis/ValueTracking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6163,14 +6163,18 @@ Value *llvm::isBytewiseValue(Value *V, const DataLayout &DL) {

LLVMContext &Ctx = V->getContext();

// Undef don't care.
auto *UndefInt8 = UndefValue::get(Type::getInt8Ty(Ctx));
// Allow poison.
auto *Poison = PoisonValue::get(Type::getInt8Ty(Ctx));
if (isa<PoisonValue>(V))
return Poison;

// Forbid optimization over undef, for correctness reasons.
if (isa<UndefValue>(V))
return UndefInt8;
return nullptr;

// Return Undef for zero-sized type.
// Return poison for zero-sized type.
if (DL.getTypeStoreSize(V->getType()).isZero())
return UndefInt8;
return Poison;

Constant *C = dyn_cast<Constant>(V);
if (!C) {
Expand Down Expand Up @@ -6228,23 +6232,23 @@ Value *llvm::isBytewiseValue(Value *V, const DataLayout &DL) {
return LHS;
if (!LHS || !RHS)
return nullptr;
if (LHS == UndefInt8)
if (LHS == Poison)
return RHS;
if (RHS == UndefInt8)
if (RHS == Poison)
return LHS;
return nullptr;
};

if (ConstantDataSequential *CA = dyn_cast<ConstantDataSequential>(C)) {
Value *Val = UndefInt8;
Value *Val = Poison;
for (unsigned I = 0, E = CA->getNumElements(); I != E; ++I)
if (!(Val = Merge(Val, isBytewiseValue(CA->getElementAsConstant(I), DL))))
return nullptr;
return Val;
}

if (isa<ConstantAggregate>(C)) {
Value *Val = UndefInt8;
Value *Val = Poison;
for (Value *Op : C->operands())
if (!(Val = Merge(Val, isBytewiseValue(Op, DL))))
return nullptr;
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ Instruction *MemCpyOptPass::tryMergingIntoMemset(Instruction *StartInst,

// Check to see if this stored value is of the same byte-splattable value.
Value *StoredByte = isBytewiseValue(StoredVal, DL);
if (isa<UndefValue>(ByteVal) && StoredByte)
ByteVal = StoredByte;
if (!StoredByte)
break;
if (ByteVal != StoredByte)
break;

Expand Down
22 changes: 11 additions & 11 deletions llvm/test/Transforms/MemCpyOpt/fca2memcpy.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ define void @destroysrc(ptr %src, ptr %dst) {

define void @destroynoaliassrc(ptr noalias %src, ptr %dst) {
; CHECK-LABEL: @destroynoaliassrc(
; CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DST:%.*]], ptr align 8 [[SRC]], i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[SRC:%.*]], i8 0, i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DST:%.*]], ptr align 8 [[SRC:%.*]], i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[SRC]], i8 0, i64 16, i1 false)
; CHECK-NEXT: ret void
;
%1 = load %S, ptr %src
Expand All @@ -79,13 +79,13 @@ define void @copyalias(ptr %src, ptr %dst) {
; sure we lift the computation as well if needed and possible.
define void @addrproducer(ptr %src, ptr %dst) {
; CHECK-LABEL: @addrproducer(
; CHECK-NEXT: [[DST2:%.*]] = getelementptr [[S:%.*]], ptr [[DST]], i64 1
; CHECK-NEXT: [[DST2:%.*]] = getelementptr [[S:%.*]], ptr [[DST:%.*]], i64 1
; CHECK-NEXT: call void @llvm.memmove.p0.p0.i64(ptr align 8 [[DST2]], ptr align 8 [[SRC:%.*]], i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[DST:%.*]], i8 undef, i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[DST]], i8 poison, i64 16, i1 false)
; CHECK-NEXT: ret void
;
%1 = load %S, ptr %src
store %S undef, ptr %dst
store %S poison, ptr %dst
%dst2 = getelementptr %S , ptr %dst, i64 1
store %S %1, ptr %dst2
ret void
Expand All @@ -94,14 +94,14 @@ define void @addrproducer(ptr %src, ptr %dst) {
define void @aliasaddrproducer(ptr %src, ptr %dst, ptr %dstidptr) {
; CHECK-LABEL: @aliasaddrproducer(
; CHECK-NEXT: [[TMP1:%.*]] = load [[S:%.*]], ptr [[SRC:%.*]], align 8
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[DST:%.*]], i8 undef, i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[DST:%.*]], i8 poison, i64 16, i1 false)
; CHECK-NEXT: [[DSTINDEX:%.*]] = load i32, ptr [[DSTIDPTR:%.*]], align 4
; CHECK-NEXT: [[DST2:%.*]] = getelementptr [[S]], ptr [[DST]], i32 [[DSTINDEX]]
; CHECK-NEXT: store [[S]] [[TMP1]], ptr [[DST2]], align 8
; CHECK-NEXT: ret void
;
%1 = load %S, ptr %src
store %S undef, ptr %dst
store %S poison, ptr %dst
%dstindex = load i32, ptr %dstidptr
%dst2 = getelementptr %S , ptr %dst, i32 %dstindex
store %S %1, ptr %dst2
Expand All @@ -113,12 +113,12 @@ define void @noaliasaddrproducer(ptr %src, ptr noalias %dst, ptr noalias %dstidp
; CHECK-NEXT: [[TMP2:%.*]] = load i32, ptr [[DSTIDPTR:%.*]], align 4
; CHECK-NEXT: [[DSTINDEX:%.*]] = or i32 [[TMP2]], 1
; CHECK-NEXT: [[DST2:%.*]] = getelementptr [[S:%.*]], ptr [[DST:%.*]], i32 [[DSTINDEX]]
; CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DST2]], ptr align 8 [[SRC]], i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[SRC:%.*]], i8 undef, i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 8 [[DST2]], ptr align 8 [[SRC:%.*]], i64 16, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[SRC]], i8 poison, i64 16, i1 false)
; CHECK-NEXT: ret void
;
%1 = load %S, ptr %src
store %S undef, ptr %src
store %S poison, ptr %src
%2 = load i32, ptr %dstidptr
%dstindex = or i32 %2, 1
%dst2 = getelementptr %S , ptr %dst, i32 %dstindex
Expand All @@ -130,7 +130,7 @@ define void @throwing_call(ptr noalias %src, ptr %dst) {
; CHECK-LABEL: @throwing_call(
; CHECK-NEXT: [[TMP1:%.*]] = load [[S:%.*]], ptr [[SRC:%.*]], align 8
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 8 [[SRC]], i8 0, i64 16, i1 false)
; CHECK-NEXT: call void @call() [[ATTR2:#.*]]
; CHECK-NEXT: call void @call() #[[ATTR2:[0-9]+]]
; CHECK-NEXT: store [[S]] [[TMP1]], ptr [[DST:%.*]], align 8
; CHECK-NEXT: ret void
;
Expand Down
18 changes: 9 additions & 9 deletions llvm/test/Transforms/MemCpyOpt/memcpy-to-memset.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

declare void @llvm.memcpy.p0.p0.i64(ptr nocapture, ptr nocapture, i64, i1) nounwind

@undef = internal constant i32 undef, align 4
define void @test_undef() nounwind {
; CHECK-LABEL: @test_undef(
@poison = internal constant i32 poison, align 4
define void @test_poison() nounwind {
; CHECK-LABEL: @test_poison(
; CHECK-NEXT: [[A:%.*]] = alloca i32, align 4
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 4 [[A]], i8 undef, i64 4, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 4 [[A]], i8 poison, i64 4, i1 false)
; CHECK-NEXT: ret void
;
%a = alloca i32, align 4
call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 @undef, i64 4, i1 false)
call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 @poison, i64 4, i1 false)
ret void
}

Expand All @@ -27,15 +27,15 @@ define void @test_i32x3() nounwind {
ret void
}

@i32x3_undef = internal constant [3 x i32] [i32 -1, i32 undef, i32 -1], align 4
define void @test_i32x3_undef() nounwind {
; CHECK-LABEL: @test_i32x3_undef(
@i32x3_poison = internal constant [3 x i32] [i32 -1, i32 poison, i32 -1], align 4
define void @test_i32x3_poison() nounwind {
; CHECK-LABEL: @test_i32x3_poison(
; CHECK-NEXT: [[A:%.*]] = alloca [3 x i32], align 4
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 4 [[A]], i8 -1, i64 12, i1 false)
; CHECK-NEXT: ret void
;
%a = alloca [3 x i32], align 4
call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 @i32x3_undef, i64 12, i1 false)
call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 @i32x3_poison, i64 12, i1 false)
ret void
}

Expand Down
4 changes: 2 additions & 2 deletions llvm/test/Transforms/MemCpyOpt/store-to-memset-is-nonzero-type.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

define void @array_zero(ptr %p) {
; CHECK-LABEL: @array_zero(
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[P:%.*]], i8 undef, i64 0, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[P:%.*]], i8 poison, i64 0, i1 false)
; CHECK-NEXT: ret void
;
store [0 x i8] zeroinitializer, ptr %p
Expand All @@ -25,7 +25,7 @@ define void @array_nonzero(ptr %p) {

define void @struct_zero(ptr %p) {
; CHECK-LABEL: @struct_zero(
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[P:%.*]], i8 undef, i64 0, i1 false)
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[P:%.*]], i8 poison, i64 0, i1 false)
; CHECK-NEXT: ret void
;
store { } zeroinitializer, ptr %p
Expand Down
56 changes: 28 additions & 28 deletions llvm/unittests/Analysis/ValueTrackingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2769,8 +2769,8 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
"ptr null",
},
{
"i8 undef",
"ptr undef",
"i8 poison",
"ptr poison",
},
{
"i8 0",
Expand All @@ -2789,8 +2789,8 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
"i8 -1",
},
{
"i8 undef",
"i16 undef",
"i8 poison",
"i16 poison",
},
{
"i8 0",
Expand Down Expand Up @@ -2869,28 +2869,28 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
"ptr inttoptr (i96 -1 to ptr)",
},
{
"i8 undef",
"i8 poison",
"[0 x i8] zeroinitializer",
},
{
"i8 undef",
"[0 x i8] undef",
"i8 poison",
"[0 x i8] poison",
},
{
"i8 undef",
"i8 poison",
"[5 x [0 x i8]] zeroinitializer",
},
{
"i8 undef",
"[5 x [0 x i8]] undef",
"i8 poison",
"[5 x [0 x i8]] poison",
},
{
"i8 0",
"[6 x i8] zeroinitializer",
},
{
"i8 undef",
"[6 x i8] undef",
"i8 poison",
"[6 x i8] poison",
},
{
"i8 1",
Expand All @@ -2910,15 +2910,15 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
},
{
"i8 1",
"[4 x i8] [i8 1, i8 undef, i8 1, i8 1]",
"[4 x i8] [i8 1, i8 poison, i8 1, i8 1]",
},
{
"i8 0",
"<6 x i8> zeroinitializer",
},
{
"i8 undef",
"<6 x i8> undef",
"i8 poison",
"<6 x i8> poison",
},
{
"i8 1",
Expand All @@ -2938,15 +2938,15 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
},
{
"i8 5",
"<2 x i8> < i8 5, i8 undef >",
"<2 x i8> < i8 5, i8 poison >",
},
{
"i8 0",
"[2 x [2 x i16]] zeroinitializer",
},
{
"i8 undef",
"[2 x [2 x i16]] undef",
"i8 poison",
"[2 x [2 x i16]] poison",
},
{
"i8 -86",
Expand All @@ -2959,36 +2959,36 @@ const std::pair<const char *, const char *> IsBytewiseValueTests[] = {
"[2 x i16] [i16 -21836, i16 -21846]]",
},
{
"i8 undef",
"i8 poison",
"{ } zeroinitializer",
},
{
"i8 undef",
"{ } undef",
"i8 poison",
"{ } poison",
},
{
"i8 undef",
"i8 poison",
"{ {}, {} } zeroinitializer",
},
{
"i8 undef",
"{ {}, {} } undef",
"i8 poison",
"{ {}, {} } poison",
},
{
"i8 0",
"{i8, i64, ptr} zeroinitializer",
},
{
"i8 undef",
"{i8, i64, ptr} undef",
"i8 poison",
"{i8, i64, ptr} poison",
},
{
"i8 -86",
"{i8, i64, ptr} {i8 -86, i64 -6148914691236517206, ptr undef}",
"{i8, i64, ptr} {i8 -86, i64 -6148914691236517206, ptr poison}",
},
{
"",
"{i8, i64, ptr} {i8 86, i64 -6148914691236517206, ptr undef}",
"{i8, i64, ptr} {i8 86, i64 -6148914691236517206, ptr poison}",
},
};

Expand Down
Loading