Skip to content

Commit 9533d75

Browse files
committed
fix build after OpenFPGA merge
1 parent d0485ca commit 9533d75

File tree

3 files changed

+106
-97
lines changed

3 files changed

+106
-97
lines changed

CMakeLists.txt

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,24 @@ FILE(COPY ${EBLIF_TRANSFORM_SRC_H}
131131
${EBLIF_TRANSFORM_DEST})
132132

133133
# patch VPR
134-
FILE(COPY ${PACKER_SRC_DIR}/cluster.cpp
135-
${PACKER_SRC_DIR}/cluster_util.cpp
136-
${PACKER_SRC_DIR}/cluster_util.h
137-
${PACKER_SRC_DIR}/output_clustering.cpp
138-
${PACKER_SRC_DIR}/output_clustering.h
139-
${PACKER_SRC_DIR}/cluster_router.cpp
140-
${PACKER_SRC_DIR}/post_routing_pb_pin_fixup.cpp
141-
DESTINATION
142-
${VPR_DEST_DIR}/src/pack)
134+
#FILE(COPY ${PACKER_SRC_DIR}/cluster.cpp
135+
# ${PACKER_SRC_DIR}/cluster_util.cpp
136+
# ${PACKER_SRC_DIR}/cluster_util.h
137+
# ${PACKER_SRC_DIR}/output_clustering.cpp
138+
# ${PACKER_SRC_DIR}/output_clustering.h
139+
# ${PACKER_SRC_DIR}/cluster_router.cpp
140+
# ${PACKER_SRC_DIR}/post_routing_pb_pin_fixup.cpp
141+
# DESTINATION
142+
# ${VPR_DEST_DIR}/src/pack)
143143

144144
# add to VPR/pack
145-
FILE(COPY ${PACKER_SRC_DIR}/nl_Par.h
146-
${PACKER_SRC_DIR}/nl_Par.cpp
147-
${PACKER_SRC_DIR}/pinc_log.h
148-
${PACKER_SRC_DIR}/pinc_log.cpp
149-
DESTINATION
150-
${VPR_DEST_DIR}/src/pack)
151-
message(STATUS "NOTE: ADDED to VPR src/pack: nl_Par.cpp,h pinc_log.cpp,h")
145+
#FILE(COPY ${PACKER_SRC_DIR}/nl_Par.h
146+
# ${PACKER_SRC_DIR}/nl_Par.cpp
147+
# ${PACKER_SRC_DIR}/pinc_log.h
148+
# ${PACKER_SRC_DIR}/pinc_log.cpp
149+
# DESTINATION
150+
# ${VPR_DEST_DIR}/src/pack)
151+
#message(STATUS "NOTE: ADDED to VPR src/pack: nl_Par.cpp,h pinc_log.cpp,h")
152152

153153
# add to VPR/base
154154
file(COPY
@@ -169,20 +169,20 @@ message(STATUS "NOTE: OVERWRITING netlist_writer.cpp")
169169
file(COPY ${PATCH_DIR}/base_fix/PATCHED/netlist_writer.cpp DESTINATION ${TARGET_DIR})
170170
message(STATUS "NOTE: COPIED ${PATCH_DIR}/base_fix/PATCHED/netlist_writer.cpp\n to ${TARGET_DIR}/\n")
171171

172-
message(STATUS "NOTE: PATCHING base/vpr_api.cpp ..")
173-
set(DIFF_FILE ${PATCH_DIR}/base_fix/DIFF/vpr_api_cpp.diff)
174-
apply_patch(${DIFF_FILE} ${TARGET_DIR} "base/vpr_api.cpp")
172+
#message(STATUS "NOTE: PATCHING base/vpr_api.cpp ..")
173+
#set(DIFF_FILE ${PATCH_DIR}/base_fix/DIFF/vpr_api_cpp.diff)
174+
#apply_patch(${DIFF_FILE} ${TARGET_DIR} "base/vpr_api.cpp")
175175

176176
message(STATUS "NOTE: OVERWRITING base/read_.*")
177177
file(COPY
178178
${PATCH_DIR}/base_fix/PATCHED/read_blif.cpp
179179
${PATCH_DIR}/base_fix/PATCHED/read_circuit.cpp
180180
${PATCH_DIR}/base_fix/PATCHED/read_circuit.h
181-
${PATCH_DIR}/base_fix/PATCHED/vpr_types.h
182-
${PATCH_DIR}/base_fix/PATCHED/vpr_context.h
181+
#${PATCH_DIR}/base_fix/PATCHED/vpr_types.h
182+
#${PATCH_DIR}/base_fix/PATCHED/vpr_context.h
183183
${PATCH_DIR}/base_fix/PATCHED/read_options.cpp
184184
${PATCH_DIR}/base_fix/PATCHED/read_options.h
185-
${PATCH_DIR}/base_fix/PATCHED/SetupVPR.cpp
185+
#${PATCH_DIR}/base_fix/PATCHED/SetupVPR.cpp
186186
DESTINATION ${TARGET_DIR})
187187
message(STATUS "NOTE: COPIED ${PATCH_DIR}/base_fix/PATCHED/read_.*\n to ${TARGET_DIR}/\n")
188188

@@ -268,26 +268,26 @@ file(COPY ${ENCRYPTION_CONFIG_PATH}/config.txt
268268
# ${LIB_RRG_DEST_DIR}/src/io)
269269

270270
# Logical Levels
271-
message(STATUS "NOTE: PATCHING TimingReporter")
272-
FILE(COPY ${TATUM_SRC_DIR}/TimingReporter.hpp
273-
${TATUM_SRC_DIR}/TimingReporter.cpp
274-
DESTINATION
275-
${OPENFPGA_DEST_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/libtatum/libtatum/tatum
276-
)
271+
#message(STATUS "NOTE: PATCHING TimingReporter")
272+
#FILE(COPY ${TATUM_SRC_DIR}/TimingReporter.hpp
273+
# ${TATUM_SRC_DIR}/TimingReporter.cpp
274+
# DESTINATION
275+
# ${OPENFPGA_DEST_DIR}/vtr-verilog-to-routing/libs/EXTERNAL/libtatum/libtatum/tatum
276+
#)
277277

278278
## Logical Levels
279-
FILE(COPY ${UTIL_SRC_DIR}/rsbe_utils.cpp
280-
${UTIL_SRC_DIR}/rsbe_utils.h
281-
DESTINATION
282-
${VPR_DEST_DIR}/src/util/
283-
)
284-
message(STATUS "NOTE: ADDED to VPR src/util: rsbe_utils.cpp,h")
279+
#FILE(COPY ${UTIL_SRC_DIR}/rsbe_utils.cpp
280+
# ${UTIL_SRC_DIR}/rsbe_utils.h
281+
# DESTINATION
282+
# ${VPR_DEST_DIR}/src/util/
283+
#)
284+
#message(STATUS "NOTE: ADDED to VPR src/util: rsbe_utils.cpp,h")
285285

286286
# Logical Levels
287-
FILE(COPY ${ANALYSIS_SRC_DIR}/timing_reports.cpp
288-
DESTINATION
289-
${VPR_DEST_DIR}/src/analysis
290-
)
287+
#FILE(COPY ${ANALYSIS_SRC_DIR}/timing_reports.cpp
288+
# DESTINATION
289+
# ${VPR_DEST_DIR}/src/analysis
290+
#)
291291

292292
message(STATUS "NOTE: DONE PATCHING\n")
293293

0 commit comments

Comments
 (0)