[TLI] Add support for reallocarray #114818

serge-sans-paille · 2024-11-04T15:54:56Z

reallocarray is available in glibc since 2.29 under _DEFAULT_SOURCE and under _GNU_SOURCE before, let's model it appropriately.

llvmbot · 2024-11-04T15:55:32Z

@llvm/pr-subscribers-llvm-analysis

@llvm/pr-subscribers-llvm-transforms

Author: None (serge-sans-paille)

Changes

reallocarray is available in glibc since 2.29 under _DEFAULT_SOURCE and under _GNU_SOURCE before, let's model it appropriately.

Full diff: https://github.com/llvm/llvm-project/pull/114818.diff

7 Files Affected:

(modified) clang/include/clang/Basic/Builtins.td (+6)
(modified) clang/test/Sema/builtins-gnu-mode.c (+1)
(modified) llvm/include/llvm/Analysis/TargetLibraryInfo.def (+5)
(modified) llvm/lib/Analysis/TargetLibraryInfo.cpp (+1)
(modified) llvm/lib/Transforms/Utils/BuildLibCalls.cpp (+15)
(modified) llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml (+2-2)
(modified) llvm/unittests/Analysis/TargetLibraryInfoTest.cpp (+1)

diff --git a/clang/include/clang/Basic/Builtins.td b/clang/include/clang/Basic/Builtins.td
index 9bd67e0cefebc3..546442f843a6b3 100644
--- a/clang/include/clang/Basic/Builtins.td
+++ b/clang/include/clang/Basic/Builtins.td
@@ -3224,6 +3224,12 @@ def AllocA : GNULibBuiltin<"stdlib.h"> {
   let AddBuiltinPrefixedAlias = 1;
 }
 
+def ReallocArray : GNULibBuiltin<"stdlib.h"> {
+  let Spellings = ["reallocarray"];
+  let Prototype = "void*(void*, size_t, size_t)";
+}
+
+
 // POSIX malloc.h
 
 def MemAlign : GNULibBuiltin<"malloc.h"> {
diff --git a/clang/test/Sema/builtins-gnu-mode.c b/clang/test/Sema/builtins-gnu-mode.c
index d93b6fdef027b6..f85a1e5793a703 100644
--- a/clang/test/Sema/builtins-gnu-mode.c
+++ b/clang/test/Sema/builtins-gnu-mode.c
@@ -8,6 +8,7 @@ int stpncpy;
 int strdup;
 int strndup;
 int index;
+int reallocarray;
 int rindex;
 int bzero;
 int strcasecmp;
diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
index fd53a26ef8fc11..db566b8ee610e5 100644
--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def
+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
@@ -2077,6 +2077,11 @@ TLI_DEFINE_ENUM_INTERNAL(reallocf)
 TLI_DEFINE_STRING_INTERNAL("reallocf")
 TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, SizeT)
 
+/// void *reallocarray(void *ptr, size_t nmemb, size_t size);
+TLI_DEFINE_ENUM_INTERNAL(reallocarray)
+TLI_DEFINE_STRING_INTERNAL("reallocarray")
+TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, SizeT, SizeT)
+
 /// char *realpath(const char *file_name, char *resolved_name);
 TLI_DEFINE_ENUM_INTERNAL(realpath)
 TLI_DEFINE_STRING_INTERNAL("realpath")
diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp
index 7f0b98ab3c1514..e4b1dbfc3e7231 100644
--- a/llvm/lib/Analysis/TargetLibraryInfo.cpp
+++ b/llvm/lib/Analysis/TargetLibraryInfo.cpp
@@ -852,6 +852,7 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
     TLI.setUnavailable(LibFunc_memrchr);
     TLI.setUnavailable(LibFunc_ntohl);
     TLI.setUnavailable(LibFunc_ntohs);
+    TLI.setUnavailable(LibFunc_reallocarray);
     TLI.setUnavailable(LibFunc_reallocf);
     TLI.setUnavailable(LibFunc_roundeven);
     TLI.setUnavailable(LibFunc_roundevenf);
diff --git a/llvm/lib/Transforms/Utils/BuildLibCalls.cpp b/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
index e039457f313b29..8887f2d7792fee 100644
--- a/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
@@ -577,6 +577,21 @@ bool llvm::inferNonMandatoryLibFuncAttrs(Function &F,
     Changed |= setDoesNotCapture(F, 0);
     Changed |= setArgNoUndef(F, 1);
     break;
+  case LibFunc_reallocarray:
+    Changed |= setAllocFamily(F, "malloc");
+    Changed |= setAllocKind(F, AllocFnKind::Realloc);
+    Changed |= setAllocatedPointerParam(F, 0);
+    Changed |= setAllocSize(F, 1, std::nullopt);
+    Changed |= setAllocSize(F, 2, std::nullopt);
+    Changed |= setOnlyAccessesInaccessibleMemOrArgMem(F);
+    Changed |= setRetNoUndef(F);
+    Changed |= setDoesNotThrow(F);
+    Changed |= setRetDoesNotAlias(F);
+    Changed |= setWillReturn(F);
+    Changed |= setDoesNotCapture(F, 0);
+    Changed |= setArgNoUndef(F, 1);
+    Changed |= setArgNoUndef(F, 2);
+    break;
   case LibFunc_read:
     // May throw; "read" is a valid pthread cancellation point.
     Changed |= setRetAndArgsNoUndef(F);
diff --git a/llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml b/llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml
index 6702725e4fc8a4..2d23b15d74b17d 100644
--- a/llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml
+++ b/llvm/test/tools/llvm-tli-checker/ps4-tli-check.yaml
@@ -54,10 +54,10 @@
 ## the exact count first; the two directives should add up to that.
 ## Yes, this means additions to TLI will fail this test, but the argument
 ## to -COUNT can't be an expression.
-# AVAIL: TLI knows 522 symbols, 289 available
+# AVAIL: TLI knows 523 symbols, 289 available
 # AVAIL-COUNT-289: {{^}} available
 # AVAIL-NOT:       {{^}} available
-# UNAVAIL-COUNT-233: not available
+# UNAVAIL-COUNT-234: not available
 # UNAVAIL-NOT:       not available
 
 ## This is a large file so it's worth telling lit to stop here.
diff --git a/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp b/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
index 982d00c5d33593..b9900db68b1420 100644
--- a/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
+++ b/llvm/unittests/Analysis/TargetLibraryInfoTest.cpp
@@ -318,6 +318,7 @@ TEST_F(TargetLibraryInfoTest, ValidProto) {
       "declare void @qsort(i8*, i64, i64, i32 (i8*, i8*)*)\n"
       "declare i64 @readlink(i8*, i8*, i64)\n"
       "declare i8* @realloc(i8*, i64)\n"
+      "declare i8* @reallocarray(i8*, i64, i64)\n"
       "declare i8* @reallocf(i8*, i64)\n"
       "declare double @remainder(double, double)\n"
       "declare float @remainderf(float, float)\n"

arsenm · 2024-11-04T16:04:57Z

llvm/unittests/Analysis/TargetLibraryInfoTest.cpp

@@ -318,6 +318,7 @@ TEST_F(TargetLibraryInfoTest, ValidProto) {
      "declare void @qsort(i8*, i64, i64, i32 (i8*, i8*)*)\n"
      "declare i64 @readlink(i8*, i8*, i64)\n"
      "declare i8* @realloc(i8*, i64)\n"
+      "declare i8* @reallocarray(i8*, i64, i64)\n"


This test should be converted to opaque pointers

ack. but that probably belongs to another commit, right?

arsenm · 2024-11-04T22:16:43Z

llvm/lib/Analysis/TargetLibraryInfo.cpp

@@ -852,6 +852,7 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
    TLI.setUnavailable(LibFunc_memrchr);
    TLI.setUnavailable(LibFunc_ntohl);
    TLI.setUnavailable(LibFunc_ntohs);
+    TLI.setUnavailable(LibFunc_reallocarray);


"Since 2.29 under _DEFAULT_SOURCE and under _GNU_SOURCE"

Can you check the version and comment this somewhere?

That's from the manpage (e.g. https://man.archlinux.org/man/reallocarray.3.en). I'll update the commit message to make it clear.

I mean this needs to be documented in the code, not the commit message

How did you determine whether this is available on PS?

I grepped the whole sdk (for PS4 though). Plenty of mention to realloc and none to reallocarray

From the man page (e.g. https://man.archlinux.org/man/reallocarray.3.en): SYNOPSIS reallocarray(): Since glibc 2.29: _DEFAULT_SOURCE glibc 2.28 and earlier: _GNU_SOURCE STANDARDS reallocarray() None. HISTORY reallocarray() glibc 2.26. OpenBSD 5.6, FreeBSD 11.0.

serge-sans-paille · 2024-11-07T23:26:00Z

@arsenm looks good?

llvm/lib/Transforms/Utils/BuildLibCalls.cpp

arsenm · 2024-11-08T16:59:21Z

clang/include/clang/Basic/Builtins.td

@@ -3224,6 +3224,13 @@ def AllocA : GNULibBuiltin<"stdlib.h"> {
  let AddBuiltinPrefixedAlias = 1;
 }

+// Available in glibc by default since since 2.29 and in GNU mode before.
+def ReallocArray : GNULibBuiltin<"stdlib.h"> {


The clang builtin change should be separate, and is not tested

nikic · 2024-11-13T09:10:40Z

clang/test/Sema/builtins-gnu-mode.c

@@ -8,6 +8,7 @@ int stpncpy;
 int strdup;
 int strndup;
 int index;
+int reallocarray;


This change probably shouldn't be here anymore?

nikic · 2024-11-13T09:11:03Z

llvm/lib/Analysis/TargetLibraryInfo.cpp

@@ -852,6 +852,7 @@ static void initializeLibCalls(TargetLibraryInfoImpl &TLI, const Triple &T,
    TLI.setUnavailable(LibFunc_memrchr);
    TLI.setUnavailable(LibFunc_ntohl);
    TLI.setUnavailable(LibFunc_ntohs);
+    TLI.setUnavailable(LibFunc_reallocarray);


How did you determine whether this is available on PS?

serge-sans-paille · 2024-11-13T20:11:48Z

Should be good now. thanks for the reviews @nikic & @arsenm

nikic

LGTM

llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" llvm:analysis llvm:transforms labels Nov 4, 2024

serge-sans-paille requested a review from arsenm November 4, 2024 15:55

arsenm reviewed Nov 4, 2024

View reviewed changes

serge-sans-paille force-pushed the feature/reallocarray branch from c46cdf6 to e7d67f3 Compare November 4, 2024 21:30

arsenm reviewed Nov 4, 2024

View reviewed changes

serge-sans-paille force-pushed the feature/reallocarray branch from e7d67f3 to f344784 Compare November 5, 2024 08:22

serge-sans-paille force-pushed the feature/reallocarray branch from f344784 to a1ca0d1 Compare November 5, 2024 20:37

nikic reviewed Nov 8, 2024

View reviewed changes

llvm/lib/Transforms/Utils/BuildLibCalls.cpp Outdated Show resolved Hide resolved

arsenm reviewed Nov 8, 2024

View reviewed changes

fixup! [TLI] Add support for reallocarray

4c32862

nikic reviewed Nov 13, 2024

View reviewed changes

fixup! [TLI] Add support for reallocarray

a14e23f

nikic approved these changes Nov 13, 2024

View reviewed changes

serge-sans-paille merged commit dc4185f into llvm:main Nov 13, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TLI] Add support for reallocarray #114818

[TLI] Add support for reallocarray #114818

serge-sans-paille commented Nov 4, 2024

llvmbot commented Nov 4, 2024 •

edited

Loading

arsenm Nov 4, 2024

serge-sans-paille Nov 4, 2024

arsenm Nov 4, 2024

arsenm Nov 4, 2024

serge-sans-paille Nov 5, 2024

arsenm Nov 5, 2024

serge-sans-paille Nov 5, 2024

nikic Nov 13, 2024

serge-sans-paille Nov 13, 2024

serge-sans-paille commented Nov 7, 2024

arsenm Nov 8, 2024

nikic Nov 13, 2024

nikic Nov 13, 2024

serge-sans-paille commented Nov 13, 2024

nikic left a comment

[TLI] Add support for reallocarray #114818

[TLI] Add support for reallocarray #114818

Conversation

serge-sans-paille commented Nov 4, 2024

llvmbot commented Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serge-sans-paille commented Nov 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serge-sans-paille commented Nov 13, 2024

nikic left a comment

Choose a reason for hiding this comment

llvmbot commented Nov 4, 2024 •

edited

Loading