Skip to content

Commit

Permalink
removed verilator for now
Browse files Browse the repository at this point in the history
  • Loading branch information
Pasquale Davide Schiavone committed Aug 2, 2017
1 parent 5ce99e8 commit fd2c047
Show file tree
Hide file tree
Showing 64 changed files with 65 additions and 478 deletions.
12 changes: 0 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,6 @@ This is intended for batch processing of a large number of tests.

Replace helloworld with the test/application you want to run.

### Using Verilator

> Note: Currently Verilator compilation is only supported by using `ninja`.
> Adapt the `cmake_configure.riscv.gcc.sh` accordingly (e.g. pass `-G "Ninja"`) to it.
To evaluate PULPino using Verilator you need to compile all the HDL and the testbench first using:

ninja vericompile

After compilation succeeded you can call any program with:

ninja helloworld.verilate

### Using ninja instead of make

Expand Down
7 changes: 0 additions & 7 deletions sw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,6 @@ add_custom_target(vcompile.core.zero
WORKING_DIRECTORY ${PULP_MODELSIM_DIRECTORY}
${USES_TERMINAL})

add_custom_target(vericompile
COMMAND tcsh -c "env TOP_PATH=${PULP_MODELSIM_DIRECTORY}/.. ./verilator/verilator_compile.csh"
WORKING_DIRECTORY ${PULP_MODELSIM_DIRECTORY}
COMMAND cd verilator_libs
COMMAND make -j -f Vtb_verilator.mk Vtb_verilator
${USES_TERMINAL})

################################################################################

add_subdirectory(libs/string_lib)
Expand Down
11 changes: 0 additions & 11 deletions sw/apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,6 @@ macro(add_application NAME SOURCE_FILES)
# add everything needed for simulation
add_sim_targets(${NAME})

# if there are labels available for testing
if(ARG_LABELS)
set(TEST_LABELS, "")
string(REPLACE "verilator_tests" "" TEST_LABELS "${ARG_LABELS}")
set_tests_properties(${NAME}.test PROPERTIES LABELS "${TEST_LABELS}")
endif()
if(ARG_LABELS AND ARG_LABELS MATCHES "verilator_tests")
set_tests_properties(${NAME}.verilate PROPERTIES LABELS "verilator_tests")
endif()

endmacro()

################################################################################
Expand Down Expand Up @@ -192,7 +182,6 @@ macro(add_boot_code NAME SOURCE_FILES)
# if there are labels available for testing
if(ARG_LABELS)
set_tests_properties(${NAME}.test PROPERTIES LABELS "${ARG_LABELS}")
set_tests_properties(${NAME}.verilate PROPERTIES LABELS "${ARG_LABELS}")
endif()

endmacro()
Expand Down
17 changes: 0 additions & 17 deletions sw/apps/CMakeSim.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,12 @@ macro(add_sim_targets NAME)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/waves
COMMAND ${CMAKE_COMMAND} -E create_symlink ${PULP_MODELSIM_DIRECTORY}/waves ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/waves)

add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/verilator_libs
COMMAND ${CMAKE_COMMAND} -E create_symlink ${PULP_MODELSIM_DIRECTORY}/verilator_libs ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/verilator_libs)

add_custom_target(${NAME}.links ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/modelsim.ini
${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/work
${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/tcl_files
${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/waves)


add_custom_target(${NAME}.links_verilator ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/verilator_libs)

##############################################################################
# Stimuli generation
##############################################################################
Expand Down Expand Up @@ -79,14 +73,6 @@ macro(add_sim_targets NAME)
# Run simulation
##############################################################################

# run in modelsim with GUI
add_custom_target(${NAME}.verilate
WORKING_DIRECTORY ./${SUBDIR}
DEPENDS ${NAME}.slm.cmd ${NAME}.stim.txt ${NAME}.links_verilator
COMMAND ./verilator_libs/Vtb_verilator ./slm_files/l2_stim.slm ./slm_files/tcdm_bank0.slm
COMMENT "Running ${NAME} with Verilator"
${USES_TERMINAL})

# run in modelsim with GUI
add_custom_target(${NAME}.vsim
COMMAND ${CMAKE_COMMAND} -E remove stdout/*
Expand Down Expand Up @@ -250,9 +236,6 @@ macro(add_sim_targets NAME)
COMMAND tcsh -c "${SETENV} ${VSIM} -c -64 -do 'source tcl_files/$<TARGET_PROPERTY:${NAME}.elf,TB>; run_and_exit;'"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR})

add_test(NAME ${NAME}.verilate
COMMAND ./verilator_libs/Vtb_verilator ./slm_files/l2_stim.slm ./slm_files/tcdm_bank0.slm
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR})
##############################################################################
# Convenience
##############################################################################
Expand Down
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlAxpy/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlAxpy.c)

if (${RISCY_RV32F})
add_application(mlAxpy "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlAxpy "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlBilat/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlBilat.c)

if (${RISCY_RV32F})
add_application(mlBilat "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlBilat "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlButter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlButter.c)

if (${RISCY_RV32F})
add_application(mlButter "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlButter "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlChol/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlChol.c)

if (${RISCY_RV32F})
add_application(mlChol "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlChol "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlDct/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlDct.c)

if (${RISCY_RV32F})
add_application(mlDct "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlDct "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlDist/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlDist.c)

if (${RISCY_RV32F})
add_application(mlDist "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlDist "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlDotp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlDotp.c)

if (${RISCY_RV32F})
add_application(mlDotp "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlDotp "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlFir/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlFir.c)

if (${RISCY_RV32F})
add_application(mlFir "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlFir "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlGemm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlGemm.c)

if (${RISCY_RV32F})
add_application(mlGemm "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlGemm "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlGemv/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlGemv.c)

if (${RISCY_RV32F})
add_application(mlGemv "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlGemv "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlGivens/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlGivens.c)

if (${RISCY_RV32F})
add_application(mlGivens "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlGivens "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlGrad/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlGrad.c)

if (${RISCY_RV32F})
add_application(mlGrad "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlGrad "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlGradDir/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlGradDir.c)

if (${RISCY_RV32F})
add_application(mlGradDir "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlGradDir "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlHom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlHom.c)

if (${RISCY_RV32F})
add_application(mlHom "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlHom "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlHomErr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlHomErr.c)

if (${RISCY_RV32F})
add_application(mlHomErr "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlHomErr "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlLog/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlLog.c)

if (${RISCY_RV32F})
add_application(mlLog "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlLog "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlQr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlQr.c)

if (${RISCY_RV32F})
add_application(mlQr "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlQr "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlRbf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlRbf.c)

if (${RISCY_RV32F})
add_application(mlRbf "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlRbf "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlSchur/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlSchur.c)

if (${RISCY_RV32F})
add_application(mlSchur "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlSchur "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlSin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlSin.c)

if (${RISCY_RV32F})
add_application(mlSin "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlSin "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlSvd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlSvd.c)

if (${RISCY_RV32F})
add_application(mlSvd "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlSvd "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/ml_tests/mlWdotp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES mlWdotp.c)

if (${RISCY_RV32F})
add_application(mlWdotp "${FP_SOURCES}" LABELS "ml_tests" "verilator_tests")
add_application(mlWdotp "${FP_SOURCES}" LABELS "ml_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/basic/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(rv_basic basic.c LABELS "riscv_tests" "verilator_tests")
add_application(rv_basic basic.c LABELS "riscv_tests")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/official/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set_source_files_properties(tests.S PROPERTIES LANGUAGE C)

set(SOURCES test_print.c tests.S)
add_application(rv_official "${SOURCES}" LABELS riscv_tests verilator_tests)
add_application(rv_official "${SOURCES}" LABELS riscv_tests)
#add_spi_regression(rv_official "${SOURCES}")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testALU/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(testALU testALU.c LABELS "riscv_tests" "verilator_tests")
add_application(testALU testALU.c LABELS "riscv_tests")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testALUExt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testALUExt testALUExt.c LABELS "riscv_tests" "verilator_tests")
add_application(testALUExt testALUExt.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testAddSubNorm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testAddSubNorm testAddSubNorm.c LABELS "riscv_tests" "verilator_tests")
add_application(testAddSubNorm testAddSubNorm.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testBitManipulation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testBitManipulation testBitManipulation.c LABELS "riscv_tests" "verilator_tests")
add_application(testBitManipulation testBitManipulation.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testCSR/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(testCSR testCSR.c LABELS "riscv_tests" "verilator_tests")
add_application(testCSR testCSR.c LABELS "riscv_tests")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testClip/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testClip testClip.c LABELS "riscv_tests" "verilator_tests")
add_application(testClip testClip.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testCnt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testCnt testCnt.c LABELS "riscv_tests" "verilator_tests")
add_application(testCnt testCnt.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testDivRem/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "RV32IM" OR ${GCC_MARCH} MATCHES "[pulp]+")
add_application(testDivRem testDivRem.c LABELS "riscv_tests" "verilator_tests")
add_application(testDivRem testDivRem.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testDotMul/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testDotMul testDotMul.c LABELS "riscv_tests" "verilator_tests")
add_application(testDotMul testDotMul.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testEvents/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(testEvents testEvents.c LABELS "riscv_tests" "verilator_tests")
add_application(testEvents testEvents.c LABELS "riscv_tests")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testExceptions/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(testExceptions main.c LABELS "riscv_tests" "verilator_tests")
add_application(testExceptions main.c LABELS "riscv_tests")
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testFPU/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(FP_SOURCES testFPU.c)

if (${RISCY_RV32F})
add_application(testFPU "${FP_SOURCES}" LABELS "riscv_tests" "verilator_tests")
add_application(testFPU "${FP_SOURCES}" LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testMUL/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "RV32IM" OR ${GCC_MARCH} MATCHES "[pulp]+")
add_application(testMUL testMUL.c LABELS "riscv_tests" "verilator_tests")
add_application(testMUL testMUL.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testMacNorm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testMacNorm testMacNorm.c LABELS "riscv_tests" "verilator_tests")
add_application(testMacNorm testMacNorm.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testMisaligned/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
add_application(testMisaligned main.c LABELS "riscv_tests" "verilator_tests")
add_application(testMisaligned main.c LABELS "riscv_tests")

2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testShufflePack/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testShufflePack testShufflePack.c LABELS "riscv_tests" "verilator_tests")
add_application(testShufflePack testShufflePack.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testVecArith/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testVecArith testVecArith.c LABELS "riscv_tests" "verilator_tests")
add_application(testVecArith testVecArith.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/riscv_tests/testVecCmp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(testVecCmp testVecCmp.c LABELS "riscv_tests" "verilator_tests")
add_application(testVecCmp testVecCmp.c LABELS "riscv_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/sequential_tests/bitDescriptor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(bitDescriptor bitDescriptor.c LABELS "sequential_tests" "verilator_tests")
add_application(bitDescriptor bitDescriptor.c LABELS "sequential_tests")
2 changes: 1 addition & 1 deletion sw/apps/sequential_tests/bubblesort/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(bubblesort bubblesort.c LABELS "sequential_tests" "verilator_tests")
add_application(bubblesort bubblesort.c LABELS "sequential_tests")
4 changes: 2 additions & 2 deletions sw/apps/sequential_tests/cnn_layer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set(CNN_SOURCES cnn_layer.c cnn_kernels.c cnn_kernels_fused.c)

if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(cnn_layer "${CNN_SOURCES}" FLAGS "-DPROFILE -DVEC" LABELS "sequential_tests" "verilator_tests")
add_application(cnn_layer "${CNN_SOURCES}" FLAGS "-DPROFILE -DVEC" LABELS "sequential_tests")
else()
add_application(cnn_layer "${CNN_SOURCES}" FLAGS "-DPROFILE" LABELS "sequential_tests" "verilator_tests")
add_application(cnn_layer "${CNN_SOURCES}" FLAGS "-DPROFILE" LABELS "sequential_tests")
endif()
4 changes: 2 additions & 2 deletions sw/apps/sequential_tests/convolution/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(CONV_SOURCES convolution.c conv_kernels.c)
if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(convolution "${CONV_SOURCES}" FLAGS "-DPROFILE -DDOTP" LABELS "sequential_tests" "verilator_tests")
add_application(convolution "${CONV_SOURCES}" FLAGS "-DPROFILE -DDOTP" LABELS "sequential_tests")
else()
add_application(convolution "${CONV_SOURCES}" FLAGS "-DPROFILE" LABELS "sequential_tests" "verilator_tests")
add_application(convolution "${CONV_SOURCES}" FLAGS "-DPROFILE" LABELS "sequential_tests")
endif()
2 changes: 1 addition & 1 deletion sw/apps/sequential_tests/fibonacci/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(fibonacci fibonacci.c LABELS "sequential_tests" "verilator_tests")
add_application(fibonacci fibonacci.c LABELS "sequential_tests")
10 changes: 5 additions & 5 deletions sw/apps/sequential_tests/matrixAdd/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
add_application(matrixAdd32 matrixAdd.c LABELS "sequential_tests" "verilator_tests" FLAGS "-DWORD=32" SUBDIR "matrixAdd32")
add_application(matrixAdd32 matrixAdd.c LABELS "sequential_tests" FLAGS "-DWORD=32" SUBDIR "matrixAdd32")

if (${GCC_MARCH} MATCHES "[pulp]+")
add_application(matrixAdd16 matrixAdd.c LABELS "sequential_tests" "verilator_tests" FLAGS "-DWORD=16 -DUSE_VEC" SUBDIR "matrixAdd16")
add_application(matrixAdd8 matrixAdd.c LABELS "sequential_tests" "verilator_tests" FLAGS "-DWORD=8 -DUSE_VEC" SUBDIR "matrixAdd8")
add_application(matrixAdd16 matrixAdd.c LABELS "sequential_tests" FLAGS "-DWORD=16 -DUSE_VEC" SUBDIR "matrixAdd16")
add_application(matrixAdd8 matrixAdd.c LABELS "sequential_tests" FLAGS "-DWORD=8 -DUSE_VEC" SUBDIR "matrixAdd8")
else()
add_application(matrixAdd16 matrixAdd.c LABELS "sequential_tests" "verilator_tests" FLAGS "-DWORD=16" SUBDIR "matrixAdd16")
add_application(matrixAdd8 matrixAdd.c LABELS "sequential_tests" "verilator_tests" FLAGS "-DWORD=8" SUBDIR "matrixAdd8")
add_application(matrixAdd16 matrixAdd.c LABELS "sequential_tests" FLAGS "-DWORD=16" SUBDIR "matrixAdd16")
add_application(matrixAdd8 matrixAdd.c LABELS "sequential_tests" FLAGS "-DWORD=8" SUBDIR "matrixAdd8")
endif()
2 changes: 1 addition & 1 deletion sw/apps/sequential_tests/matrixMul16/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(matrixMul16 matrixMul.c LABELS "sequential_tests" "verilator_tests")
add_application(matrixMul16 matrixMul.c LABELS "sequential_tests")
2 changes: 1 addition & 1 deletion sw/apps/sequential_tests/matrixMul32/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_application(matrixMul32 matrixMul.c LABELS "sequential_tests" "verilator_tests")
add_application(matrixMul32 matrixMul.c LABELS "sequential_tests")
Loading

0 comments on commit fd2c047

Please sign in to comment.