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

updating components

This commit is contained in:
Eyck Jentzsch 2024-07-05 07:55:50 +02:00
parent 982e5e9a13
commit 8abf623c63
10 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.envrc
View File

@ -3,6 +3,8 @@ if [ $distro == "CentOS" ]; then
. /opt/rh/devtoolset-8/enable . /opt/rh/devtoolset-8/enable
. /opt/rh/llvm-toolset-7/enable . /opt/rh/llvm-toolset-7/enable
. /opt/rh/rh-python38/enable . /opt/rh/rh-python38/enable
elif [ $distro == "Rocky" ]; then
. /opt/rh/gcc-toolset-11/enable
fi fi
module load ./Modulefile module load ./Modulefile
layout python3 layout python3

4
.gitignore vendored
View File

@ -19,5 +19,5 @@ CMakeSettings.json
/src-gen/ /src-gen/
/*.json /*.json
/cfg.yaml /cfg.yaml
/.direnv /.direnv/
/.cache /.envrc.eyck

12
CMakeLists.txt
View File

@ -80,9 +80,6 @@ set(CONAN_PACKAGE_LIST
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" AND WITH_TCC) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND WITH_TCC)
list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4) list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4)
if(WITH_TCC)
list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27)
endif()
list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False ) list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False )
endif() endif()
if(WITH_LLVM) if(WITH_LLVM)
@ -90,7 +87,7 @@ if(WITH_LLVM)
list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=False) list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=False)
endif() endif()
if(WITH_ASMJIT) if(WITH_ASMJIT)
list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20230325) list(APPEND CONAN_PACKAGE_LIST asmjit/cci.20240531)
list(APPEND CONAN_PACKAGE_OPTIONS asmjit:shared=False) list(APPEND CONAN_PACKAGE_OPTIONS asmjit:shared=False)
endif() endif()
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tgc-iss/dbt-rise-plugins) if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tgc-iss/dbt-rise-plugins)
@ -100,12 +97,9 @@ endif()
if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME}) if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME})
set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST} set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST}
systemc/2.3.3 systemc/2.3.4)
systemc-cci/1.0.0
)
set(CONAN_PACKAGE_OPTIONS ${CONAN_PACKAGE_OPTIONS} set(CONAN_PACKAGE_OPTIONS ${CONAN_PACKAGE_OPTIONS}
systemc:shared=${SHARED_FLAG} systemc:shared=${SHARED_FLAG}
systemc-cci:shared=${SHARED_FLAG}
systemc:disable_virtual_bind=False) systemc:disable_virtual_bind=False)
endif() endif()
@ -195,7 +189,7 @@ if(FW_BUILD)
if(NOT riscvfw_POPULATED) if(NOT riscvfw_POPULATED)
FetchContent_Populate(riscvfw) FetchContent_Populate(riscvfw)
endif() endif()
set(BOARD tgc-vp) set(BOARD tgc_vp)
add_subdirectory(${riscvfw_SOURCE_DIR}) add_subdirectory(${riscvfw_SOURCE_DIR})
endif() endif()

36
README.md
View File

@ -12,7 +12,6 @@ Using gitpod you can run the VP in the cloud. Just visit [Gitpod.io](https://www
and follow the instructions. After the build finished you can run and follow the instructions. After the build finished you can run
``` ```
build/src/tgc-vp -f fw/hello-world/prebuilt/hello.elf build/src/tgc-vp -f fw/hello-world/prebuilt/hello.elf
``` ```
@ -20,7 +19,6 @@ build/src/tgc-vp -f fw/hello-world/prebuilt/hello.elf
or use ctest: or use ctest:
``` ```
cd build cd build
ctest ctest
@ -38,61 +36,39 @@ You will see on console the prints of the hello world firmware at fw/hello-world
* install conan.io (see also http://docs.conan.io/en/latest/installation.html): * install conan.io (see also http://docs.conan.io/en/latest/installation.html):
``` ```
pip3 install --user 'conan<2.0'
pip3 install --user conan
``` ```
It is advised to use conan version 1.36 or newer. In case of an older version please run
```sh
pip3 install --user --upgrade conan
```
Installing conan for the first time you need to create a profile: Installing conan for the first time you need to create a profile:
``` ```
conan profile create default --detect conan profile create default --detect
``` ```
* checkout source from git * checkout source from git
```sh ```sh
git clone --recursive -b develop https://github.com/Minres/TGC-VP.git git clone --recursive -b develop https://github.com/Minres/TGC-VP.git
``` ```
* start an out-of-source build: * start an out-of-source build:
``` ```
cd TGC-VP cd TGC-VP
mkdir build cmake -S . -B build
cd build cmake --build build -j tgc-vp
cmake ..
make -j tgc-vp
``` ```
* run the VP with pre-built firmware * run the VP with pre-built firmware
``` ```
ctest ctest
``` ```
or or
``` ```
src/tgc-vp -f fw/hello-world/prebuild/hello.elf
src/tgc-vp -f ../fw/hello-world/prebuild/hello.elf
``` ```
To rebuild the firmware you need to install a RISC-V toolchain like https://github.com/riscv/riscv-tools. To rebuild the firmware you need to install a RISC-V toolchain like https://github.com/riscv/riscv-tools.
@ -107,8 +83,6 @@ You need to have to following installed:
* Visual Studio 2019 (community edition is sufficient) with C/C++ support * Visual Studio 2019 (community edition is sufficient) with C/C++ support
* Python 3.6 or newer * Python 3.6 or newer
* SystemC 2.3.3 and SystemC-CCI 1.0.0. Both should be installed into the same location and the
environment variable SYSTEMC_HOME should point to it
* Conan (https://conan.io/) version 1.36 or newer. If python is installed this can be installed using pip * Conan (https://conan.io/) version 1.36 or newer. If python is installed this can be installed using pip
(see above in [Quick start](#quick-start)) (see above in [Quick start](#quick-start))
@ -117,9 +91,7 @@ You need to have to following installed:
Create a project at the location of the git workarea. This can be done Create a project at the location of the git workarea. This can be done
``` ```
devenv <path to checkout> devenv <path to checkout>
``` ```
The build steps are as described in the VS documentation for CMake based projects. The build steps are as described in the VS documentation for CMake based projects.

1
fw/bsp

@ -1 +0,0 @@
Subproject commit 71c7fd698176a45313b50428905837b444050aa9

2
requirements.txt
View File

@ -1 +1 @@
conan<2.0 conan==1.59

2
scc

@ -1 +1 @@
Subproject commit aa3769fd5b313bdfd1ac66b94710c5b2b834e9a4 Subproject commit 59d07fbc6678f5676dc508925ed1982007e350f1

2
tgc-iss/dbt-rise-core

@ -1 +1 @@
Subproject commit 039aad46939353ed31cd801f978853835a4f6c6d Subproject commit b725ff307be15ae274b5b4e97bcb73856212b1b4

2
tgc-iss/dbt-rise-tgc

@ -1 +1 @@
Subproject commit f4f90c5e65573d3bc979f447e3f78f794499d36e Subproject commit fd303c83436fabe397af73686abd0d1158de27a3

2
vpvper

@ -1 +1 @@
Subproject commit 899316db7ec527a46c968199a9c0e0f64e48fc2b Subproject commit c7453a4fc3e7eb1e9c52a168f847e36c625fe7cc