From c72b02f99ffe149a81bc4f29c237c1fd86dd1142 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 2 Jun 2021 11:13:19 +0200 Subject: [PATCH 01/13] create Jenkins pipeline --- Jenkinsfile | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ Modulefile | 2 +- conanfile.txt | 2 + 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..363eda9 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,106 @@ +void checkout_project() { + checkout([ + $class: 'GitSCM', + branches: [ + [name: '*/master'] + ], + doGenerateSubmoduleConfigurations: false, + extensions: [ + [$class: 'CleanBeforeCheckout'], + [$class: 'SubmoduleOption', disableSubmodules: false, parentCredentials: true, recursiveSubmodules: true, reference: '', trackingSubmodules: false] + ], + submoduleCfg: [], + userRemoteConfigs: [ + [credentialsId: 'gitea-jenkins', url: 'https://git.minres.com/SystemC/SystemC-Components-Test.git'] + ] + ]) +} + +void setup_conan_centos() { + sh""" + conan profile new default --detect --force + conan profile update settings.compiler.libcxx=libstdc++ default + """ +} + +void setup_conan_ubuntu() { + sh""" + conan profile new default --detect --force + conan profile update settings.compiler.libcxx=libstdc++11 default + """ +} + +void build_project() { + sh""" + mkdir build; cd build + cmake .. -DCMAKE_BUILD_TYPE=Release + make -j10 VERBOSE=1 + """ +} + +void test_project() { + sh 'cd build; ctest -C Debug -V -j10 ' +} + +pipeline { + agent none + options { + // using the Timestamper plugin we can add timestamps to the console log + timestamps() + skipStagesAfterUnstable() + } + + stages { + stage('SCC test pipeline') { + parallel { + stage('U18.04') { + agent {docker { image 'ubuntu-18.04' } } + stages { + stage('Ubuntu18.04: checkout') { steps { checkout_project() }} + stage('Ubuntu18.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu18.04: Build') { steps { build_project() }} + stage('Ubuntu18.04: Test') { steps { test_project() }} + } + } + stage('U20.04') { + agent {docker { image 'ubuntu-20.04' } } + stages { + stage('Ubuntu20.04: checkout') { steps { checkout_project() }} + stage('Ubuntu20.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu20.04: Build') { steps { build_project() }} + stage('Ubuntu20.04: Test') { steps { test_project() }} + } + } + stage('COS7') { + agent {docker { image 'centos7' } } + stages { + stage('CentOS7: checkout') { steps { checkout_project() }} + stage('CentOS7: conan') { steps { setup_conan_centos() }} + stage('CentOS7: build') { steps { build_project() }} + stage('CentOS7: test') { steps { test_project() }} + } + } + stage('COS8') { + agent {docker { image 'centos8' } } + stages { + stage('CentOS8: checkout') { steps { checkout_project() }} + stage('CentOS8: conan') { steps { setup_conan_ubuntu() }} + stage('CentOS8: build') { steps { build_project() }} + stage('CentOS8: test') { steps { test_project() }} + } + } + } + } + } + + post { + success { + echo 'SCC tests PASSED!' + } + failure { + mail to: 'stas@minres.com', + subject: "SCC Test Pipeline Failed: ${currentBuild.fullDisplayName}", + body: "Something is wrong with ${env.BUILD_URL}" + } + } +} \ No newline at end of file diff --git a/Modulefile b/Modulefile index aea43b5..2d31046 100644 --- a/Modulefile +++ b/Modulefile @@ -7,7 +7,7 @@ proc ModulesHelp { } { puts stderr "\tThis module loads PATHs and variables for SCC tests." } -set distro [exec /bin/lsb_release -i -s] +set distro [exec /usr/bin/lsb_release -i -s] if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env(PCP_DIR)] } { puts stderr "Don't forget to execute 'scl enable devtoolset-7 llvm-toolset-7 bash'" } diff --git a/conanfile.txt b/conanfile.txt index 9e85b22..368105a 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -11,3 +11,5 @@ [options] fmt:header_only=True + systemc:shared=True + systemc-cci:shared=True \ No newline at end of file From 0535f2e3535103bbe5aeded9abdc2f73bf80e87b Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 2 Jun 2021 11:35:34 +0200 Subject: [PATCH 02/13] link scc-utils --- Jenkinsfile | 2 +- tests/io-redirector/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 363eda9..0d2964d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,7 @@ pipeline { agent {docker { image 'centos8' } } stages { stage('CentOS8: checkout') { steps { checkout_project() }} - stage('CentOS8: conan') { steps { setup_conan_ubuntu() }} + stage('CentOS8: conan') { steps { setup_conan_centos() }} stage('CentOS8: build') { steps { build_project() }} stage('CentOS8: test') { steps { test_project() }} } diff --git a/tests/io-redirector/CMakeLists.txt b/tests/io-redirector/CMakeLists.txt index 56eb13a..baf9383 100644 --- a/tests/io-redirector/CMakeLists.txt +++ b/tests/io-redirector/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 3.12) add_executable (io_redirector main.cpp ) -target_link_libraries (io_redirector LINK_PUBLIC scc) +target_link_libraries (io_redirector LINK_PUBLIC scc-util) add_test(NAME io_redirector_test COMMAND io_redirector) \ No newline at end of file From c0d0dce68340a388e4e3d9bdfaac6bc676022514 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 2 Jun 2021 12:13:59 +0200 Subject: [PATCH 03/13] centos8 conan stdc++11 --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d2964d..f7350f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,14 +16,14 @@ void checkout_project() { ]) } -void setup_conan_centos() { +void setup_conan_stdc() { sh""" conan profile new default --detect --force conan profile update settings.compiler.libcxx=libstdc++ default """ } -void setup_conan_ubuntu() { +void setup_conan_stdc11() { sh""" conan profile new default --detect --force conan profile update settings.compiler.libcxx=libstdc++11 default @@ -57,7 +57,7 @@ pipeline { agent {docker { image 'ubuntu-18.04' } } stages { stage('Ubuntu18.04: checkout') { steps { checkout_project() }} - stage('Ubuntu18.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu18.04: Conan') { steps { setup_conan_stdc11() }} stage('Ubuntu18.04: Build') { steps { build_project() }} stage('Ubuntu18.04: Test') { steps { test_project() }} } @@ -66,7 +66,7 @@ pipeline { agent {docker { image 'ubuntu-20.04' } } stages { stage('Ubuntu20.04: checkout') { steps { checkout_project() }} - stage('Ubuntu20.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu20.04: Conan') { steps { setup_conan_stdc11() }} stage('Ubuntu20.04: Build') { steps { build_project() }} stage('Ubuntu20.04: Test') { steps { test_project() }} } @@ -75,7 +75,7 @@ pipeline { agent {docker { image 'centos7' } } stages { stage('CentOS7: checkout') { steps { checkout_project() }} - stage('CentOS7: conan') { steps { setup_conan_centos() }} + stage('CentOS7: conan') { steps { setup_conan_stdc() }} stage('CentOS7: build') { steps { build_project() }} stage('CentOS7: test') { steps { test_project() }} } @@ -84,7 +84,7 @@ pipeline { agent {docker { image 'centos8' } } stages { stage('CentOS8: checkout') { steps { checkout_project() }} - stage('CentOS8: conan') { steps { setup_conan_centos() }} + stage('CentOS8: conan') { steps { setup_conan_stdc11() }} stage('CentOS8: build') { steps { build_project() }} stage('CentOS8: test') { steps { test_project() }} } From 66ca4222e06adeba0badacf3e6507e3e531e0ed3 Mon Sep 17 00:00:00 2001 From: mateo Date: Mon, 5 Jul 2021 12:30:39 +0200 Subject: [PATCH 04/13] Correction of readme.md --- README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/README.md b/README.md index 0198472..b13e549 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,50 @@ # SystemC-Components-Test Examples and tests for the SystemC-Components + +#Prerequisites: + +In Console: + + -Check for needed modules in ~/.bashrc + they should be available directly in the linux installation or in the Modulefile top level file in the Project. If not, install it and add it to $PATH with: + + export PATH="needed-path:$PATH" + + -Edit bashrc and add: + + ./opt/shared/modules/4.4.1/init/bash + module use /opt/shared/modules/modulefiles + + at end of file. + + -Load the Modules from the top level file in the Project: + + module load ./Modulefile + + -Install conan with: + + pip install conan + + -and run this comands to run conan with the C++11 library: + + conan profile new default --detect --force + conan profile update settings.compiler.libcxx=libstdc++11 default + + -Add conan to $PATH + +#Build: + -Create folder "build" in SystemC-Components-Test project folder. + -Build the project with: + + cmake .. + + -compile + + make -j4 #4 means number of cores where it is compiled. + + +#Run: + -from build folder run: + + ./bin/"binary-name" #binary name: zb. "sim_performance" + \ No newline at end of file From f58a58d4656c0c180d526cbb0280a912f92a7f25 Mon Sep 17 00:00:00 2001 From: Mateo Argudo Date: Fri, 23 Jul 2021 13:57:42 +0200 Subject: [PATCH 05/13] correction of sim_performance names --- tests/sim_performance/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sim_performance/CMakeLists.txt b/tests/sim_performance/CMakeLists.txt index 950dd9d..d901880 100644 --- a/tests/sim_performance/CMakeLists.txt +++ b/tests/sim_performance/CMakeLists.txt @@ -11,6 +11,6 @@ target_link_libraries (sim_performance LINK_PUBLIC ${Boost_LIBRARIES} ) #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) + 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() \ No newline at end of file From ecf44871b7d880e8b6a1316c90c9989447b4ad45 Mon Sep 17 00:00:00 2001 From: mateo Date: Tue, 27 Jul 2021 20:25:54 +0200 Subject: [PATCH 06/13] changed tests for benchmark this is the baseline version --- tests/sim_performance/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sim_performance/CMakeLists.txt b/tests/sim_performance/CMakeLists.txt index d901880..b18ceb2 100644 --- a/tests/sim_performance/CMakeLists.txt +++ b/tests/sim_performance/CMakeLists.txt @@ -11,6 +11,7 @@ target_link_libraries (sim_performance LINK_PUBLIC ${Boost_LIBRARIES} ) #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_32x32_${x} COMMAND sim_performance --dim 32 --count 50000) - add_test(NAME sim_performance_64x64_${x} COMMAND sim_performance --dim 64 --count 100000) +endforeach() +foreach(x RANGE 1 10) + add_test(NAME sim_performance_20x20_${x} COMMAND sim_performance --dim 20 --count 20000) endforeach() \ No newline at end of file From 238bb2f23c74af4d17568a8c1cb95f3b7809ad48 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 16 Nov 2021 13:03:15 +0100 Subject: [PATCH 07/13] Conan integration in CMake --- .cproject | 20 +++++++++-- .settings/language.settings.xml | 8 ++--- CMakeLists.txt | 61 +++++++++++++++++++++++++++++---- conanfile.txt | 15 -------- scc | 2 +- 5 files changed, 77 insertions(+), 29 deletions(-) delete mode 100644 conanfile.txt diff --git a/.cproject b/.cproject index d31d49e..e2f7de7 100644 --- a/.cproject +++ b/.cproject @@ -19,7 +19,7 @@ - + @@ -273,6 +273,22 @@ true true + + CMAKE_BUILD_TOOL + $<cmake4eclipse_dyn> + all + true + true + true + + + make + + VERBOSE=1 + true + false + true + - + \ No newline at end of file diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 57bac22..40620f1 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index 01d06c6..9a7a315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.12) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) +list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) project(SCC_Test) @@ -16,20 +18,16 @@ get_info_from_git() ### set the directory names of the submodules set(GIT_SUBMODULES scc) set(GIT_SUBMODULE_DIR_sc-components .) -### set each submodules's commit or tag that is to be checked out -### (leave empty if you want master) -#set(GIT_SUBMODULE_VERSION_sc-components 3af6b9836589b082c19d9131c5d0b7afa8ddd7cd) +## set each submodules's commit or tag that is to be checked out +## (leave empty if you want master) set(GIT_SUBMODULE_BRANCH_sc-components ${GIT_BRANCH}) include(GNUInstallDirs) if(NOT NO_SUBMODULE_CHECK) include(Submodules) endif() -include(Conan) include(BuildType) -#enable_testing() - set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -75,7 +73,56 @@ else() endif() endif() -setup_conan(TARGETS) +########################################################## +## get conan packages +########################################################## +include(ConanInline) + +set(CONAN_BOOST_OPTIONS +boost:fPIC=True +boost:shared=True +boost:header_only=False +boost:without_context=True +boost:without_contract=True +boost:without_coroutine=True +boost:without_fiber=True +boost:without_graph=True +boost:without_graph_parallel=True +boost:without_iostreams=True +boost:without_json=True +boost:without_locale=True +boost:without_log=True +boost:without_math=True +boost:without_mpi=True +boost:without_nowide=True +boost:without_python=True +boost:without_random=True +boost:without_regex=True +boost:without_stacktrace=True +boost:without_test=True +boost:without_timer=True +boost:without_type_erasure=True +boost:without_wave=True +) +set(CONAN_PACKAGE_LIST fmt/6.1.2 boost/1.75.0 gsl-lite/0.37.0) +set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) +if(NOT DEFINED ENV{SYSTEMC_HOME}) + set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST} systemc/2.3.3 systemc-cci/1.0.0) + set(CONAN_PACKAGE_OPTIONS ${CONAN_PACKAGE_OPTIONS} systemc-cci:shared=False) +endif() +conan_check() +conan_add_remote(NAME minres URL https://artifactory.minres.com/artifactory/api/conan/oss) +conan_cmake_configure(REQUIRES ${CONAN_PACKAGE_LIST} + GENERATORS cmake_find_package + OPTIONS ${CONAN_PACKAGE_OPTIONS} + ) + +conan_install() +find_package(fmt) +find_package(gsl-lite) +find_package(SystemCLanguage) +find_package(systemc-cci) +######################################################################################## # 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. diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 368105a..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,15 +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 - systemc:shared=True - systemc-cci:shared=True \ No newline at end of file diff --git a/scc b/scc index 2a11251..6d816e1 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 2a11251ae63f3470245e13f4f576e4c93d2f243c +Subproject commit 6d816e1c9a2adc0e0b74a6473e6ecdb4392de13a From 8895fa0c26aa8522f3d5ea8c01aaca744056adb6 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 16 Nov 2021 13:40:35 +0100 Subject: [PATCH 08/13] Check if SystemC_INCLUDE_DIR is already set --- scc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scc b/scc index 6d816e1..e266bcb 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 6d816e1c9a2adc0e0b74a6473e6ecdb4392de13a +Subproject commit e266bcbeea7153136c689170ab9f466f13e96571 From 95faedd3d0e44b99e5177abfaa5146de87aded24 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 16 Nov 2021 16:15:51 +0100 Subject: [PATCH 09/13] b2 and ZLIB libs from conan for CentOS7 --- .cproject | 10 +++++++++- CMakeLists.txt | 20 +++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.cproject b/.cproject index e2f7de7..95e64ad 100644 --- a/.cproject +++ b/.cproject @@ -58,6 +58,7 @@ + @@ -283,12 +284,19 @@ make - VERBOSE=1 true false true + + CMAKE_BUILD_TOOL + $<cmake4eclipse_dyn> + clean + true + true + true + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a7a315..16659c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,21 @@ endif() ## get conan packages ########################################################## include(ConanInline) +conan_check() +conan_add_remote(NAME minres URL https://artifactory.minres.com/artifactory/api/conan/oss) + +# Boost on CentOS 7 quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run +# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there +set(B2_META $ENV{HOME}/.conan/data/b2/4.5.0/_/_/metadata.json) +if(DEFINED ENV{CONAN_USER_HOME}) + set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/4.5.0/_/_/metadata.json) +endif() +if(NOT EXISTS ${B2_META}) + conan_cmake_configure(REQUIRES b2/4.5.0) + conan_cmake_autodetect(settings) + conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings}) +endif() +# Boost on CentOS 7 quirks end set(CONAN_BOOST_OPTIONS boost:fPIC=True @@ -104,14 +119,12 @@ boost:without_timer=True boost:without_type_erasure=True boost:without_wave=True ) -set(CONAN_PACKAGE_LIST fmt/6.1.2 boost/1.75.0 gsl-lite/0.37.0) +set(CONAN_PACKAGE_LIST fmt/6.1.2 zlib/1.2.11 boost/1.75.0 gsl-lite/0.37.0) set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) if(NOT DEFINED ENV{SYSTEMC_HOME}) set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST} systemc/2.3.3 systemc-cci/1.0.0) set(CONAN_PACKAGE_OPTIONS ${CONAN_PACKAGE_OPTIONS} systemc-cci:shared=False) endif() -conan_check() -conan_add_remote(NAME minres URL https://artifactory.minres.com/artifactory/api/conan/oss) conan_cmake_configure(REQUIRES ${CONAN_PACKAGE_LIST} GENERATORS cmake_find_package OPTIONS ${CONAN_PACKAGE_OPTIONS} @@ -119,6 +132,7 @@ conan_cmake_configure(REQUIRES ${CONAN_PACKAGE_LIST} conan_install() find_package(fmt) +find_package(ZLIB) find_package(gsl-lite) find_package(SystemCLanguage) find_package(systemc-cci) From 1e71d4c9d2bdf14a39572c98731e8d857bffb39a Mon Sep 17 00:00:00 2001 From: mateo Date: Sun, 21 Nov 2021 18:07:27 +0100 Subject: [PATCH 10/13] added tests for further performance increasing analysis --- tests/sim_performance/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/sim_performance/CMakeLists.txt b/tests/sim_performance/CMakeLists.txt index b18ceb2..68f726e 100644 --- a/tests/sim_performance/CMakeLists.txt +++ b/tests/sim_performance/CMakeLists.txt @@ -13,5 +13,8 @@ foreach(x RANGE 1 10) add_test(NAME sim_performance_16x16_${x} COMMAND sim_performance) endforeach() foreach(x RANGE 1 10) - add_test(NAME sim_performance_20x20_${x} COMMAND sim_performance --dim 20 --count 20000) + add_test(NAME sim_performance_20x20_${x} COMMAND sim_performance --dim 20) +endforeach() +foreach(x RANGE 1 10) + add_test(NAME sim_performance_30x30_${x} COMMAND sim_performance --dim 30) endforeach() \ No newline at end of file From af670d7004afea611f857030c5e747b4c6710f3a Mon Sep 17 00:00:00 2001 From: Stanislaw Kaushanski Date: Fri, 19 Aug 2022 12:05:30 +0200 Subject: [PATCH 11/13] update scc and eclipse settings --- .cproject | 13 ++++++++----- .settings/language.settings.xml | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cproject b/.cproject index 95e64ad..9fec856 100644 --- a/.cproject +++ b/.cproject @@ -19,11 +19,11 @@ - + - + @@ -60,6 +60,9 @@ + + + @@ -77,7 +80,7 @@ - + @@ -138,7 +141,7 @@ - + @@ -194,7 +197,7 @@ - + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 40620f1..06154f4 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + From 19580227a905dde56388e4006e8ebb3e97ee2032 Mon Sep 17 00:00:00 2001 From: Stanislaw Kaushanski Date: Fri, 19 Aug 2022 12:12:24 +0200 Subject: [PATCH 12/13] update scc lib --- scc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scc b/scc index e266bcb..175d47e 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit e266bcbeea7153136c689170ab9f466f13e96571 +Subproject commit 175d47e1aa66d5ad9671a3bffc1a8561b5460267 From c445c1cda1de79bae96da9893b871885b6d32255 Mon Sep 17 00:00:00 2001 From: Stanislaw Kaushanski Date: Tue, 23 Aug 2022 08:56:05 +0200 Subject: [PATCH 13/13] updating the tests to the latest scc --- .settings/language.settings.xml | 10 +++++----- examples/ahb_bfm/sc_main.cpp | 8 ++++---- tests/io-redirector/main.cpp | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 06154f4..1bccc59 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -4,8 +4,8 @@ - - + + @@ -18,7 +18,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/examples/ahb_bfm/sc_main.cpp b/examples/ahb_bfm/sc_main.cpp index 8bc1063..ef38068 100644 --- a/examples/ahb_bfm/sc_main.cpp +++ b/examples/ahb_bfm/sc_main.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include @@ -17,7 +17,7 @@ class testbench: public sc_module, public scc::traceable { public: enum { WIDTH=64}; tlm::scc::initiator_mixin> isck{"isck"}; - ahb::bfm::initiator intor{"intor"}; + ahb::pin::initiator intor{"intor"}; sc_core::sc_clock HCLK{"HCLK", 10_ns}; sc_core::sc_signal HRESETn{"HRESETn"}; sc_core::sc_signal> HADDR{"HADDR"}; @@ -33,7 +33,7 @@ public: sc_core::sc_signal HRESP{"HRESP"}; sc_core::sc_signal HSEL{"HSEL"}; - ahb::bfm::target target{"target"}; + ahb::pin::target target{"target"}; tlm::scc::target_mixin> tsck{"tsck"}; testbench(sc_module_name nm):sc_module(nm){ diff --git a/tests/io-redirector/main.cpp b/tests/io-redirector/main.cpp index e551e1f..ebe8e45 100644 --- a/tests/io-redirector/main.cpp +++ b/tests/io-redirector/main.cpp @@ -10,6 +10,8 @@ #include #include +using namespace util; + int main(int arcg, char* argv[]){ IoRedirector::get().start(); auto result1 = IoRedirector::get().get_output();