Skip to content

Commit 3695d6c

Browse files
michaelrj-googlemichaelrj-google
authored
[libc][GPU] clean up includes (#143203)
The GPU stdio functions were depending on indirect inclusion for some of their dependencies. This patch should fix all of that.
1 parent 549ce80 commit 3695d6c

32 files changed

+69
-68
lines changed

‎libc/src/stdio/gpu/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ add_entrypoint_object(
5959
DEPENDS
6060
libc.hdr.types.FILE
6161
libc.src.__support.RPC.rpc_client
62+
.gpu_file
6263
)
6364

6465
add_entrypoint_object(
@@ -70,6 +71,7 @@ add_entrypoint_object(
7071
DEPENDS
7172
libc.hdr.types.FILE
7273
libc.src.__support.RPC.rpc_client
74+
.gpu_file
7375
)
7476

7577
add_entrypoint_object(
@@ -114,6 +116,7 @@ add_entrypoint_object(
114116
DEPENDS
115117
libc.hdr.types.FILE
116118
libc.src.__support.RPC.rpc_client
119+
.gpu_file
117120
)
118121

119122
add_entrypoint_object(
@@ -124,6 +127,7 @@ add_entrypoint_object(
124127
../fopen.h
125128
DEPENDS
126129
libc.hdr.types.FILE
130+
.gpu_file
127131
)
128132

129133
add_entrypoint_object(
@@ -134,6 +138,8 @@ add_entrypoint_object(
134138
../fclose.h
135139
DEPENDS
136140
libc.hdr.types.FILE
141+
libc.hdr.stdio_macros
142+
.gpu_file
137143
)
138144

139145
add_entrypoint_object(
@@ -144,6 +150,7 @@ add_entrypoint_object(
144150
../fread.h
145151
DEPENDS
146152
libc.hdr.types.FILE
153+
.gpu_file
147154
)
148155

149156
add_entrypoint_object(
@@ -254,8 +261,6 @@ add_entrypoint_object(
254261
DEPENDS
255262
libc.hdr.types.FILE
256263
.gpu_file
257-
.feof
258-
.ferror
259264
)
260265

261266
add_entrypoint_object(

‎libc/src/stdio/gpu/clearerr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/clearerr.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/fclose.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fclose.h"
10-
#include "src/__support/macros/config.h"
11-
#include "src/stdio/gpu/file.h"
1210

1311
#include "hdr/stdio_macros.h"
1412
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
14+
#include "src/stdio/gpu/file.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

‎libc/src/stdio/gpu/feof.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/feof.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/ferror.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/ferror.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/fflush.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fflush.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/fgetc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fgetc.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF.
1413
#include "hdr/types/FILE.h"
14+
#include "src/__support/common.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

‎libc/src/stdio/gpu/fgets.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fgets.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
12-
#include "src/stdio/feof.h"
13-
#include "src/stdio/ferror.h"
1410

11+
#include "file.h"
1512
#include "hdr/stdio_macros.h" // for EOF.
1613
#include "hdr/types/FILE.h"
17-
#include <stddef.h>
14+
#include "src/__support/common.h"
15+
16+
#include <stdint.h>
1817

1918
namespace LIBC_NAMESPACE_DECL {
2019

‎libc/src/stdio/gpu/file.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/stdio_macros.h" // For stdin/out/err
10+
#include "hdr/types/FILE.h"
911
#include "src/__support/RPC/rpc_client.h"
1012
#include "src/__support/common.h"
1113
#include "src/__support/macros/attributes.h"
12-
#include "src/__support/macros/config.h"
13-
#include "src/string/string_utils.h"
14-
15-
#include "hdr/stdio_macros.h" // For stdin/out/err
16-
#include "hdr/types/FILE.h"
1714

1815
namespace LIBC_NAMESPACE_DECL {
1916
namespace file {

‎libc/src/stdio/gpu/fopen.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fopen.h"
10-
#include "src/__support/CPP/string_view.h"
11-
#include "src/__support/macros/config.h"
12-
#include "src/stdio/gpu/file.h"
1310

1411
#include "hdr/types/FILE.h"
12+
#include "src/__support/common.h"
13+
#include "src/stdio/gpu/file.h"
1514
#include "src/string/memory_utils/inline_memcpy.h"
15+
#include "src/string/string_utils.h"
1616

1717
namespace LIBC_NAMESPACE_DECL {
1818

‎libc/src/stdio/gpu/fprintf.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "hdr/types/FILE.h"
1212
#include "src/__support/CPP/string_view.h"
1313
#include "src/__support/arg_list.h"
14+
#include "src/__support/common.h"
1415
#include "src/errno/libc_errno.h"
1516
#include "src/stdio/gpu/vfprintf_utils.h"
1617

‎libc/src/stdio/gpu/fputc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fputc.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF.
1413
#include "hdr/types/FILE.h"
14+
#include "src/__support/common.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

‎libc/src/stdio/gpu/fputs.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fputs.h"
10-
#include "src/__support/CPP/string_view.h"
11-
#include "src/__support/macros/config.h"
12-
#include "src/errno/libc_errno.h"
13-
#include "src/stdio/gpu/file.h"
1410

1511
#include "hdr/stdio_macros.h" // for EOF.
1612
#include "hdr/types/FILE.h"
13+
#include "src/__support/CPP/string_view.h"
14+
#include "src/__support/common.h"
15+
#include "src/stdio/gpu/file.h"
1716

1817
namespace LIBC_NAMESPACE_DECL {
1918

‎libc/src/stdio/gpu/fread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fread.h"
10-
#include "src/__support/macros/config.h"
11-
#include "src/stdio/gpu/file.h"
1210

1311
#include "hdr/types/FILE.h"
12+
#include "src/__support/common.h"
13+
#include "src/stdio/gpu/file.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/fseek.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fseek.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/ftell.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/ftell.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/fwrite.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/fwrite.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/getc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/getc.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF.
1413
#include "hdr/types/FILE.h"
14+
#include "src/__support/common.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

‎libc/src/stdio/gpu/getchar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/getchar.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF and stdin.
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/printf.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include "src/__support/CPP/string_view.h"
1212
#include "src/__support/arg_list.h"
13+
#include "src/__support/common.h"
1314
#include "src/errno/libc_errno.h"
1415
#include "src/stdio/gpu/vfprintf_utils.h"
1516

‎libc/src/stdio/gpu/putc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/putc.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF.
1413
#include "hdr/types/FILE.h"
14+
#include "src/__support/common.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

‎libc/src/stdio/gpu/putchar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/putchar.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/stdio_macros.h" // for EOF and stdout.
13+
#include "src/__support/common.h"
1414

1515
namespace LIBC_NAMESPACE_DECL {
1616

‎libc/src/stdio/gpu/puts.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/puts.h"
10-
#include "src/__support/CPP/string_view.h"
11-
#include "src/__support/macros/config.h"
12-
#include "src/errno/libc_errno.h"
13-
#include "src/stdio/gpu/file.h"
1410

1511
#include "hdr/stdio_macros.h" // for EOF and stdout.
12+
#include "src/__support/CPP/string_view.h"
13+
#include "src/__support/common.h"
14+
#include "src/stdio/gpu/file.h"
1615

1716
namespace LIBC_NAMESPACE_DECL {
1817

1918
LLVM_LIBC_FUNCTION(int, puts, (const char *__restrict str)) {
2019
cpp::string_view str_view(str);
21-
auto written = file::write_impl<LIBC_WRITE_TO_STDOUT_NEWLINE>(stdout, str,
22-
str_view.size());
20+
auto written = file::write_impl<LIBC_WRITE_TO_STDOUT_NEWLINE>(
21+
stdout, str, str_view.size());
2322
if (written != str_view.size() + 1)
2423
return EOF;
2524
return 0;

‎libc/src/stdio/gpu/remove.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/remove.h"
10-
#include "file.h"
11-
#include "src/__support/macros/config.h"
1210

11+
#include "file.h"
1312
#include "hdr/types/FILE.h"
13+
#include "src/__support/common.h"
14+
#include "src/string/string_utils.h"
1415

1516
namespace LIBC_NAMESPACE_DECL {
1617

‎libc/src/stdio/gpu/rename.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/stdio/rename.h"
10-
#include "src/__support/CPP/string_view.h"
11-
#include "src/__support/macros/config.h"
12-
#include "src/stdio/gpu/file.h"
1310

1411
#include "hdr/types/FILE.h"
12+
#include "src/__support/common.h"
13+
#include "src/stdio/gpu/file.h"
14+
#include "src/string/string_utils.h"
1515

1616
namespace LIBC_NAMESPACE_DECL {
1717

0 commit comments

Comments
 (0)