diff --git a/.gitignore b/.gitignore index d9e41be..9ada3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /build/ /simple_system.txlog /my_db* +/.settings/ diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml deleted file mode 100644 index 57bac22..0000000 --- a/.settings/language.settings.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/.settings/org.eclipse.cdt.managedbuilder.core.prefs deleted file mode 100644 index 7089533..0000000 --- a/.settings/org.eclipse.cdt.managedbuilder.core.prefs +++ /dev/null @@ -1,37 +0,0 @@ -eclipse.preferences.version=1 -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/CPATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/CPATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/CPLUS_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/CPLUS_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/C_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/C_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/append=true -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/appendContributed=true -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/CPATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/CPATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/CPLUS_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/CPLUS_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/C_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/C_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/append=true -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/appendContributed=true -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/CPATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/CPATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/CPLUS_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/CPLUS_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/C_INCLUDE_PATH/delimiter=\: -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/C_INCLUDE_PATH/operation=remove -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/append=true -environment/buildEnvironmentInclude/cdt.managedbuild.toolchain.gnu.base.2088633632/appendContributed=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/LIBRARY_PATH/delimiter=\: -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/LIBRARY_PATH/operation=remove -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/append=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890.1052785257/appendContributed=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/LIBRARY_PATH/delimiter=\: -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/LIBRARY_PATH/operation=remove -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/append=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632.342506890/appendContributed=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632/LIBRARY_PATH/delimiter=\: -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632/LIBRARY_PATH/operation=remove -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632/append=true -environment/buildEnvironmentLibrary/cdt.managedbuild.toolchain.gnu.base.2088633632/appendContributed=true diff --git a/CMakeLists.txt b/CMakeLists.txt index 5508d7f..b39ea17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ set(GIT_SUBMODULE_DIR_sc-components .) set(GIT_SUBMODULE_BRANCH_sc-components ${GIT_BRANCH}) include(GNUInstallDirs) -include(Conan) +include(ConanInline) include(BuildType) #enable_testing() @@ -71,13 +71,19 @@ endif() endif() setup_conan(TARGETS) +conan_configure(REQUIRES fmt/6.1.2 boost/1.75.0 gsl-lite/0.37.0 systemc/2.3.3 systemc-cci/1.0.0 + GENERATORS cmake_find_package + OPTIONS fmt:header_only=True + ) +conan_install() +find_package(ZLIB) # This line finds the boost lib and headers. set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. find_package(Boost COMPONENTS program_options filesystem system thread REQUIRED) # set-up SystemC and SCV -find_package(OSCISystemC) +include(FindSystemCPackage) if(NOT SystemC_FOUND) message( FATAL_ERROR "SystemC library not found." ) endif() diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 9e85b22..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,13 +0,0 @@ -[requires] - fmt/6.1.2 - boost/1.75.0 - gsl-lite/0.37.0 - systemc/2.3.3 - #systemc-scv/2.0.1 - systemc-cci/1.0.0 - -[generators] - cmake - -[options] - fmt:header_only=True diff --git a/examples/simple_system/CMakeLists.txt b/examples/simple_system/CMakeLists.txt index 9186e7b..ee8c673 100644 --- a/examples/simple_system/CMakeLists.txt +++ b/examples/simple_system/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.12) +find_package(Boost COMPONENTS program_options REQUIRED) add_executable (simple_system plic.cpp uart.cpp @@ -9,6 +10,9 @@ add_executable (simple_system sc_main.cpp ) target_link_libraries (simple_system LINK_PUBLIC scc) -target_link_libraries (simple_system LINK_PUBLIC ${Boost_LIBRARIES} ) - +if(TARGET Boost::program_options) + target_link_libraries(simple_system PUBLIC Boost::program_options) +else() + target_link_libraries(simple_system PUBLIC ${BOOST_program_options_LIBRARY}) +endif() add_test(NAME simple_system_test COMMAND simple_system) \ No newline at end of file diff --git a/scc b/scc index f26bfa9..64bb5dd 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit f26bfa97c6a2a4614db5308f38c54d941f642ad5 +Subproject commit 64bb5dd1e6c81d38ade0d53fd8c7b93d3110a5d8 diff --git a/tests/ordered_semaphore/CMakeLists.txt b/tests/ordered_semaphore/CMakeLists.txt index 72f576a..f4e25aa 100644 --- a/tests/ordered_semaphore/CMakeLists.txt +++ b/tests/ordered_semaphore/CMakeLists.txt @@ -1,8 +1,13 @@ cmake_minimum_required(VERSION 3.12) +find_package(Boost COMPONENTS program_options REQUIRED) add_executable (ordered_sem sc_main.cpp ) target_link_libraries (ordered_sem LINK_PUBLIC scc) -target_link_libraries (ordered_sem LINK_PUBLIC ${Boost_LIBRARIES} ) +if(TARGET Boost::program_options) + target_link_libraries(ordered_sem PUBLIC Boost::program_options) +else() + target_link_libraries(ordered_sem LINK_PUBLIC ${BOOST_program_options_LIBRARY}) +endif() add_test(NAME ordered_sem_test COMMAND ordered_sem) \ No newline at end of file diff --git a/tests/sim_performance/CMakeLists.txt b/tests/sim_performance/CMakeLists.txt index 950dd9d..a487b4e 100644 --- a/tests/sim_performance/CMakeLists.txt +++ b/tests/sim_performance/CMakeLists.txt @@ -1,4 +1,6 @@ cmake_minimum_required(VERSION 3.12) +find_package(fmt) +find_package(Boost COMPONENTS program_options REQUIRED) add_executable (sim_performance sc_main.cpp pkt_sender.cpp @@ -6,11 +8,16 @@ add_executable (sim_performance top.cpp ) target_link_libraries (sim_performance LINK_PUBLIC scc) -target_link_libraries (sim_performance LINK_PUBLIC ${Boost_LIBRARIES} ) +target_link_libraries (sim_performance LINK_PUBLIC scc fmt::fmt) +if(TARGET Boost::program_options) + target_link_libraries(sim_performance PUBLIC Boost::program_options) +else() + target_link_libraries(sim_performance PUBLIC ${BOOST_program_options_LIBRARY}) +endif() #Mateo Done erst count 16384 foreach(x RANGE 1 10) add_test(NAME sim_performance_16x16_${x} COMMAND sim_performance) - add_test(NAME sim_performance_16x16_${x} COMMAND sim_performance --dim 32 --count 50000) - add_test(NAME sim_performance_16x16_${x} COMMAND sim_performance --dim 64 --count 100000) -endforeach() \ No newline at end of file + add_test(NAME sim_performance_32x32_${x} COMMAND sim_performance --dim 32 --count 50000) + add_test(NAME sim_performance_64x64_${x} COMMAND sim_performance --dim 64 --count 100000) +endforeach()