VeniVidiVici
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internals: Apply make format-json format-yaml. No functional change.

This commit is contained in:
Wilson Snyder 2025-04-16 07:34:57 -04:00
parent 09d27fa8a7
commit 3ecd58460f
5 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.github/workflows/build.yml vendored
View File

@ -27,8 +27,8 @@ jobs:
name: Build name: Build
uses: ./.github/workflows/reusable-build.yml uses: ./.github/workflows/reusable-build.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -39,8 +39,8 @@ jobs:
name: Build name: Build
uses: ./.github/workflows/reusable-build.yml uses: ./.github/workflows/reusable-build.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -51,8 +51,8 @@ jobs:
name: Build name: Build
uses: ./.github/workflows/reusable-build.yml uses: ./.github/workflows/reusable-build.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -63,8 +63,8 @@ jobs:
name: Build name: Build
uses: ./.github/workflows/reusable-build.yml uses: ./.github/workflows/reusable-build.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -76,10 +76,10 @@ jobs:
needs: build-2404-gcc needs: build-2404-gcc
uses: ./.github/workflows/reusable-test.yml uses: ./.github/workflows/reusable-test.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
reloc: ${{ matrix.reloc }} reloc: ${{ matrix.reloc }}
suite: ${{ matrix.suite }} suite: ${{ matrix.suite }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -98,10 +98,10 @@ jobs:
needs: build-2404-clang needs: build-2404-clang
uses: ./.github/workflows/reusable-test.yml uses: ./.github/workflows/reusable-test.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
reloc: ${{ matrix.reloc }} reloc: ${{ matrix.reloc }}
suite: ${{ matrix.suite }} suite: ${{ matrix.suite }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -120,10 +120,10 @@ jobs:
needs: build-2204-gcc needs: build-2204-gcc
uses: ./.github/workflows/reusable-test.yml uses: ./.github/workflows/reusable-test.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
reloc: ${{ matrix.reloc }} reloc: ${{ matrix.reloc }}
suite: ${{ matrix.suite }} suite: ${{ matrix.suite }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -142,10 +142,10 @@ jobs:
needs: build-2204-clang needs: build-2204-clang
uses: ./.github/workflows/reusable-test.yml uses: ./.github/workflows/reusable-test.yml
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}
cc: ${{ matrix.cc }} cc: ${{ matrix.cc }}
reloc: ${{ matrix.reloc }} reloc: ${{ matrix.reloc }}
suite: ${{ matrix.suite }} suite: ${{ matrix.suite }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:

1
.github/workflows/reusable-test.yml vendored
View File

@ -21,7 +21,6 @@ on:
required: true required: true
type: string type: string
env: env:
CI_OS_NAME: linux CI_OS_NAME: linux
CI_COMMIT: ${{ github.sha }} CI_COMMIT: ${{ github.sha }}

5
CMakeLists.txt
View File

@ -134,10 +134,7 @@ configure_package_config_file(
INSTALL_DESTINATION . INSTALL_DESTINATION .
) )
install( install(FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config.cmake DESTINATION .)
FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config.cmake
DESTINATION .
)
configure_package_config_file( configure_package_config_file(
verilator-config-version.cmake.in verilator-config-version.cmake.in

2
Makefile.in
View File

@ -528,6 +528,8 @@ GERSEMI_FLAGS = -i
format-cmake: format-cmake:
$(GERSEMI) $(GERSEMI_FLAGS) $(CMAKE_FILES) $(GERSEMI) $(GERSEMI_FLAGS) $(CMAKE_FILES)
format-yaml: yamlfix
PYLINT = pylint PYLINT = pylint
PYLINT_FLAGS = --recursive=n --score=n --disable=R0801 PYLINT_FLAGS = --recursive=n --score=n --disable=R0801
PYLINT_TEST_FLAGS = $(PYLINT_FLAGS) --disable=C0103,C0114,C0116,C0209,C0411,C0413,C0301,R0801,R0912,R0915,R0916,R1702,W0511,W0621 PYLINT_TEST_FLAGS = $(PYLINT_FLAGS) --disable=C0103,C0114,C0116,C0209,C0411,C0413,C0301,R0801,R0912,R0915,R0916,R1702,W0511,W0621

20
verilator-config.cmake.in
View File

@ -165,7 +165,7 @@ define_property(
function(json_get_string RET JSON SECTION VARIABLE) function(json_get_string RET JSON SECTION VARIABLE)
string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" ${SECTION} ${VARIABLE}) string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" ${SECTION} ${VARIABLE})
if (NOT ${STATUS} STREQUAL "NOTFOUND") if(NOT ${STATUS} STREQUAL "NOTFOUND")
set(JV "") set(JV "")
endif() endif()
set(${RET} ${JV} PARENT_SCOPE) set(${RET} ${JV} PARENT_SCOPE)
@ -188,7 +188,7 @@ endfunction()
function(json_get_submodules SUBMODULES NSUBMODULES JSON) function(json_get_submodules SUBMODULES NSUBMODULES JSON)
string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" submodules) string(JSON JV ERROR_VARIABLE STATUS GET "${JSON}" submodules)
if (NOT ${STATUS} STREQUAL "NOTFOUND") if(NOT ${STATUS} STREQUAL "NOTFOUND")
set(${SUBMODULES} "" PARENT_SCOPE) set(${SUBMODULES} "" PARENT_SCOPE)
set(${NSUBMODULES} 0 PARENT_SCOPE) set(${NSUBMODULES} 0 PARENT_SCOPE)
return() return()
@ -205,7 +205,7 @@ endfunction()
function(json_get_list RET JSON SECTION VARIABLE) function(json_get_list RET JSON SECTION VARIABLE)
string(JSON L ERROR_VARIABLE STATUS LENGTH "${JSON}" ${SECTION} ${VARIABLE}) string(JSON L ERROR_VARIABLE STATUS LENGTH "${JSON}" ${SECTION} ${VARIABLE})
if (NOT ${STATUS} STREQUAL "NOTFOUND" OR NOT ${L}) if(NOT ${STATUS} STREQUAL "NOTFOUND" OR NOT ${L})
set(${RET} "" PARENT_SCOPE) set(${RET} "" PARENT_SCOPE)
return() return()
endif() endif()
@ -233,8 +233,8 @@ function(verilate TARGET)
${ARGN} ${ARGN}
) )
if (VERILATE_TRACE) if(VERILATE_TRACE)
if (NOT VERILATE_TRACE_VCD) if(NOT VERILATE_TRACE_VCD)
set(VERILATE_TRACE_VCD TRUE) set(VERILATE_TRACE_VCD TRUE)
endif() endif()
message(DEPRECATION "The `TRACE` argument is deprecated. Please use `TRACE_VCD` instead.") message(DEPRECATION "The `TRACE` argument is deprecated. Please use `TRACE_VCD` instead.")
@ -495,7 +495,7 @@ function(verilate TARGET)
json_get_submodules(JSUBMODULES JNSUBMODULES "${MANIFEST}") json_get_submodules(JSUBMODULES JNSUBMODULES "${MANIFEST}")
if (JNSUBMODULES) if(JNSUBMODULES)
file(APPEND ${VDIR}/${VERILATE_PREFIX}.cmake file(APPEND ${VDIR}/${VERILATE_PREFIX}.cmake
"# Verilate hierarchical blocks\n" "# Verilate hierarchical blocks\n"
"get_target_property(TOP_TARGET_NAME \"\${TARGET}\" NAME)\n" "get_target_property(TOP_TARGET_NAME \"\${TARGET}\" NAME)\n"
@ -513,13 +513,13 @@ function(verilate TARGET)
set(SUBMODULE_CMAKE "") set(SUBMODULE_CMAKE "")
set(SUBMODULE_VERILATE_ARGS "") set(SUBMODULE_VERILATE_ARGS "")
if (NOT ${I} STREQUAL ${JNSUBMODULES}) if(NOT ${I} STREQUAL ${JNSUBMODULES})
string(APPEND SUBMODULE_CMAKE string(APPEND SUBMODULE_CMAKE
"add_library(${JSUBMODULE_PREFIX} STATIC)\n" "add_library(${JSUBMODULE_PREFIX} STATIC)\n"
"target_link_libraries(\${TOP_TARGET_NAME} PRIVATE ${JSUBMODULE_PREFIX})\n" "target_link_libraries(\${TOP_TARGET_NAME} PRIVATE ${JSUBMODULE_PREFIX})\n"
) )
if (JSUBMODULE_DEPS) if(JSUBMODULE_DEPS)
string(APPEND SUBMODULE_CMAKE "target_link_libraries(${JSUBMODULE_PREFIX} INTERFACE ${JSUBMODULE_DEPS})\n") string(APPEND SUBMODULE_CMAKE "target_link_libraries(${JSUBMODULE_PREFIX} INTERFACE ${JSUBMODULE_DEPS})\n")
endif() endif()
@ -529,11 +529,11 @@ function(verilate TARGET)
string(APPEND SUBMODULE_VERILATE_ARGS "\${TOP_TARGET_NAME} PREFIX ${JSUBMODULE_PREFIX} TOP_MODULE ${JSUBMODULE_TOP} DIRECTORY ${JSUBMODULE_DIRECTORY} SOURCES ${JSUBMODULE_SOURCES}") string(APPEND SUBMODULE_VERILATE_ARGS "\${TOP_TARGET_NAME} PREFIX ${JSUBMODULE_PREFIX} TOP_MODULE ${JSUBMODULE_TOP} DIRECTORY ${JSUBMODULE_DIRECTORY} SOURCES ${JSUBMODULE_SOURCES}")
endif() endif()
if (JSUBMODILE_VERILATOR_ARGS) if(JSUBMODILE_VERILATOR_ARGS)
string(APPEND SUBMODULE_VERILATE_ARGS " VERILATOR_ARGS -f ${JSUBMODILE_VERILATOR_ARGS}") string(APPEND SUBMODULE_VERILATE_ARGS " VERILATOR_ARGS -f ${JSUBMODILE_VERILATOR_ARGS}")
endif() endif()
if (JSUBMODULE_CFLAGS) if(JSUBMODULE_CFLAGS)
string(APPEND SUBMODULE_VERILATE_ARGS " -CFLAGS ${JSUBMODULE_CFLAGS}") string(APPEND SUBMODULE_VERILATE_ARGS " -CFLAGS ${JSUBMODULE_CFLAGS}")
endif() endif()