This is an archive of the discontinued LLVM Phabricator instance.

Differential D147464

[libc] Add {,r}index
ClosedPublic

Authored by abrachet on Apr 3 2023, 11:42 AM.

Details

Reviewers
lntue
michaelrj
mcgrathr
Commits
rG9c7a3705050d: Reland "[libc] Add {,r}index"
rGa0a141fcbe1d: [libc] Add {,r}index

Diff Detail

Event Timeline

abrachet created this revision.Apr 3 2023, 11:42 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 3 2023, 11:42 AM
Herald added subscribers: luke, frasercrmck, ecnelises and 22 others. · View Herald Transcript
abrachet requested review of this revision.Apr 3 2023, 11:42 AM
Herald added a subscriber: • pcwang-thead. · View Herald TranscriptApr 3 2023, 11:42 AM
abrachet added a parent revision: D147463: [libc] Move str{,r}chr implementation to headers.Apr 3 2023, 11:42 AM
Harbormaster completed remote builds in B223414: Diff 510579.Apr 3 2023, 11:43 AM
abrachet mentioned this in D147463: [libc] Move str{,r}chr implementation to headers.Apr 3 2023, 2:53 PM
mcgrathr accepted this revision.Apr 4 2023, 5:23 PM
mcgrathr added a subscriber: mcgrathr.

Code looks fine modulo public decl location and cleanups in the enabling change such as template vs macro for the test code.

libc/spec/bsd_ext.td
18

These are usually declared only in <strings.h>, not in <string.h>.

This revision is now accepted and ready to land.Apr 4 2023, 5:23 PM
This revision was landed with ongoing or failed builds.Apr 10 2023, 6:17 PM
Closed by commit rGa0a141fcbe1d: [libc] Add {,r}index (authored by abrachet). · Explain Why
This revision was automatically updated to reflect the committed changes.
abrachet added a commit: rGa0a141fcbe1d: [libc] Add {,r}index.
Herald added a project: Restricted Project. · View Herald TranscriptApr 10 2023, 6:17 PM
Herald added a subscriber: libc-commits. · View Herald Transcript
abrachet marked an inline comment as done.Apr 10 2023, 6:17 PM
abrachet added inline comments.
libc/spec/bsd_ext.td
18

Thanks. Done in commit

abrachet added a reverting change: rG42294bf16f76: Revert "[libc] Add {,r}index".Apr 10 2023, 6:27 PM
abrachet marked an inline comment as done.Apr 10 2023, 9:32 PM
abrachet added a commit: rG9c7a3705050d: Reland "[libc] Add {,r}index".

Revision Contents

PathSize
libc/
config/
linux/
aarch64/
2 lines
arm/
2 lines
riscv64/
2 lines
x86_64/
2 lines
spec/
10 lines
src/
string/
20 lines
18 lines
20 lines
18 lines
20 lines
test/
src/
string/
34 lines
14 lines
14 lines

Diff 512302

libc/config/linux/aarch64/entrypoints.txt

Show All 27 Linesset(TARGET_LIBC_ENTRYPOINTS
# sched.h entrypoints # sched.h entrypoints
libc.src.sched.sched_getaffinity libc.src.sched.sched_getaffinity
libc.src.sched.sched_setaffinity libc.src.sched.sched_setaffinity
# string.h entrypoints # string.h entrypoints
libc.src.string.bcmp libc.src.string.bcmp
libc.src.string.bcopy libc.src.string.bcopy
libc.src.string.bzero libc.src.string.bzero
libc.src.string.index
libc.src.string.memccpy libc.src.string.memccpy
libc.src.string.memchr libc.src.string.memchr
libc.src.string.memcmp libc.src.string.memcmp
libc.src.string.memcpy libc.src.string.memcpy
libc.src.string.memmove libc.src.string.memmove
libc.src.string.mempcpy libc.src.string.mempcpy
libc.src.string.memrchr libc.src.string.memrchr
libc.src.string.memset libc.src.string.memset
libc.src.string.rindex
libc.src.string.stpcpy libc.src.string.stpcpy
libc.src.string.stpncpy libc.src.string.stpncpy
libc.src.string.strcasecmp libc.src.string.strcasecmp
libc.src.string.strcasestr libc.src.string.strcasestr
libc.src.string.strcat libc.src.string.strcat
libc.src.string.strchr libc.src.string.strchr
libc.src.string.strchrnul libc.src.string.strchrnul
libc.src.string.strcmp libc.src.string.strcmp
▲ Show 20 Lines • Show All 423 Lines • Show Last 20 Lines

libc/config/linux/arm/entrypoints.txt

Show All 18 Linesset(TARGET_LIBC_ENTRYPOINTS
# errno.h entrypoints # errno.h entrypoints
libc.src.errno.errno libc.src.errno.errno
# string.h entrypoints # string.h entrypoints
libc.src.string.bcmp libc.src.string.bcmp
libc.src.string.bcopy libc.src.string.bcopy
libc.src.string.bzero libc.src.string.bzero
libc.src.string.index
libc.src.string.memccpy libc.src.string.memccpy
libc.src.string.memchr libc.src.string.memchr
libc.src.string.memcmp libc.src.string.memcmp
libc.src.string.memcpy libc.src.string.memcpy
libc.src.string.memmove libc.src.string.memmove
libc.src.string.mempcpy libc.src.string.mempcpy
libc.src.string.memrchr libc.src.string.memrchr
libc.src.string.memset libc.src.string.memset
libc.src.string.rindex
libc.src.string.stpcpy libc.src.string.stpcpy
libc.src.string.stpncpy libc.src.string.stpncpy
libc.src.string.strcasecmp libc.src.string.strcasecmp
libc.src.string.strcasestr libc.src.string.strcasestr
libc.src.string.strcat libc.src.string.strcat
libc.src.string.strchr libc.src.string.strchr
libc.src.string.strchrnul libc.src.string.strchrnul
libc.src.string.strcmp libc.src.string.strcmp
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines

libc/config/linux/riscv64/entrypoints.txt

Show All 27 Linesset(TARGET_LIBC_ENTRYPOINTS
# sched.h entrypoints # sched.h entrypoints
libc.src.sched.sched_getaffinity libc.src.sched.sched_getaffinity
libc.src.sched.sched_setaffinity libc.src.sched.sched_setaffinity
# string.h entrypoints # string.h entrypoints
libc.src.string.bcmp libc.src.string.bcmp
libc.src.string.bcopy libc.src.string.bcopy
libc.src.string.bzero libc.src.string.bzero
libc.src.string.index
libc.src.string.memccpy libc.src.string.memccpy
libc.src.string.memchr libc.src.string.memchr
libc.src.string.memcmp libc.src.string.memcmp
libc.src.string.memcpy libc.src.string.memcpy
libc.src.string.memmove libc.src.string.memmove
libc.src.string.mempcpy libc.src.string.mempcpy
libc.src.string.memrchr libc.src.string.memrchr
libc.src.string.memset libc.src.string.memset
libc.src.string.rindex
libc.src.string.stpcpy libc.src.string.stpcpy
libc.src.string.stpncpy libc.src.string.stpncpy
libc.src.string.strcasecmp libc.src.string.strcasecmp
libc.src.string.strcasestr libc.src.string.strcasestr
libc.src.string.strcat libc.src.string.strcat
libc.src.string.strchr libc.src.string.strchr
libc.src.string.strchrnul libc.src.string.strchrnul
libc.src.string.strcmp libc.src.string.strcmp
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines

libc/config/linux/x86_64/entrypoints.txt

Show All 27 Linesset(TARGET_LIBC_ENTRYPOINTS
# sched.h entrypoints # sched.h entrypoints
libc.src.sched.sched_getaffinity libc.src.sched.sched_getaffinity
libc.src.sched.sched_setaffinity libc.src.sched.sched_setaffinity
# string.h entrypoints # string.h entrypoints
libc.src.string.bcmp libc.src.string.bcmp
libc.src.string.bcopy libc.src.string.bcopy
libc.src.string.bzero libc.src.string.bzero
libc.src.string.index
libc.src.string.memccpy libc.src.string.memccpy
libc.src.string.memchr libc.src.string.memchr
libc.src.string.memcmp libc.src.string.memcmp
libc.src.string.memcpy libc.src.string.memcpy
libc.src.string.memmove libc.src.string.memmove
libc.src.string.mempcpy libc.src.string.mempcpy
libc.src.string.memrchr libc.src.string.memrchr
libc.src.string.memset libc.src.string.memset
libc.src.string.rindex
libc.src.string.stpcpy libc.src.string.stpcpy
libc.src.string.stpncpy libc.src.string.stpncpy
libc.src.string.strcasecmp libc.src.string.strcasecmp
libc.src.string.strcasestr libc.src.string.strcasestr
libc.src.string.strcat libc.src.string.strcat
libc.src.string.strchr libc.src.string.strchr
libc.src.string.strchrnul libc.src.string.strchrnul
libc.src.string.strcmp libc.src.string.strcmp
▲ Show 20 Lines • Show All 466 Lines • Show Last 20 Lines

libc/spec/bsd_ext.td

Show All 9 Lines HeaderSpec String = HeaderSpec<
RetValSpec<SizeTType>, RetValSpec<SizeTType>,
[ArgSpec<CharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>] [ArgSpec<CharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>]
>, >,
FunctionSpec< FunctionSpec<
"strlcpy", "strlcpy",
RetValSpec<SizeTType>, RetValSpec<SizeTType>,
[ArgSpec<CharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>] [ArgSpec<CharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>]
>, >,
FunctionSpec< FunctionSpec<
mcgrathrUnsubmitted
Done
ReplyInline Actions

These are usually declared only in <strings.h>, not in <string.h>.

mcgrathr: These are usually declared only in <strings.h>, not in <string.h>.
abrachetAuthorUnsubmitted
Done
ReplyInline Actions

Thanks. Done in commit

abrachet: Thanks. Done in commit
"strsep", "strsep",
RetValSpec<CharPtr>, RetValSpec<CharPtr>,
[ArgSpec<CharRestrictedPtrPtr>, ArgSpec<ConstCharRestrictedPtr>] [ArgSpec<CharRestrictedPtrPtr>, ArgSpec<ConstCharRestrictedPtr>]
>, >,
] ]
>; >;
HeaderSpec Strings = HeaderSpec< HeaderSpec Strings = HeaderSpec<
"strings.h", "strings.h",
[], // Macros [], // Macros
[], // Types [], // Types
[], // Enumerations [], // Enumerations
[ [
FunctionSpec< FunctionSpec<
"strcasecmp", "strcasecmp",
RetValSpec<IntType>, RetValSpec<IntType>,
[ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>] [ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>]
>, >,
FunctionSpec< FunctionSpec<
"strncasecmp", "strncasecmp",
RetValSpec<IntType>, RetValSpec<IntType>,
[ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>] [ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>]
>, >,
FunctionSpec<
"index",
RetValSpec<CharPtr>,
[ArgSpec<ConstCharPtr>, ArgSpec<IntType>]
>,
FunctionSpec<
"rindex",
RetValSpec<CharPtr>,
[ArgSpec<ConstCharPtr>, ArgSpec<IntType>]
>,
] ]
>; >;
HeaderSpec SysWait = HeaderSpec< HeaderSpec SysWait = HeaderSpec<
"sys/wait.h", "sys/wait.h",
[], // Macros [], // Macros
[StructRUsage], // Types [StructRUsage], // Types
[], // Enumerations [], // Enumerations
Show All 15 Lines

libc/src/string/CMakeLists.txt

Show All 26 Linesadd_entrypoint_object(
bcopy bcopy
SRCS SRCS
bcopy.cpp bcopy.cpp
HDRS HDRS
bcopy.h bcopy.h
) )
add_entrypoint_object( add_entrypoint_object(
index
SRCS
index.cpp
HDRS
index.h
DEPENDS
.memory_utils.strchr_implementation
)
add_entrypoint_object(
memccpy memccpy
SRCS SRCS
memccpy.cpp memccpy.cpp
HDRS HDRS
memccpy.h memccpy.h
) )
add_entrypoint_object( add_entrypoint_object(
Show All 20 Linesadd_entrypoint_object(
memrchr memrchr
SRCS SRCS
memrchr.cpp memrchr.cpp
HDRS HDRS
memrchr.h memrchr.h
) )
add_entrypoint_object( add_entrypoint_object(
rindex
SRCS
rindex.cpp
HDRS
rindex.h
DEPENDS
.memory_utils.strchr_implementation
)
add_entrypoint_object(
stpcpy stpcpy
SRCS SRCS
stpcpy.cpp stpcpy.cpp
HDRS HDRS
stpcpy.h stpcpy.h
DEPENDS DEPENDS
.mempcpy .mempcpy
.string_utils .string_utils
▲ Show 20 Lines • Show All 535 Lines • Show Last 20 Lines

libc/src/string/index.h

  • This file was added.
//===-- Implementation header for index -------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_LIBC_SRC_STRING_INDEX_H
#define LLVM_LIBC_SRC_STRING_INDEX_H
namespace __llvm_libc {
char *index(const char *src, int c);
} // namespace __llvm_libc
#endif // LLVM_LIBC_SRC_STRING_INDEX_H

libc/src/string/index.cpp

  • This file was added.
//===-- Implementation of index -------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include "src/string/index.h"
#include "src/__support/common.h"
#include "src/string/memory_utils/strchr_implementations.h"
namespace __llvm_libc {
LLVM_LIBC_FUNCTION(char *, index, (const char *src, int c)) {
return strchr_implementation(src, c);
}
} // namespace __llvm_libc

libc/src/string/rindex.h

  • This file was added.
//===-- Implementation header for rindex ------------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#ifndef LLVM_LIBC_SRC_STRING_RINDEX_H
#define LLVM_LIBC_SRC_STRING_RINDEX_H
namespace __llvm_libc {
char *rindex(const char *src, int c);
} // namespace __llvm_libc
#endif // LLVM_LIBC_SRC_STRING_RINDEX_H

libc/src/string/rindex.cpp

  • This file was added.
//===-- Implementation of rindex ------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include "src/string/rindex.h"
#include "src/__support/common.h"
#include "src/string/memory_utils/strchr_implementations.h"
namespace __llvm_libc {
LLVM_LIBC_FUNCTION(char *, rindex, (const char *src, int c)) {
return strrchr_implementation(src, c);
}
} // namespace __llvm_libc

libc/test/src/string/CMakeLists.txt

add_libc_testsuite(libc_string_unittests) add_libc_testsuite(libc_string_unittests)
add_subdirectory(memory_utils) add_subdirectory(memory_utils)
add_libc_unittest( add_libc_unittest(
bcopy_test bcopy_test
SUITE SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
bcopy_test.cpp bcopy_test.cpp
DEPENDS DEPENDS
libc.src.string.bcopy libc.src.string.bcopy
LINK_LIBRARIES LINK_LIBRARIES
LibcMemoryHelpers LibcMemoryHelpers
) )
add_header_library(
strchr_test_support
HDRS
StrchrTest.h
)
add_libc_unittest(
index_test
SUITE
libc_string_unittests
SRCS
index_test.cpp
DEPENDS
libc.src.string.index
.strchr_test_support
)
add_libc_unittest( add_libc_unittest(
memccpy_test memccpy_test
SUITE SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
memccpy_test.cpp memccpy_test.cpp
DEPENDS DEPENDS
libc.src.string.memccpy libc.src.string.memccpy
Show All 25 Lines SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
memrchr_test.cpp memrchr_test.cpp
DEPENDS DEPENDS
libc.src.string.memrchr libc.src.string.memrchr
) )
add_libc_unittest( add_libc_unittest(
rindex_test
SUITE
libc_string_unittests
SRCS
rindex_test.cpp
DEPENDS
libc.src.string.rindex
.strchr_test_support
)
add_libc_unittest(
stpcpy_test stpcpy_test
SUITE SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
stpcpy_test.cpp stpcpy_test.cpp
DEPENDS DEPENDS
libc.src.string.stpcpy libc.src.string.stpcpy
) )
Show All 13 Linesadd_libc_unittest(
SUITE SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
strcat_test.cpp strcat_test.cpp
DEPENDS DEPENDS
libc.src.string.strcat libc.src.string.strcat
) )
add_header_library(
strchr_test_support
HDRS
StrchrTest.h
)
add_libc_unittest( add_libc_unittest(
strchr_test strchr_test
SUITE SUITE
libc_string_unittests libc_string_unittests
SRCS SRCS
strchr_test.cpp strchr_test.cpp
DEPENDS DEPENDS
libc.src.string.strchr libc.src.string.strchr
▲ Show 20 Lines • Show All 321 Lines • Show Last 20 Lines

libc/test/src/string/index_test.cpp

  • This file was added.
//===-- Unittests for index -----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include "StrchrTest.h"
#include "src/string/index.h"
#include "test/UnitTest/Test.h"
STRCHR_TEST(Index, __llvm_libc::index)

libc/test/src/string/rindex_test.cpp

  • This file was added.
//===-- Unittests for rindex ----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include "StrchrTest.h"
#include "src/string/rindex.h"
#include "test/UnitTest/Test.h"
STRRCHR_TEST(Rindex, __llvm_libc::rindex)