[llvm] e3275cf - [BuildLibCalls] Add nounwind,willreturn to memset_pattern{4,8,16}.

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2022-01-12T10:32:53Z
New Revision: e3275cfa947b08faf9ef7fc2edadd95e104d3c3e

URL: https://github.com/llvm/llvm-project/commit/e3275cfa947b08faf9ef7fc2edadd95e104d3c3e
DIFF: https://github.com/llvm/llvm-project/commit/e3275cfa947b08faf9ef7fc2edadd95e104d3c3e.diff

LOG: [BuildLibCalls] Add nounwind,willreturn to memset_pattern{4,8,16}.

Similar to memset, memset_pattern{4,8,16} all will return and do not
unwind. Use fallthrough to include all attributes also set for memset.

Reviewed By: nikic

Differential Revision: https://reviews.llvm.org/D114904

Added: 
    

Modified: 
    llvm/lib/Transforms/Utils/BuildLibCalls.cpp
    llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
    llvm/test/Transforms/InferFunctionAttrs/annotate.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Transforms/Utils/BuildLibCalls.cpp b/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
index a0f16dfdc6422..1459126559766 100644
--- a/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
@@ -1019,12 +1019,10 @@ bool llvm::inferLibFuncAttributes(Function &F, const TargetLibraryInfo &TLI) {
   case LibFunc_memset_pattern4:
   case LibFunc_memset_pattern8:
   case LibFunc_memset_pattern16:
-    Changed |= setOnlyAccessesArgMemory(F);
     Changed |= setDoesNotCapture(F, 0);
-    Changed |= setOnlyWritesMemory(F, 0);
     Changed |= setDoesNotCapture(F, 1);
     Changed |= setOnlyReadsMemory(F, 1);
-    return Changed;
+    LLVM_FALLTHROUGH;
   case LibFunc_memset:
     Changed |= setWillReturn(F);
     LLVM_FALLTHROUGH;

diff  --git a/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll b/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
index 76e595a1dbb35..9fe5eb3ca7e0f 100644
--- a/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
@@ -10,9 +10,7 @@ declare void @memset_pattern16(i8*, i8*, i64)
 define void @test_memset_pattern4_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern4_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
-; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern4(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void
@@ -48,9 +46,7 @@ entry:
 define void @test_memset_pattern8_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern8_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
-; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern8(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void
@@ -86,9 +82,7 @@ entry:
 define void @test_memset_pattern16_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern16_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
-; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern16(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void

diff  --git a/llvm/test/Transforms/InferFunctionAttrs/annotate.ll b/llvm/test/Transforms/InferFunctionAttrs/annotate.ll
index 7fc0ac3364e1c..8b88c5b30a4fb 100644
--- a/llvm/test/Transforms/InferFunctionAttrs/annotate.ll
+++ b/llvm/test/Transforms/InferFunctionAttrs/annotate.ll
@@ -1055,11 +1055,11 @@ declare i64 @write(i32, i8*, i64)
 
 
 ; memset_pattern{4,8,16} aren't available everywhere.
-; CHECK-DARWIN: declare void @memset_pattern4(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE:#[0-9]+]]
+; CHECK-DARWIN: declare void @memset_pattern4(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE_NOUNWIND_WILLRETURN]]
 declare void @memset_pattern4(i8*, i8*, i64)
-; CHECK-DARWIN: declare void @memset_pattern8(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE]]
+; CHECK-DARWIN: declare void @memset_pattern8(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE_NOUNWIND_WILLRETURN]]
 declare void @memset_pattern8(i8*, i8*, i64)
-; CHECK-DARWIN: declare void @memset_pattern16(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE]]
+; CHECK-DARWIN: declare void @memset_pattern16(i8* nocapture writeonly, i8* nocapture readonly, i64) [[ARGMEMONLY_NOFREE_NOUNWIND_WILLRETURN]]
 declare void @memset_pattern16(i8*, i8*, i64)
 
 
@@ -1077,5 +1077,4 @@ declare void @memset_pattern16(i8*, i8*, i64)
 ; CHECK-DAG: attributes [[INACCESSIBLEMEMORARGONLY_NOFREE_NOUNWIND_WILLRETURN]]  = { inaccessiblemem_or_argmemonly mustprogress nofree nounwind willreturn }
 ; CHECK-DAG: attributes [[ARGMEMONLY_NOFREE_NOUNWIND]] = { argmemonly nofree nounwind }
 
-; CHECK-DARWIN-DAG: attributes [[ARGMEMONLY_NOFREE]] = { argmemonly nofree }
 ; CHECK-NVPTX-DAG: attributes [[NOFREE_NOUNWIND_READNONE]] = { nofree nosync nounwind readnone }