Skip to content

Commit f669015

Browse files
vaughnbetzvaughnbetz
authored
Merge pull request #2232 from CAS-Atlantic/remove-yosys+odin
Remove yosys+odin
2 parents 09e65c7 + 9157235 commit f669015

File tree

325 files changed

+844
-73378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+844
-73378
lines changed

‎.github/scripts/run-vtr.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export VTR_DIR=$(pwd)
99
source $SCRIPT_DIR/hostsetup.sh
1010

1111
if ! { [ $VTR_TEST == "vtr_reg_strong" ] || [ $VTR_TEST == "odin_reg_strong" ] \
12-
|| [ $VTR_TEST == "odin_tech_strong" ] || [ $VTR_TEST == "vtr_reg_yosys_odin" ] \
13-
|| [ $VTR_TEST == "vtr_reg_yosys" ] || [ $VTR_TEST == "vtr_reg_yosys_parmys" ]; }; then
12+
|| [ $VTR_TEST == "vtr_reg_yosys" ] \
13+
|| [ $VTR_TEST == "vtr_reg_yosys_parmys" ]; }; then
1414
source $SCRIPT_DIR/vtr-full-setup.sh
1515
fi
1616

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@ jobs:
3131
- {test: "vtr_reg_nightly_test3", cores: "16", options: "", cmake: "", extra_pkgs: ""}
3232
- {test: "vtr_reg_nightly_test4", cores: "16", options: "", cmake: "", extra_pkgs: ""}
3333
- {test: "vtr_reg_nightly_test5", cores: "16", options: "", cmake: "", extra_pkgs: ""}
34-
- {test: "vtr_reg_nightly_test6", cores: "16", options: "", cmake: "-DODIN_USE_YOSYS=ON", extra_pkgs: ""}
3534
- {test: "vtr_reg_nightly_test7", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_PARMYS_PLUGIN=ON", extra_pkgs: ""}
3635
- {test: "vtr_reg_nightly_test8", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_PARMYS_PLUGIN=ON", extra_pkgs: "" }
3736
- {test: "vtr_reg_strong", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3", extra_pkgs: "libeigen3-dev"}
3837
- {test: "vtr_reg_strong", cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON", extra_pkgs: "libeigen3-dev"}
3938
- {test: "vtr_reg_yosys", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_SV_UHDM_PLUGIN=ON", extra_pkgs: ""}
4039
- {test: "vtr_reg_yosys_parmys", cores: "16", options: "", cmake: "-DWITH_YOSYS=ON -DYOSYS_PARMYS_PLUGIN=ON -DYOSYS_SV_UHDM_PLUGIN=ON", extra_pkgs: ""}
41-
- {test: "vtr_reg_yosys_odin", cores: "16", options: "", cmake: "-DODIN_USE_YOSYS=ON -DYOSYS_SV_UHDM_PLUGIN=ON", extra_pkgs: ""}
42-
- {test: "odin_tech_strong", cores: "16", options: "", cmake: "-DODIN_USE_YOSYS=ON", extra_pkgs: ""}
4340
- {test: "odin_reg_strong", cores: "16", options: "", cmake: "", extra_pkgs: ""}
4441

4542
env:
@@ -171,17 +168,17 @@ jobs:
171168
include: [
172169
{
173170
name: 'Basic',
174-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DODIN_USE_YOSYS=ON',
171+
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
175172
suite: 'vtr_reg_basic'
176173
},
177174
{
178175
name: 'Basic with NO_GRAPHICS',
179-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off -DODIN_USE_YOSYS=ON',
176+
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
180177
suite: 'vtr_reg_basic'
181178
},
182179
{
183180
name: 'Basic with VTR_ENABLE_DEBUG_LOGGING',
184-
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DODIN_USE_YOSYS=ON',
181+
params: '-DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
185182
suite: 'vtr_reg_basic'
186183
},
187184
{
@@ -254,7 +251,7 @@ jobs:
254251

255252
- name: Test
256253
env:
257-
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DODIN_USE_YOSYS=ON'
254+
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on'
258255
BUILD_TYPE: debug
259256
LSAN_OPTIONS: 'exitcode=42' #Use a non-standard exit code to ensure LSAN errors are detected
260257
run: |
@@ -308,39 +305,6 @@ jobs:
308305
./.github/scripts/build.sh
309306
./utils/vqm2blif/test/scripts/test_vqm2blif.sh
310307
311-
312-
YOSYSODINII:
313-
runs-on: ubuntu-18.04
314-
strategy:
315-
fail-fast: false
316-
matrix:
317-
include: [
318-
{
319-
name: 'Yosys+ODIN-II Basic',
320-
suite: 'odin_tech_basic'
321-
}
322-
]
323-
name: '${{ matrix.name }}'
324-
steps:
325-
326-
- uses: actions/setup-python@v2
327-
with:
328-
python-version: 3.6
329-
- uses: actions/checkout@v2
330-
- run: ./.github/scripts/install_dependencies.sh
331-
332-
- uses: hendrikmuhs/ccache-action@v1
333-
334-
- name: Test
335-
env:
336-
CMAKE_PARAMS: '-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=on -DVTR_IPO_BUILD=off -DWITH_BLIFEXPLORER=on -DODIN_USE_YOSYS=ON'
337-
BUILD_TYPE: debug
338-
run: |
339-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
340-
./.github/scripts/build.sh
341-
./run_reg_test.py ${{ matrix.suite }} -show_failures -j2
342-
343-
344308
Compatibility:
345309
runs-on: ubuntu-18.04
346310
strategy:
@@ -387,7 +351,6 @@ jobs:
387351
- Sanitized
388352
- ODINII
389353
- VQM2BLIF
390-
- YOSYSODINII
391354
- Compatibility
392355
runs-on: ubuntu-18.04
393356
steps:

‎CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ option(ODIN_SANITIZE "Enable building odin with sanitize flags" OFF)
5555

5656
# Allow the user to enable building Yosys
5757
option(WITH_YOSYS "Enable building Yosys" OFF)
58-
option(ODIN_USE_YOSYS "Enable building Yosys" OFF)
5958
option(YOSYS_SV_UHDM_PLUGIN "Enable building and installing Yosys SystemVerilog and UHDM plugins" OFF)
6059
option(YOSYS_PARMYS_PLUGIN "Enable building and installing Parmys (Partial Mapper for Yosys) plugin" OFF)
6160

@@ -412,8 +411,8 @@ endif()
412411
# handle cmake params to compile Yosys SystemVerilog/UHDM plugins
413412
if(${YOSYS_SV_UHDM_PLUGIN})
414413
# avoid compiling plugins in case the Yosys frontend is not active
415-
if(NOT ${WITH_YOSYS} AND NOT ${ODIN_USE_YOSYS})
416-
message(SEND_ERROR "Utilizing SystemVerilog/UHDM plugins requires activating Yosys frontend. Please set either WITH_YOSYS or ODIN_USE_YOSYS on.")
414+
if(NOT ${WITH_YOSYS})
415+
message(SEND_ERROR "Utilizing SystemVerilog/UHDM plugins requires activating Yosys frontend. Please set WITH_YOSYS.")
417416
endif()
418417
endif()
419418

‎ODIN_II/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
regression_test/run*
2-
regression_test/benchmark/_BLIF
2+
regression_test/benchmark/BLIF
33
regression_test/latest
44

5-
/yosys
65
/temp
76
/*.v
87
/*.blif

‎ODIN_II/CMakeLists.txt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ if(FLEX_BISON_WARN_SUPPRESS_FLAGS)
132132
PROPERTIES COMPILE_FLAGS ${FLEX_BISON_WARN_SUPPRESS_FLAGS})
133133
endif()
134134

135-
# define cmake params to compile Yosys if the Odin-II makefile is called
136-
if(${ODIN_USE_YOSYS})
137-
add_definitions("-DODIN_USE_YOSYS=ON")
138-
add_definitions("-D_YOSYS_")
139-
if(${YOSYS_SV_UHDM_PLUGIN})
140-
add_definitions("-DYOSYS_SV_UHDM_PLUGIN=ON")
141-
endif()
142-
endif()
143-
144135
add_definitions(-DUSING_BISON -DYYERROR_VERBOSE)
145136
include_directories(${LIB_INCLUDE_DIRS} ${PARSER_INCLUDE_DIRS})
146137

@@ -152,14 +143,6 @@ add_library(libodin_ii STATIC
152143
${FLEX_VerilogLexer_OUTPUTS}
153144
${BISON_VerilogParser_OUTPUT_SOURCE})
154145

155-
# link libyosys to the Odin-II library
156-
if(${ODIN_USE_YOSYS})
157-
add_dependencies(libodin_ii libyosys)
158-
target_link_directories(libodin_ii PUBLIC ${VTR_SOURCE_DIR}/build/libs/EXTERNAL/libyosys)
159-
target_include_directories(libodin_ii PUBLIC ${VTR_SOURCE_DIR}/Yosys/share/yosys/include)
160-
target_link_libraries(libodin_ii yosys)
161-
endif()
162-
163146
target_include_directories(libodin_ii PUBLIC ${LIB_INCLUDE_DIRS})
164147
set_target_properties(libodin_ii PROPERTIES PREFIX "") #Avoid extra 'lib' prefix
165148

‎ODIN_II/Makefile‎

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
ODIN_ROOT=$(PWD)
22
NB_OF_PROCESS ?= $(shell /usr/bin/env python3 -c "import multiprocessing; print(multiprocessing.cpu_count())")
33

4-
# handling elaborator name
5-
ifdef ELABORATOR
6-
_ELABORATOR=$(shell echo $(ELABORATOR) | tr '[:lower:]' '[:upper:]')
7-
else
8-
_ELABORATOR=ODIN
9-
endif
10-
11-
# Yosys+Odin-II compile flags
12-
ifeq ($(_ELABORATOR), YOSYS)
13-
_YOSYS_COMPILE_FLAG="-DODIN_USE_YOSYS=ON"
14-
endif
15-
164
################
175
# build with ninja when doable
186
################
@@ -69,27 +57,27 @@ $(ODIN_BUILD_DIR)/.%.build: _init
6957

7058
_set_build: $(ODIN_BUILD_DIR)/.regular.build
7159
cd $(BUILD_DIR) &&\
72-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) ..
60+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) ..
7361

7462
_set_debug: $(ODIN_BUILD_DIR)/.debug.build
7563
cd $(BUILD_DIR) &&\
76-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) -DODIN_DEBUG=on ..
64+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_DEBUG=on ..
7765

7866
_set_warn: $(ODIN_BUILD_DIR)/.warn.build
7967
cd $(BUILD_DIR) &&\
80-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) -DODIN_WARN=on ..
68+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_WARN=on ..
8169

8270
_set_gcov: $(ODIN_BUILD_DIR)/.gcov.build
8371
cd $(BUILD_DIR) &&\
84-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) -DODIN_COVERAGE=on ..
72+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_COVERAGE=on ..
8573

8674
_set_clang_tidy: $(ODIN_BUILD_DIR)/.tidy.build
8775
cd $(BUILD_DIR) &&\
88-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) -DODIN_TIDY=on ..
76+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_TIDY=on ..
8977

9078
_set_sanitize: $(ODIN_BUILD_DIR)/.sanitize.build
9179
cd $(BUILD_DIR) &&\
92-
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) $(_YOSYS_COMPILE_FLAG) -DODIN_SANITIZE=on ..
80+
cmake $(CMAKE_GEN_ARGS) $(CMAKE_ARGS) -DODIN_SANITIZE=on ..
9381

9482
BUILD_IT_TARGETS = build debug warn gcov clang_tidy sanitize
9583
$(foreach t,$(BUILD_IT_TARGETS), $(eval $(call _build_it_gen,$(t))))
@@ -113,7 +101,6 @@ test_coverage:
113101
$(MAKE) gcovr
114102

115103
test:
116-
ifeq ($(_ELABORATOR), ODIN)
117104
$(MAKE) sanitize \
118105
&& ./verify_odin.sh --no_report -j $(NB_OF_PROCESS) \
119106
-t regression_test/benchmark/suite/light_suite \
@@ -122,18 +109,8 @@ ifeq ($(_ELABORATOR), ODIN)
122109
&& ./verify_odin.sh --no_report --continue -j $(NB_OF_PROCESS) \
123110
-t regression_test/benchmark/suite/heavy_suite; \
124111
./verify_odin.sh --status_only
125-
else ifeq ($(_ELABORATOR), YOSYS)
126-
$(MAKE) sanitize ELABORATOR=YOSYS \
127-
&& ./verify_odin.sh --no_report -j $(NB_OF_PROCESS) \
128-
-t regression_test/benchmark/suite/yosys+odin/techmap_lightsuite; \
129-
$(MAKE) build ELABORATOR=YOSYS \
130-
&& ./verify_odin.sh --no_report --continue -j $(NB_OF_PROCESS) \
131-
-t regression_test/benchmark/suite/yosys+odin/techmap_heavysuite; \
132-
./verify_odin.sh --status_only
133-
endif
134112

135113
generate_expectation:
136-
ifeq ($(_ELABORATOR), ODIN)
137114
$(MAKE) sanitize \
138115
&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
139116
-t regression_test/benchmark/suite/light_suite \
@@ -142,32 +119,13 @@ ifeq ($(_ELABORATOR), ODIN)
142119
&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
143120
-t regression_test/benchmark/suite/heavy_suite; \
144121
./verify_odin.sh --status_only
145-
else ifeq ($(_ELABORATOR), YOSYS)
146-
$(MAKE) sanitize ELABORATOR=YOSYS \
147-
&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
148-
-t regression_test/benchmark/suite/yosys+odin/techmap_lightsuite; \
149-
$(MAKE) build ELABORATOR=YOSYS \
150-
&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
151-
-t regression_test/benchmark/suite/yosys+odin/techmap_heavysuite; \
152-
./verify_odin.sh --status_only
153-
endif
154122

155123
regenerate_expectation:
156-
ifeq ($(_ELABORATOR), ODIN)
157124
$(MAKE) sanitize \
158125
&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
159126
-t regression_test/benchmark/suite/light_suite \
160127
-t regression_test/benchmark/suite/vtr_light_suite; \
161128
$(MAKE) build \
162129
&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
163130
-t regression_test/benchmark/suite/heavy_suite; \
164-
./verify_odin.sh --status_only
165-
else ifeq ($(_ELABORATOR), YOSYS)
166-
$(MAKE) sanitize ELABORATOR=YOSYS \
167-
&& ./verify_odin.sh --$@ --no_report -j $(NB_OF_PROCESS) \
168-
-t regression_test/benchmark/suite/yosys+odin/techmap_lightsuite; \
169-
$(MAKE) build ELABORATOR=YOSYS \
170-
&& ./verify_odin.sh --$@ --no_report --continue -j $(NB_OF_PROCESS) \
171-
-t regression_test/benchmark/suite/yosys+odin/techmap_heavysuite; \
172-
./verify_odin.sh --status_only
173-
endif
131+
./verify_odin.sh --status_only

0 commit comments

Comments
 (0)