Skip to content

Commit 1f19ac5

Browse files
[CI] Removed Redundant Warning Test
Prior to the updates to the CI to make all regression tests warning clean, there was another warning test which was not as comprehensive as the tests we have now. Since this test was superceded, removed it from the CI. The CMAKE param that enabled it was also used and replaced with a more comprehensive CMAKE option.
1 parent eb58578 commit 1f19ac5

File tree

5 files changed

+1
-70
lines changed

5 files changed

+1
-70
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -125,38 +125,6 @@ jobs:
125125
run: ./.github/scripts/unittest.sh
126126

127127

128-
Warnings:
129-
name: 'W: Check Compilation Warnings'
130-
runs-on: ubuntu-24.04
131-
steps:
132-
133-
- uses: actions/setup-python@v5
134-
with:
135-
python-version: 3.12.3
136-
- uses: actions/checkout@v4
137-
with:
138-
submodules: 'true'
139-
140-
- name: Get number of CPU cores
141-
uses: SimenB/github-actions-cpu-cores@v2
142-
id: cpu-cores
143-
144-
- name: Install dependencies
145-
run: ./.github/scripts/install_dependencies.sh
146-
147-
- uses: hendrikmuhs/[email protected]
148-
149-
- name: Test
150-
env:
151-
#In order to get compilation warnings produced per source file, we must do a non-IPO build
152-
#We also turn warnings into errors for this target by doing a strict compile
153-
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_STRICT_COMPILE=on -DVTR_IPO_BUILD=off"
154-
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
155-
run: |
156-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
157-
./.github/scripts/build.sh
158-
159-
160128
Regression:
161129
runs-on: ubuntu-24.04
162130
strategy:
@@ -517,7 +485,6 @@ jobs:
517485
- Build
518486
- Format
519487
- UniTests
520-
- Warnings
521488
- Regression
522489
- Sanitized
523490
- Parmys

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set_property(CACHE VTR_IPO_BUILD PROPERTY STRINGS auto on off)
2626
set(VTR_ASSERT_LEVEL "2" CACHE STRING "VTR assertion checking level. 0: no assertions, 1: fast assertions, 2: regular assertions, 3: additional assertions with noticeable run-time overhead, 4: all assertions (including those with significant run-time cost)")
2727
set_property(CACHE VTR_ASSERT_LEVEL PROPERTY STRINGS 0 1 2 3 4)
2828

29-
option(VTR_ENABLE_STRICT_COMPILE "Specifies whether compiler warnings should be treated as errors (e.g. -Werror)" OFF)
3029
option(VTR_ENABLE_SANITIZE "Enable address/leak/undefined-behaviour sanitizers (i.e. run-time error checking)" OFF)
3130
option(VTR_ENABLE_PROFILING "Enable performance profiler (gprof)" OFF)
3231
option(VTR_ENABLE_COVERAGE "Enable code coverage tracking (gcov)" OFF)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ override CMAKE_PARAMS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -G 'Unix Makefil
4040
#Are we doing a strict (i.e. warnings as errors) build?
4141
ifneq (,$(findstring strict,$(BUILD_TYPE)))
4242
#Configure for strict build with VPR warning treated as errors
43-
override CMAKE_PARAMS := -DVTR_ENABLE_STRICT_COMPILE=on ${CMAKE_PARAMS}
43+
override CMAKE_PARAMS := -DCMAKE_COMPILE_WARNING_AS_ERROR=on ${CMAKE_PARAMS}
4444
endif #Strict build type
4545

4646
#Enable verbosity

odin_ii/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -190,22 +190,5 @@ if (ODIN_USES_IPO)
190190
set_property(TARGET odin_ii APPEND PROPERTY LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
191191
endif()
192192

193-
#add strict odin compiler flags, if set
194-
if(VTR_ENABLE_STRICT_COMPILE)
195-
message(STATUS "odin_ii: building with strict flags")
196-
197-
set(ODIN_STRICT_COMPILE_FLAGS_TO_CHECK
198-
#GCC-like
199-
"-Werror"
200-
)
201-
202-
foreach(flag ${ODIN_STRICT_COMPILE_FLAGS_TO_CHECK})
203-
message(STATUS "\tAdding CXX flag: ${flag}")
204-
target_compile_options(libodin_ii PRIVATE ${flag})
205-
target_compile_options(odin_ii PRIVATE ${flag})
206-
target_link_libraries(odin_ii ${flag})
207-
endforeach()
208-
endif()
209-
210193
install(TARGETS odin_ii libodin_ii DESTINATION bin)
211194
install(FILES ${LIB_HEADERS} DESTINATION include/libodin_ii)

vpr/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -227,24 +227,6 @@ else()
227227
message(ERROR "Unsupported VPR_PGO_CONFIG '${VPR_PGO_CONFIG}'")
228228
endif()
229229

230-
if (VTR_ENABLE_STRICT_COMPILE)
231-
message(STATUS "VPR: building with strict flags")
232-
233-
set(VPR_STRICT_COMPILE_FLAGS_TO_CHECK
234-
#GCC-like
235-
"-Werror"
236-
# due to the pointer hackery in timing_driven_route_structs and BinaryHeap.heap_
237-
"-Wno-error=free-nonheap-object"
238-
)
239-
240-
foreach(flag ${VPR_STRICT_COMPILE_FLAGS_TO_CHECK})
241-
message(STATUS "\tAdding CXX flag: ${flag}")
242-
target_compile_options(libvpr PRIVATE ${flag})
243-
target_compile_options(vpr PRIVATE ${flag})
244-
target_link_libraries(vpr ${flag})
245-
endforeach()
246-
endif()
247-
248230
#
249231
# Execution Engine Configuration
250232
#

0 commit comments

Comments
 (0)