Skip to content

Commit ff0795c

Browse files
committed
Cleaned up compilation handling for yosys-slang when parmys is turned off
1 parent 7f6749c commit ff0795c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: Build
9898
env:
99-
CMAKE_PARAMS: "-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DSLANG_SYSTEMVERILOG=OFF -DWITH_ODIN=on"
99+
CMAKE_PARAMS: "-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on"
100100
BUILD_TYPE: release
101101
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
102102
run: |
@@ -456,7 +456,7 @@ jobs:
456456
include: [
457457
{
458458
name: 'Basic',
459-
params: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DSLANG_SYSTEMVERILOG=OFF -DWITH_ODIN=on',
459+
params: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
460460
suite: 'vtr_reg_basic_odin'
461461
}
462462
#- { name: 'Strong', suite: 'vtr_reg_strong' } # SKIP Too long to run on GitHub Actions (max 6h)

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,12 @@ if(${WITH_ODIN})
437437
endif()
438438
endif()
439439

440-
# handle cmake params to compile Yosys SystemVerilog/UHDM plugins
440+
# handle cmake params to compile yosys-slang plugin for Yosys
441441
if(${SLANG_SYSTEMVERILOG})
442-
# avoid compiling plugins in case the Parmys frontend is not active
442+
# avoid compiling yosys-slang plugin in case the Parmys frontend is not active
443443
if(NOT ${WITH_PARMYS})
444-
message(SEND_ERROR "Utilizing SystemVerilog/UHDM plugins requires activating Parmys frontend. Please set WITH_PARMYS.")
444+
message(WARNING "Parmys is not enabled, disabling Yosys-Slang as well.")
445+
set(SLANG_SYSTEMVERILOG OFF)
445446
endif()
446447
endif()
447448

0 commit comments

Comments
 (0)