VP
/
TGC-VP
6
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

updates dbt-rise components

This commit is contained in:
Eyck Jentzsch 2023-10-15 10:02:31 +02:00
parent f0660235ed
commit 7503a4df2f
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tgc-iss/dbt-rise-tgc/cmake/)
project(ecosystem-vp LANGUAGES C CXX VERSION 1.0.0) project(ecosystem-vp LANGUAGES C CXX VERSION 1.0.0)
@ -10,6 +11,7 @@ option(EN_EXT_DEBUG "Enable extended debug output at runtime" OFF)
option(ENABLE_COVERAGE "Enable code coverage" OFF) option(ENABLE_COVERAGE "Enable code coverage" OFF)
option(ENABLE_SANITIZER "Enable address sanitizer" OFF) option(ENABLE_SANITIZER "Enable address sanitizer" OFF)
option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF) option(ENABLE_CLANGTIDY "Enable static analysis with clang-tidy." OFF)
option(WITH_TCC "Build TCC backend" ON)
set(SCC_LIB_ONLY ON) set(SCC_LIB_ONLY ON)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@ -74,10 +76,9 @@ set(CONAN_PACKAGE_LIST
jsoncpp/1.9.5 jsoncpp/1.9.5
) )
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND WITH_TCC)
list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4 tcc/0.9.27) list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4 tcc/0.9.27)
list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False ) list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False )
option(WITH_TCC "Build TCC backend" ON)
endif() endif()
if(WITH_LLVM) if(WITH_LLVM)
list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0) list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0)
@ -126,6 +127,7 @@ find_package(elfio)
find_package(fmt) find_package(fmt)
find_package(spdlog) find_package(spdlog)
find_package(gsl-lite) find_package(gsl-lite)
find_package(yaml-cpp)
set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. 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 REQUIRED COMPONENTS program_options QUIET) find_package(Boost REQUIRED COMPONENTS program_options QUIET)

2
scc

@ -1 +1 @@
Subproject commit dc3160065b24cfbb1aec570b64070a8f6b7bdc59 Subproject commit da124c34e8943072254418dbdbee9ea18211123b

2
src/CLIParser.cpp
View File

@ -28,7 +28,7 @@ CLIParser::CLIParser(int argc, char *argv[])
po::store(po::parse_command_line(argc, argv, desc), vm_); // can throw po::store(po::parse_command_line(argc, argv, desc), vm_); // can throw
// --help option // --help option
if (vm_.count("help")) { if (vm_.count("help")) {
std::cout << "DBT-RISE-RiscV simulator for RISC-V" << std::endl << desc << std::endl; std::cout << "DBT-RISE-TGC based virtual platform of TGC cores" << std::endl << desc << std::endl;
} }
po::notify(vm_); // throws on error, so do after help in case there are any problems po::notify(vm_); // throws on error, so do after help in case there are any problems
valid = true; valid = true;

2
tgc-iss/dbt-rise-core

@ -1 +1 @@
Subproject commit 22a0503f2ebe36fa44a5ef1c86950e2dc621848c Subproject commit ac18f84077690def42aa6235756a85ca29cf0739

2
tgc-iss/dbt-rise-tgc

@ -1 +1 @@
Subproject commit 18e08cfc50c91ac68bd9cfb3aa5cfe92b1f0777c Subproject commit ae4322c1b967e7d9e98ff30a3cb7bd94476e9ada

2
vpvper

@ -1 +1 @@
Subproject commit b35f68e35c2e5c254ab04008abe4fe0a279eb4d1 Subproject commit 2a3ec57906b8c5a1ab1cb146f214fe0b19aed564