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

Merge branch 'develop' into main

This commit is contained in:
Eyck Jentzsch 2023-12-17 12:29:06 +01:00
parent a11dea0e98 e279e8967e
commit 8344303e50
7 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Jenkinsfile vendored
View File

@ -7,6 +7,7 @@ def getBranch() {
}
void checkout_tgc_vp() {
sh("rm -rf *")
checkout([
$class: 'GitSCM',
branches: [
@ -55,46 +56,54 @@ pipeline {
}
stages {
stage('tgc-VP pipeline') {
stage('TGC-VP pipeline') {
parallel {
stage('ubuntu20'){
agent {docker { image 'ubuntu-20.04' } }
stages {
stage('Checkout on Ubuntu20.04') { steps { checkout_tgc_vp() }}
stage('Build') { steps { build_tgc_vp() } }
}
}
stage('ubuntu22'){
agent {docker { image 'ubuntu-22.04' } }
stages {
stage('Checkout on Ubuntu22.04') { steps { checkout_tgc_vp() }}
stage('Build') { steps { build_tgc_vp() } }
}
}
stage('Fedora28'){
agent {docker { image 'fedora28' } }
stages {
stage('Checkout on Fedora') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp() }}
}
}
stage('CentOS7'){
agent {docker { image 'centos7' } }
stages {
stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp()}
}
}
}
stage('RockyLinux8'){
agent {docker { image 'rockylinux8' } }
stages {
stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp()}
}
}
}
}
stage('ubuntu20'){
agent {docker { image 'ubuntu-20.04' } }
stages {
stage('Checkout on Ubuntu20.04') { steps { checkout_tgc_vp() }}
stage('Build') { steps { build_tgc_vp() } }
}
}
stage('ubuntu22'){
agent {docker { image 'ubuntu-22.04' } }
stages {
stage('Checkout on Ubuntu22.04') { steps { checkout_tgc_vp() }}
stage('Build') { steps { build_tgc_vp() } }
}
}
stage('CentOS7'){
agent {docker { image 'centos7' } }
stages {
stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp()}
}
}
}
stage('RockyLinux8'){
agent {docker { image 'rockylinux8' } }
stages {
stage('Checkout on Ubuntu') { steps {checkout_tgc_vp()}}
stage('Build') { steps {build_tgc_vp()}
}
}
}
}
}
}
post {
success {
rocketSend ":thumbsup: TGC-VP verification run passed, results at ${env.RUN_DISPLAY_URL} "
}
failure {
archiveArtifacts artifacts: 'failed_seeds_*.txt', followSymlinks: false, onlyIfSuccessful: false
rocketSend ":thumbsdown: TGC-VP verification failed, please check ${env.RUN_DISPLAY_URL} "
emailext recipientProviders: [culprits(), requestor()],
subject: "TGC-VP Pipeline Failed: ${currentBuild.fullDisplayName}",
body: """
<p>Build Status: ${currentBuild.currentResult}</p>
<p> Check logs at <a href='${env.BUILD_URL}console'> Build Console Logs </a> or at <a href='${env.RUN_DISPLAY_URL}'> Overview </a></p>
"""
}
}
}

2
scc

@ -1 +1 @@
Subproject commit 7cf3d94c133b000e9dd5d29b5b7da670a15f0859
Subproject commit 1e7db7caf1117ec434b2d272a8556c6dded99b21

9
src/tgc_vp/system.cpp
View File

@ -14,16 +14,7 @@ using namespace sysc::tgfs;
system::system(sc_core::sc_module_name nm)
: sc_core::sc_module(nm)
, NAMED(router, platfrom_mmap.size() + 2, 2)
, NAMEDC(qspi0_ptr, spi, spi_impl::beh)
, NAMEDC(qspi1_ptr, spi, spi_impl::beh)
, NAMEDC(qspi2_ptr, spi, spi_impl::beh)
, qspi0(*qspi0_ptr)
, qspi1(*qspi1_ptr)
, qspi2(*qspi2_ptr)
{
auto& qspi0 = *qspi0_ptr;
auto& qspi1 = *qspi1_ptr;
auto& qspi2 = *qspi2_ptr;
core_complex.ibus(router.target[0]);
core_complex.dbus(router.target[1]);
size_t i = 0;

6
src/tgc_vp/system.h
View File

@ -44,7 +44,7 @@ private:
scc::router<> router;
vpvper::sifive::uart_terminal uart0{"uart0"};
vpvper::sifive::uart uart1{"uart1"};
std::unique_ptr<vpvper::sifive::spi> qspi0_ptr, qspi1_ptr, qspi2_ptr;
vpvper::sifive::spi qspi0{"qspi0"}, qspi1{"qspi1"}, qspi2{"qspi2"};
vpvper::sifive::pwm pwm0{"pwm0"}, pwm1{"pwm1"}, pwm2{"pwm2"};
vpvper::sifive::gpio gpio0{"gpio0"};
vpvper::sifive::plic plic{"plic"};
@ -65,11 +65,7 @@ private:
sc_core::sc_vector<sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS>> global_int_s{"global_int_s", 256}, local_int_s{"local_int_s", 16};
sc_core::sc_signal<bool, sc_core::SC_MANY_WRITERS> core_int_s{"core_int_s"};
protected:
void gen_reset();
vpvper::sifive::spi& qspi0;
vpvper::sifive::spi& qspi1;
vpvper::sifive::spi& qspi2;
#include "tgc_vp/gen/platform_mmap.h"
};

2
tgc-iss/dbt-rise-core

@ -1 +1 @@
Subproject commit 3743f38999fc6ddd87e8553dc1cf3a5fa3a7e0cd
Subproject commit 039aad46939353ed31cd801f978853835a4f6c6d

2
tgc-iss/dbt-rise-tgc

@ -1 +1 @@
Subproject commit 926a03c346ba5128be510f5d3067e76c6daaffd9
Subproject commit f4f90c5e65573d3bc979f447e3f78f794499d36e

2
vpvper

@ -1 +1 @@
Subproject commit 2df18a17549559131f52f9bcc90d3cef44aa4f5d
Subproject commit 0b2dba5820ac06821306121f1d80b6b077fda4da