fixup! WIP: [#64890] Add VCS support and unify usage of simulators

antmicro · Sep 10, 2024 · a743f7e · a743f7e
1 parent f93d2a3
commit a743f7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/cmake/build-cosimulation.cmake b/cmake/build-cosimulation.cmake
@@ -127,8 +127,15 @@ foreach(SIM_FILE ${ALL_SIM_FILES})
   list(APPEND FINAL_SIM_FILES ${SIM_FILE})
 endforeach()
 
+set(ALL_INCLUDE_DIRS ${RENODE_HDL_INCLUDE_DIRS})
+list(APPEND ALL_INCLUDE_DIRS ${SIM_INCLUDE_DIRS})
+foreach(DIR ${ALL_INCLUDE_DIRS})
+  get_filename_component(DIR ${DIR} ABSOLUTE BASE_DIR)
+  list(APPEND FINAL_INCLUDE_DIRS ${DIR})
+endforeach()
+
 set(FINAL_GENERIC_ARGUMENTS "+libext+.sv")
-foreach(INCDIR ${RENODE_HDL_INCLUDE_DIRS})
+foreach(INCDIR ${FINAL_INCLUDE_DIRS})
   list(APPEND FINAL_GENERIC_ARGUMENTS "+incdir+${INCDIR}")
 endforeach()
 foreach(HDL_DIR ${RENODE_HDL_DIRECTORIES})

diff --git a/robot/dpi-keywords.robot b/robot/dpi-keywords.robot
@@ -3,7 +3,7 @@ ${BUILD_DIRECTORY}                  ./build
 
 ${VERILATOR_SIMULATION}             ${BUILD_DIRECTORY}/verilated
 
-${VCS_SIMULATION}                   ./simv
+${VCS_SIMULATION}                   ${BUILD_DIRECTORY}/simv
 @{VCS_ARGUMENTS}                    -sv_lib  ${BUILD_DIRECTORY}/librenode_dpi
 
 ${QUESTA_SIMULATION}                vsim

diff --git a/samples/ahb_dma/CMakeLists.txt b/samples/ahb_dma/CMakeLists.txt
@@ -7,6 +7,7 @@ project(ahb_dma)
 set(SIM_TOP sim)
 set(SIM_TOP_FILE sim.sv)
 set(SIM_FILES dma_ahb_simple.v)
+set(SIM_INCLUDE_DIRS ./)
 
 # Verilator variables
 set(VERILATOR_CSOURCES ../../cpp/sim_main_dpi.cpp)