From 6118d3164f7d797f9c9a3c0f8e6090ee4f1ebf7c Mon Sep 17 00:00:00 2001 From: Jan Olencki Date: Tue, 10 Sep 2024 12:00:28 +0200 Subject: [PATCH] fixup! WIP: [#64890] Add VCS support and unify usage of simulators --- samples/ahb_dma/CMakeLists.txt | 4 ---- samples/ahb_mem/CMakeLists.txt | 4 ---- samples/apb3_completer_mem/CMakeLists.txt | 4 ---- samples/apb3_requester_synth/CMakeLists.txt | 4 ---- samples/apb3_standalone/CMakeLists.txt | 4 ---- samples/axi_fastvdma/CMakeLists.txt | 3 +-- samples/axi_ram/CMakeLists.txt | 3 +-- 7 files changed, 2 insertions(+), 24 deletions(-) diff --git a/samples/ahb_dma/CMakeLists.txt b/samples/ahb_dma/CMakeLists.txt index 82d2767..3906cee 100644 --- a/samples/ahb_dma/CMakeLists.txt +++ b/samples/ahb_dma/CMakeLists.txt @@ -12,9 +12,5 @@ set(SIM_FILES dma_ahb_simple.v) set(VERILATOR_CSOURCES ../../cpp/sim_main_dpi.cpp) set(VERILATOR_ARGS -Wno-WIDTH -Wno-CASEINCOMPLETE --timing) -# Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address) - # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/ahb_mem/CMakeLists.txt b/samples/ahb_mem/CMakeLists.txt index d49bffe..24c1f3b 100644 --- a/samples/ahb_mem/CMakeLists.txt +++ b/samples/ahb_mem/CMakeLists.txt @@ -12,9 +12,5 @@ set(SIM_FILES mem_ahb.v) set(VERILATOR_CSOURCES ../../cpp/sim_main_dpi.cpp) set(VERILATOR_ARGS --timing) -# Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address) - # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/apb3_completer_mem/CMakeLists.txt b/samples/apb3_completer_mem/CMakeLists.txt index 38238e1..ede6658 100644 --- a/samples/apb3_completer_mem/CMakeLists.txt +++ b/samples/apb3_completer_mem/CMakeLists.txt @@ -12,9 +12,5 @@ set(SIM_FILES apb3_completer_mem.sv) set(VERILATOR_CSOURCES ../../cpp/sim_main_dpi.cpp) set(VERILATOR_ARGS --timing) -# Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address) - # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/apb3_requester_synth/CMakeLists.txt b/samples/apb3_requester_synth/CMakeLists.txt index e60adef..e268477 100644 --- a/samples/apb3_requester_synth/CMakeLists.txt +++ b/samples/apb3_requester_synth/CMakeLists.txt @@ -17,9 +17,5 @@ set(SIM_FILES set(VERILATOR_CSOURCES ../../cpp/sim_main_dpi.cpp) set(VERILATOR_ARGS --timing) -# Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address) - # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/apb3_standalone/CMakeLists.txt b/samples/apb3_standalone/CMakeLists.txt index 8924e89..09c33e2 100644 --- a/samples/apb3_standalone/CMakeLists.txt +++ b/samples/apb3_standalone/CMakeLists.txt @@ -18,9 +18,5 @@ set(SIM_FILES set(VERILATOR_CSOURCES sim_main.cpp) set(VERILATOR_ARGS --timing --assert) -# Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS "") - # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/axi_fastvdma/CMakeLists.txt b/samples/axi_fastvdma/CMakeLists.txt index e8e1c56..4a2888d 100644 --- a/samples/axi_fastvdma/CMakeLists.txt +++ b/samples/axi_fastvdma/CMakeLists.txt @@ -14,8 +14,7 @@ set(AXI_DATA_WIDTH 32 CACHE STRING "Width of data channels in the AXI data bus") set(VERILATOR_ARGS --timing -GAXIDataWidth=${AXI_DATA_WIDTH}) # Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address -GAXIDataWidth=${AXI_DATA_WIDTH}) +set(QUESTA_OPTIMIZATION_ARGS GAXIDataWidth=${AXI_DATA_WIDTH}) # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake) diff --git a/samples/axi_ram/CMakeLists.txt b/samples/axi_ram/CMakeLists.txt index 336c2c3..17dbc5e 100644 --- a/samples/axi_ram/CMakeLists.txt +++ b/samples/axi_ram/CMakeLists.txt @@ -14,8 +14,7 @@ set(AXI_DATA_WIDTH 64 CACHE STRING "Width of data channels in the AXI data bus") set(VERILATOR_ARGS -Wno-WIDTH -Wno-CASEINCOMPLETE -Wno-UNSIGNED --timing -GAXIDataWidth=${AXI_DATA_WIDTH}) # Questa variables -set(QUESTA_ARGS "") -set(QUESTA_OPTIMIZATION_ARGS -floatparameters+ReceiverPort+SenderPort+Address -GAXIDataWidth=${AXI_DATA_WIDTH}) +set(QUESTA_OPTIMIZATION_ARGS -GAXIDataWidth=${AXI_DATA_WIDTH}) # CMake file doing the hard job include(../../cmake/build-cosimulation.cmake)