This is an archive of the discontinued LLVM Phabricator instance.

Differential D146100

[libc][bazel] add targets for sprintf
ClosedPublic

Authored by michaelrj on Mar 14 2023, 3:11 PM.

Details

Reviewers
sivachandra
lntue
Commits
rG99047c0501e0: [libc][bazel] add targets for sprintf
Summary

The bazel build is currently overlay mode only, so the FILE functions
are still out of reach for it, but sprintf only uses strings. This adds
targets for sprintf, snprintf, and all the interal printf pieces, as
well as tests.

Diff Detail

Event Timeline

michaelrj created this revision.Mar 14 2023, 3:11 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 14 2023, 3:11 PM
Herald added subscribers: libc-commits, ecnelises, tschuett. · View Herald Transcript
michaelrj requested review of this revision.Mar 14 2023, 3:11 PM
Harbormaster completed remote builds in B219498: Diff 505291.Mar 14 2023, 4:06 PM
michaelrj mentioned this in D146001: [libc] enable printf using system FILE.Mar 15 2023, 10:46 AM
lntue accepted this revision.Mar 16 2023, 6:05 PM

Did you try to run bazel with layering-check ?

This revision is now accepted and ready to land.Mar 16 2023, 6:05 PM
Herald added a subscriber: mikhail.ramalho. · View Herald TranscriptMar 16 2023, 6:05 PM
sivachandra accepted this revision.Mar 16 2023, 8:08 PM

LGTM modulo answer to @lntue's question.

michaelrj added a comment.Mar 20 2023, 3:09 PM

based on this patch https://reviews.llvm.org/D143678 it looks like layering check is on by default for all bazel builds. I also tried specifying it manually, and it passed both.

Closed by commit rG99047c0501e0: [libc][bazel] add targets for sprintf (authored by michaelrj). · Explain WhyMar 20 2023, 3:09 PM
This revision was automatically updated to reflect the committed changes.
michaelrj added a commit: rG99047c0501e0: [libc][bazel] add targets for sprintf.

Revision Contents

PathSize
libc/
src/
stdio/
printf_core/
4 lines
utils/
bazel/
llvm-project-overlay/
libc/
275 lines
test/
UnitTest/
16 lines
src/
stdio/
77 lines

Diff 506747

libc/src/stdio/printf_core/CMakeLists.txt

Show All 14 Linesadd_object_library(
HDRS HDRS
parser.h parser.h
DEPENDS DEPENDS
.core_structs .core_structs
libc.src.__support.arg_list libc.src.__support.arg_list
libc.src.__support.ctype_utils libc.src.__support.ctype_utils
libc.src.__support.str_to_integer libc.src.__support.str_to_integer
libc.src.__support.CPP.bit libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
libc.src.__support.CPP.type_traits libc.src.__support.CPP.type_traits
libc.src.__support.common libc.src.__support.common
) )
add_object_library( add_object_library(
mock_parser mock_parser
SRCS SRCS
parser.cpp parser.cpp
HDRS HDRS
parser.h parser.h
DEPENDS DEPENDS
.core_structs .core_structs
libc.src.__support.arg_list libc.src.__support.arg_list
libc.src.__support.ctype_utils libc.src.__support.ctype_utils
libc.src.__support.str_to_integer libc.src.__support.str_to_integer
libc.src.__support.CPP.bit libc.src.__support.CPP.bit
libc.src.__support.CPP.optional
libc.src.__support.CPP.string_view libc.src.__support.CPP.string_view
libc.src.__support.CPP.type_traits libc.src.__support.CPP.type_traits
libc.src.__support.common libc.src.__support.common
COMPILE_OPTIONS COMPILE_OPTIONS
-DLIBC_COPT_MOCK_ARG_LIST -DLIBC_COPT_MOCK_ARG_LIST
) )
add_object_library( add_object_library(
Show All 10 Lines
) )
add_object_library( add_object_library(
writer writer
SRCS SRCS
writer.cpp writer.cpp
HDRS HDRS
writer.h writer.h
DEPENDS
libc.src.__support.CPP.string_view
) )
add_object_library( add_object_library(
converter converter
SRCS SRCS
converter.cpp converter.cpp
HDRS HDRS
converter.h converter.h
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/libc/BUILD.bazel

Show First 20 Lines • Show All 209 Lines • ▼ Show 20 Lineslibc_support_library(
deps = [ deps = [
":__support_cpp_type_traits", ":__support_cpp_type_traits",
":__support_macros_attributes", ":__support_macros_attributes",
":libc_root", ":libc_root",
], ],
) )
libc_support_library( libc_support_library(
name = "__support_arg_list",
hdrs = ["src/__support/arg_list.h"],
deps = [
":libc_root",
],
)
libc_support_library(
name = "__support_float_to_string",
hdrs = [
"src/__support/float_to_string.h",
"src/__support/ryu_constants.h",
],
deps = [
":__support_cpp_type_traits",
":__support_fputil_fp_bits",
":__support_uint",
":__support_libc_assert",
":__support_common",
":libc_root",
],
)
libc_support_library(
name = "__support_number_pair", name = "__support_number_pair",
hdrs = ["src/__support/number_pair.h"], hdrs = ["src/__support/number_pair.h"],
deps = [ deps = [
":__support_cpp_type_traits", ":__support_cpp_type_traits",
":__support_named_pair", ":__support_named_pair",
":libc_root", ":libc_root",
], ],
) )
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
libc_support_library( libc_support_library(
name = "__support_integer_operations", name = "__support_integer_operations",
hdrs = ["src/__support/integer_operations.h"], hdrs = ["src/__support/integer_operations.h"],
deps = [":__support_cpp_type_traits"], deps = [":__support_cpp_type_traits"],
) )
libc_support_library( libc_support_library(
name = "__support_integer_to_string",
hdrs = ["src/__support/integer_to_string.h"],
deps = [
":__support_cpp_type_traits",
":__support_cpp_optional",
":__support_cpp_span",
":__support_cpp_string_view",
":__support_common",
":libc_root",
],
)
libc_support_library(
name = "__support_libc_assert",
hdrs = ["src/__support/libc_assert.h"],
deps = [
":__support_osutil_io",
":__support_osutil_quick_exit",
":__support_integer_to_string",
":__support_macros_attributes",
":libc_root",
],
)
libc_support_library(
name = "__support_ctype_utils", name = "__support_ctype_utils",
hdrs = ["src/__support/ctype_utils.h"], hdrs = ["src/__support/ctype_utils.h"],
) )
libc_support_library( libc_support_library(
name = "__support_str_to_integer", name = "__support_str_to_integer",
hdrs = ["src/__support/str_to_integer.h"], hdrs = ["src/__support/str_to_integer.h"],
deps = [ deps = [
▲ Show 20 Lines • Show All 295 Lines • ▼ Show 20 Lines deps = [
":__support_macros_optimization", ":__support_macros_optimization",
":__support_macros_properties_architectures", ":__support_macros_properties_architectures",
":__support_macros_properties_cpu_features", ":__support_macros_properties_cpu_features",
":libc_root", ":libc_root",
], ],
) )
libc_support_library( libc_support_library(
name = "__support_osutil", name = "__support_osutil_syscall",
hdrs = ["src/__support/OSUtil/syscall.h"], hdrs = ["src/__support/OSUtil/syscall.h"],
textual_hdrs = [ textual_hdrs = [
"src/__support/OSUtil/linux/syscall.h", "src/__support/OSUtil/linux/syscall.h",
"src/__support/OSUtil/linux/aarch64/syscall.h", "src/__support/OSUtil/linux/aarch64/syscall.h",
"src/__support/OSUtil/linux/x86_64/syscall.h", "src/__support/OSUtil/linux/x86_64/syscall.h",
], ],
deps = [ deps = [
":__support_common", ":__support_common",
":libc_root", ":libc_root",
], ],
) )
libc_support_library(
name = "__support_osutil_io",
hdrs = ["src/__support/OSUtil/io.h"],
textual_hdrs = [
"src/__support/OSUtil/linux/io.h",
],
deps = [
":__support_common",
":__support_osutil_syscall",
":string_utils",
":libc_root",
],
)
libc_support_library(
name = "__support_osutil_quick_exit",
hdrs = ["src/__support/OSUtil/quick_exit.h"],
textual_hdrs = [
"src/__support/OSUtil/linux/quick_exit.h",
#TODO: add support for GPU quick_exit (isn't just in a header.)
],
deps = [
":__support_osutil_syscall",
":libc_root",
],
)
############################### errno targets ################################ ############################### errno targets ################################
libc_function( libc_function(
name = "errno", name = "errno",
srcs = ["src/errno/libc_errno.cpp"], srcs = ["src/errno/libc_errno.cpp"],
hdrs = ["src/errno/libc_errno.h"], hdrs = ["src/errno/libc_errno.h"],
deps = [ deps = [
":__support_common", ":__support_common",
▲ Show 20 Lines • Show All 1,164 Lines • ▼ Show 20 Lines
############################### unistd targets ############################### ############################### unistd targets ###############################
libc_function( libc_function(
name = "chdir", name = "chdir",
srcs = ["src/unistd/linux/chdir.cpp"], srcs = ["src/unistd/linux/chdir.cpp"],
hdrs = ["src/unistd/chdir.h"], hdrs = ["src/unistd/chdir.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "close", name = "close",
srcs = ["src/unistd/linux/close.cpp"], srcs = ["src/unistd/linux/close.cpp"],
hdrs = ["src/unistd/close.h"], hdrs = ["src/unistd/close.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "fchdir", name = "fchdir",
srcs = ["src/unistd/linux/fchdir.cpp"], srcs = ["src/unistd/linux/fchdir.cpp"],
hdrs = ["src/unistd/fchdir.h"], hdrs = ["src/unistd/fchdir.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "fsync", name = "fsync",
srcs = ["src/unistd/linux/fsync.cpp"], srcs = ["src/unistd/linux/fsync.cpp"],
hdrs = ["src/unistd/fsync.h"], hdrs = ["src/unistd/fsync.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "ftruncate", name = "ftruncate",
srcs = ["src/unistd/linux/ftruncate.cpp"], srcs = ["src/unistd/linux/ftruncate.cpp"],
hdrs = ["src/unistd/ftruncate.h"], hdrs = ["src/unistd/ftruncate.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "link", name = "link",
srcs = ["src/unistd/linux/link.cpp"], srcs = ["src/unistd/linux/link.cpp"],
hdrs = ["src/unistd/link.h"], hdrs = ["src/unistd/link.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "linkat", name = "linkat",
srcs = ["src/unistd/linux/linkat.cpp"], srcs = ["src/unistd/linux/linkat.cpp"],
hdrs = ["src/unistd/linkat.h"], hdrs = ["src/unistd/linkat.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "lseek", name = "lseek",
srcs = ["src/unistd/linux/lseek.cpp"], srcs = ["src/unistd/linux/lseek.cpp"],
hdrs = ["src/unistd/lseek.h"], hdrs = ["src/unistd/lseek.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "read", name = "read",
srcs = ["src/unistd/linux/read.cpp"], srcs = ["src/unistd/linux/read.cpp"],
hdrs = ["src/unistd/read.h"], hdrs = ["src/unistd/read.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "readlink", name = "readlink",
srcs = ["src/unistd/linux/readlink.cpp"], srcs = ["src/unistd/linux/readlink.cpp"],
hdrs = ["src/unistd/readlink.h"], hdrs = ["src/unistd/readlink.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "readlinkat", name = "readlinkat",
srcs = ["src/unistd/linux/readlinkat.cpp"], srcs = ["src/unistd/linux/readlinkat.cpp"],
hdrs = ["src/unistd/readlinkat.h"], hdrs = ["src/unistd/readlinkat.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "rmdir", name = "rmdir",
srcs = ["src/unistd/linux/rmdir.cpp"], srcs = ["src/unistd/linux/rmdir.cpp"],
hdrs = ["src/unistd/rmdir.h"], hdrs = ["src/unistd/rmdir.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "symlink", name = "symlink",
srcs = ["src/unistd/linux/symlink.cpp"], srcs = ["src/unistd/linux/symlink.cpp"],
hdrs = ["src/unistd/symlink.h"], hdrs = ["src/unistd/symlink.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "symlinkat", name = "symlinkat",
srcs = ["src/unistd/linux/symlinkat.cpp"], srcs = ["src/unistd/linux/symlinkat.cpp"],
hdrs = ["src/unistd/symlinkat.h"], hdrs = ["src/unistd/symlinkat.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "truncate", name = "truncate",
srcs = ["src/unistd/linux/truncate.cpp"], srcs = ["src/unistd/linux/truncate.cpp"],
hdrs = ["src/unistd/truncate.h"], hdrs = ["src/unistd/truncate.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "unlink", name = "unlink",
srcs = ["src/unistd/linux/unlink.cpp"], srcs = ["src/unistd/linux/unlink.cpp"],
hdrs = ["src/unistd/unlink.h"], hdrs = ["src/unistd/unlink.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "unlinkat", name = "unlinkat",
srcs = ["src/unistd/linux/unlinkat.cpp"], srcs = ["src/unistd/linux/unlinkat.cpp"],
hdrs = ["src/unistd/unlinkat.h"], hdrs = ["src/unistd/unlinkat.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno", ":errno",
], ],
) )
libc_function( libc_function(
name = "write", name = "write",
srcs = ["src/unistd/linux/write.cpp"], srcs = ["src/unistd/linux/write.cpp"],
hdrs = ["src/unistd/write.h"], hdrs = ["src/unistd/write.h"],
deps = [ deps = [
":__support_common", ":__support_common",
":__support_osutil", ":__support_osutil_syscall",
":errno",
],
)
################################ stdio targets #################################
libc_support_library(
name = "printf_core_structs",
hdrs = ["src/stdio/printf_core/core_structs.h"],
deps = [
":__support_cpp_string_view",
":__support_fputil_fp_bits",
":libc_root",
],
)
libc_support_library(
name = "printf_config",
hdrs = ["src/stdio/printf_core/printf_config.h"],
deps = [
":libc_root",
],
)
libc_support_library(
name = "printf_parser",
hdrs = ["src/stdio/printf_core/parser.h"],
srcs = ["src/stdio/printf_core/parser.cpp"],
deps = [
":printf_core_structs",
":printf_config",
":__support_cpp_string_view",
":__support_cpp_type_traits",
":__support_cpp_optional",
":__support_cpp_bit",
":__support_fputil_fp_bits",
":__support_arg_list",
":__support_ctype_utils",
":__support_str_to_integer",
":__support_common",
":libc_root",
],
)
# Only used for testing.
libc_support_library(
name = "printf_mock_parser",
hdrs = ["src/stdio/printf_core/parser.h"],
srcs = ["src/stdio/printf_core/parser.cpp"],
deps = [
":printf_core_structs",
":printf_config",
":__support_cpp_string_view",
":__support_cpp_type_traits",
":__support_cpp_optional",
":__support_cpp_bit",
":__support_fputil_fp_bits",
":__support_arg_list",
":__support_ctype_utils",
":__support_str_to_integer",
":__support_common",
":libc_root",
],
copts = ["-DLIBC_COPT_MOCK_ARG_LIST"],
)
libc_support_library(
name = "printf_string_writer",
hdrs = ["src/stdio/printf_core/string_writer.h"],
srcs = ["src/stdio/printf_core/string_writer.cpp"],
deps = [
":__support_cpp_string_view",
":string_memory_utils",
":printf_core_structs",
":libc_root",
],
)
libc_support_library(
name = "printf_writer",
hdrs = ["src/stdio/printf_core/writer.h"],
srcs = ["src/stdio/printf_core/writer.cpp"],
deps = [
":__support_cpp_string_view",
":libc_root",
],
)
libc_support_library(
name = "printf_converter",
hdrs = [
"src/stdio/printf_core/converter.h",
"src/stdio/printf_core/converter_utils.h",
"src/stdio/printf_core/converter_atlas.h",
"src/stdio/printf_core/string_converter.h",
"src/stdio/printf_core/char_converter.h",
"src/stdio/printf_core/int_converter.h",
"src/stdio/printf_core/ptr_converter.h",
"src/stdio/printf_core/write_int_converter.h",
"src/stdio/printf_core/float_inf_nan_converter.h",
"src/stdio/printf_core/float_hex_converter.h",
"src/stdio/printf_core/float_dec_converter.h",
],
srcs = ["src/stdio/printf_core/converter.cpp"],
deps = [
":printf_writer",
":printf_core_structs",
":__support_cpp_string_view",
":__support_cpp_limits",
":__support_cpp_span",
":__support_fputil_fp_bits",
":__support_fputil_fenv_impl",
":__support_libc_assert",
":__support_uint",
":__support_uint128",
":__support_integer_to_string",
":__support_float_to_string",
":__support_common",
":libc_root",
],
)
libc_support_library(
name = "printf_main",
hdrs = ["src/stdio/printf_core/printf_main.h"],
srcs = ["src/stdio/printf_core/printf_main.cpp"],
deps = [
":printf_parser",
":printf_converter",
":printf_writer",
":printf_core_structs",
":__support_arg_list",
":libc_root",
],
)
libc_function(
name = "sprintf",
srcs = ["src/stdio/sprintf.cpp"],
hdrs = ["src/stdio/sprintf.h"],
deps = [
":__support_arg_list",
":printf_main",
":printf_string_writer",
":printf_writer",
":errno",
],
)
libc_function(
name = "snprintf",
srcs = ["src/stdio/snprintf.cpp"],
hdrs = ["src/stdio/snprintf.h"],
deps = [
":__support_arg_list",
":printf_main",
":printf_string_writer",
":printf_writer",
":errno", ":errno",
], ],
) )

utils/bazel/llvm-project-overlay/libc/test/UnitTest/BUILD.bazel

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines deps = [
"//libc:__support_cpp_bit", "//libc:__support_cpp_bit",
"//libc:__support_cpp_bitset", "//libc:__support_cpp_bitset",
"//libc:__support_cpp_span", "//libc:__support_cpp_span",
"//libc:__support_cpp_type_traits", "//libc:__support_cpp_type_traits",
], ],
) )
cc_library( cc_library(
name = "printf_matcher",
srcs = [
"PrintfMatcher.cpp",
],
hdrs = [
"PrintfMatcher.h",
],
deps = [
":LibcUnitTest",
":string_utils",
"//libc:__support_fputil_fp_bits",
"//libc:printf_core_structs",
],
)
cc_library(
name = "string_utils", name = "string_utils",
hdrs = [ hdrs = [
"StringUtils.h", "StringUtils.h",
], ],
deps = [ deps = [
"//libc:__support_cpp_type_traits", "//libc:__support_cpp_type_traits",
], ],
) )

utils/bazel/llvm-project-overlay/libc/test/src/stdio/BUILD.bazel

  • This file was added.
# This file is licensed 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
# Tests for LLVM libc stdio.h functions.
load("//libc/test:libc_test_rules.bzl", "libc_test")
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
libc_test(
name = "printf_parser_test",
srcs = ["printf_core/parser_test.cpp"],
libc_function_deps = [
],
deps = [
"//libc:printf_parser",
"//libc:printf_core_structs",
"//libc:__support_cpp_string_view",
"//libc:__support_cpp_bit",
"//libc:__support_arg_list",
"//libc/utils/testutils:libc_test_utils",
"//libc/test/UnitTest:printf_matcher",
],
)
libc_test(
name = "printf_string_writer_test",
srcs = ["printf_core/string_writer_test.cpp"],
libc_function_deps = [
],
deps = [
"//libc:printf_string_writer",
"//libc:printf_writer",
"//libc:printf_core_structs",
"//libc:__support_cpp_string_view",
"//libc:__support_arg_list",
],
)
libc_test(
name = "printf_converter_test",
srcs = ["printf_core/converter_test.cpp"],
libc_function_deps = [
],
deps = [
"//libc:printf_converter",
"//libc:printf_string_writer",
"//libc:printf_writer",
"//libc:printf_core_structs",
"//libc:__support_cpp_string_view",
"//libc:__support_arg_list",
],
)
libc_test(
name = "sprintf_test",
srcs = ["sprintf_test.cpp"],
libc_function_deps = [
"//libc:sprintf",
],
deps = [
"//libc:__support_fputil_fp_bits",
"//libc:__support_fputil_platform_defs",
"//libc/utils/testutils:libc_test_utils",
],
)
libc_test(
name = "snprintf_test",
srcs = ["snprintf_test.cpp"],
libc_function_deps = [
"//libc:snprintf",
],
)