Skip to content

Commit

Permalink
Merge bitcoin#30842: build: Minimize I/O operations in `GenerateHeade…
Browse files Browse the repository at this point in the history 
…rFrom{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
  • Loading branch information
@fanquake
fanquake committed Sep 12, 2024
2 parents c773618 + b07fe66 commit 1559637
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 21 deletions.
22 changes: 12 additions & 10 deletions cmake/script/GenerateHeaderFromJson.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@
file(READ ${JSON_SOURCE_PATH} hex_content HEX)
string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}")

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

set(i 0)
foreach(byte ${bytes})
math(EXPR i "${i} + 1")
math(EXPR remainder "${i} % 8")
if(remainder EQUAL 0)
file(APPEND ${HEADER_PATH} "0x${byte},\n")
if(i EQUAL 8)
set(i 0)
string(APPEND header_content "0x${byte},\n")
else()
file(APPEND ${HEADER_PATH} "0x${byte}, ")
string(APPEND header_content "0x${byte}, ")
endif()
endforeach()

file(APPEND ${HEADER_PATH} "\n};\n")
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)};")
file(APPEND ${HEADER_PATH} "\n}")
string(APPEND header_content "\n};\n")
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)};")
string(APPEND header_content "\n}")

file(WRITE ${HEADER_PATH} "${header_content}")
24 changes: 13 additions & 11 deletions cmake/script/GenerateHeaderFromRaw.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,25 @@
file(READ ${RAW_SOURCE_PATH} hex_content HEX)
string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" bytes "${hex_content}")

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

set(i 0)
foreach(byte ${bytes})
math(EXPR i "${i} + 1")
math(EXPR remainder "${i} % 8")
if(remainder EQUAL 0)
file(APPEND ${HEADER_PATH} "std::byte{0x${byte}},\n")
if(i EQUAL 8)
set(i 0)
string(APPEND header_content "std::byte{0x${byte}},\n")
else()
file(APPEND ${HEADER_PATH} "std::byte{0x${byte}}, ")
string(APPEND header_content "std::byte{0x${byte}}, ")
endif()
endforeach()

file(APPEND ${HEADER_PATH} "\n};\n")
file(APPEND ${HEADER_PATH} "inline constexpr std::span ${raw_source_basename}{detail_${raw_source_basename}_raw};\n")
file(APPEND ${HEADER_PATH} "}")
string(APPEND header_content "\n};\n")
string(APPEND header_content "inline constexpr std::span ${raw_source_basename}{detail_${raw_source_basename}_raw};\n")
string(APPEND header_content "}")

file(WRITE ${HEADER_PATH} "${header_content}")

0 comments on commit 1559637

Please sign in to comment.