From 1b898b14c9034b85399396fa899d49201fbcf03e Mon Sep 17 00:00:00 2001
From: Peter Waegemann <waegemann@cs.fau.de>
Date: Sun, 11 Sep 2016 16:18:34 +0200
Subject: [PATCH] cmake: unify targets for simulation and wcet analysis
---
arch/patmos/CMakeLists.txt | 20 +++++++++++++++-----
arch/patmos/pasim/CMakeLists.txt | 14 --------------
2 files changed, 15 insertions(+), 19 deletions(-)
delete mode 100644 arch/patmos/pasim/CMakeLists.txt
diff --git a/arch/patmos/CMakeLists.txt b/arch/patmos/CMakeLists.txt
index 1edbc2d..c9f4b7d 100644
--- a/arch/patmos/CMakeLists.txt
+++ b/arch/patmos/CMakeLists.txt
@@ -1,8 +1,3 @@
-# Add pasim as an addtional target. This results in the CMakeLists.txt
-# to be loaded afterwards
-set(ADDITIONAL_TARGETS ${ADDITIONAL_TARGETS}
- ${CMAKE_CURRENT_SOURCE_DIR}/pasim CACHE INTERNAL STRING)
-
SET(PASIM_FREQ 10 CACHE INTERNAL STRING)
set(SRCS
@@ -26,6 +21,13 @@ target_link_libraries(arch generic)
dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
+# Get pasim binary
+find_program(PASIM "pasim")
+if(NOT PASIM)
+ message(WARNING "[${PROJECT_NAME} No PASIM found, not generating PASIM targets!")
+ return()
+endif()
+
# POSIX dOSEK executable macro
macro(dosek_executable ELFFILE)
set(options "EXCLUDE_FROM_ALL")
@@ -77,6 +79,7 @@ macro(dosek_executable ELFFILE)
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/${ELFFILE}/gcfg.pml ${PROJECT_BINARY_DIR}/${ELFFILE}-gcfg.pml
)
+ # target to run the static analysis with platin
add_custom_target(wcet-${ELFFILE}
COMMENT "Timing Analysis for ${ELFFILE}"
DEPENDS ${ELFFILE}
@@ -84,6 +87,13 @@ macro(dosek_executable ELFFILE)
--wca-count-instructions --disable-ait --wca-detect-gurobi
--dref-stats ${PROJECT_BINARY_DIR}/${ELFFILE}.`printenv CIRCUIT`.dref
-e GCFG:timing-`printenv CIRCUIT`)
+
+ # target to run a simulation with pasim
+ add_custom_target(test-${ELFFILE}
+ DEPENDS ${ELFFILE}
+ COMMENT "[${PROJECT_NAME}] Running ${ELFFILE} in pasim."
+ COMMAND ${PASIM} $<TARGET_FILE:${ELFFILE}> --freq ${PASIM_FREQ})
+
endif()
# add to executables list
diff --git a/arch/patmos/pasim/CMakeLists.txt b/arch/patmos/pasim/CMakeLists.txt
deleted file mode 100644
index 122d9b7..0000000
--- a/arch/patmos/pasim/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Get QEMU binary
-find_program(PASIM "pasim")
-if(NOT PASIM)
- message(WARNING "[${PROJECT_NAME} No PASIM found, not generating PASIM targets!")
- return()
-endif()
-# Create additional targets for all executables
-foreach(ELF ${EXECUTABLES})
- add_custom_target(test-${ELF}
- DEPENDS ${ELF}
- COMMENT "[${PROJECT_NAME}] Running ${ELF} in pasim."
- COMMAND ${PASIM} $<TARGET_FILE:${ELF}> --freq ${PASIM_FREQ}
- )
-endforeach()
--
GitLab