Skip to content

Commit 1559637

Browse files
committed
Merge bitcoin/bitcoin#30842: build: Minimize I/O operations in GenerateHeaderFrom{Json,Raw}.cmake
b07fe66 build: Minimize I/O operations in `GenerateHeaderFrom{Json,Raw}.cmake` (Hennadii Stepanov) Pull request description: This PR aims to reduce build time by replacing multiple `file(WRITE|APPEND ...)` commands with a single `file(WRITE ...)` command. Due to differences in implementation (e.g., filesystem design, system calls, caching), a noticeable improvement in build time is observed only on Windows. Additionally, the code has been refactored to remove the `remainder` local variables. ACKs for top commit: sipsorcery: tACK b07fe66 maflcko: review ACK b07fe66 TheCharlatan: ACK b07fe66 Tree-SHA512: 6ed3ae8fe7d8859af38d83918eddf7cb318607787863b95589f4a7a45a36f8c4bd1c01e366078d0515115c121bc857dc63471e52ff26fc49edbc8bb69875e947
2 parents c773618 + b07fe66 commit 1559637

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

cmake/script/GenerateHeaderFromJson.cmake

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@
55
file(READ ${JSON_SOURCE_PATH} hex_content HEX)
66
string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}")
77

8-
file(WRITE ${HEADER_PATH} "#include <string_view>\n")
9-
file(APPEND ${HEADER_PATH} "namespace json_tests{\n")
8+
set(header_content "#include <string_view>\n")
9+
string(APPEND header_content "namespace json_tests{\n")
1010
get_filename_component(json_source_basename ${JSON_SOURCE_PATH} NAME_WE)
11-
file(APPEND ${HEADER_PATH} "inline constexpr char detail_${json_source_basename}_bytes[]{\n")
11+
string(APPEND header_content "inline constexpr char detail_${json_source_basename}_bytes[]{\n")
1212

1313
set(i 0)
1414
foreach(byte ${bytes})
1515
math(EXPR i "${i} + 1")
16-
math(EXPR remainder "${i} % 8")
17-
if(remainder EQUAL 0)
18-
file(APPEND ${HEADER_PATH} "0x${byte},\n")
16+
if(i EQUAL 8)
17+
set(i 0)
18+
string(APPEND header_content "0x${byte},\n")
1919
else()
20-
file(APPEND ${HEADER_PATH} "0x${byte}, ")
20+
string(APPEND header_content "0x${byte}, ")
2121
endif()
2222
endforeach()
2323

24-
file(APPEND ${HEADER_PATH} "\n};\n")
25-
file(APPEND ${HEADER_PATH} "inline constexpr std::string_view ${json_source_basename}{std::begin(detail_${json_source_basename}_bytes), std::end(detail_${json_source_basename}_bytes)};")
26-
file(APPEND ${HEADER_PATH} "\n}")
24+
string(APPEND header_content "\n};\n")
25+
string(APPEND header_content "inline constexpr std::string_view ${json_source_basename}{std::begin(detail_${json_source_basename}_bytes), std::end(detail_${json_source_basename}_bytes)};")
26+
string(APPEND header_content "\n}")
27+
28+
file(WRITE ${HEADER_PATH} "${header_content}")

cmake/script/GenerateHeaderFromRaw.cmake

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,25 @@
55
file(READ ${RAW_SOURCE_PATH} hex_content HEX)
66
string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}")
77

8-
file(WRITE ${HEADER_PATH} "#include <cstddef>\n")
9-
file(APPEND ${HEADER_PATH} "#include <span>\n")
10-
file(APPEND ${HEADER_PATH} "namespace ${RAW_NAMESPACE} {\n")
8+
set(header_content "#include <cstddef>\n")
9+
string(APPEND header_content "#include <span>\n")
10+
string(APPEND header_content "namespace ${RAW_NAMESPACE} {\n")
1111
get_filename_component(raw_source_basename ${RAW_SOURCE_PATH} NAME_WE)
12-
file(APPEND ${HEADER_PATH} "inline constexpr std::byte detail_${raw_source_basename}_raw[]{\n")
12+
string(APPEND header_content "inline constexpr std::byte detail_${raw_source_basename}_raw[]{\n")
1313

1414
set(i 0)
1515
foreach(byte ${bytes})
1616
math(EXPR i "${i} + 1")
17-
math(EXPR remainder "${i} % 8")
18-
if(remainder EQUAL 0)
19-
file(APPEND ${HEADER_PATH} "std::byte{0x${byte}},\n")
17+
if(i EQUAL 8)
18+
set(i 0)
19+
string(APPEND header_content "std::byte{0x${byte}},\n")
2020
else()
21-
file(APPEND ${HEADER_PATH} "std::byte{0x${byte}}, ")
21+
string(APPEND header_content "std::byte{0x${byte}}, ")
2222
endif()
2323
endforeach()
2424

25-
file(APPEND ${HEADER_PATH} "\n};\n")
26-
file(APPEND ${HEADER_PATH} "inline constexpr std::span ${raw_source_basename}{detail_${raw_source_basename}_raw};\n")
27-
file(APPEND ${HEADER_PATH} "}")
25+
string(APPEND header_content "\n};\n")
26+
string(APPEND header_content "inline constexpr std::span ${raw_source_basename}{detail_${raw_source_basename}_raw};\n")
27+
string(APPEND header_content "}")
28+
29+
file(WRITE ${HEADER_PATH} "${header_content}")

0 commit comments

Comments
 (0)