nico/master-thesis
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.ethz.ch:nicosc/master-thesis

Browse source
This commit is contained in:
Nico Schottelius 2019-07-23 17:52:11 +02:00
commit e588a197bb
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
netpfga/bind-mount.sh
View file

@ -2,8 +2,6 @@
set -x set -x
mkdir -p ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/
# Remove possible symlinks # Remove possible symlinks
rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/src rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4/src
rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4 rm -f ~/projects/P4-NetFPGA/contrib-projects/sume-sdnet-switch/projects/minip4

7
netpfga/do-all-steps.sh
View file

@ -6,7 +6,12 @@ set -x
echo "First source all variables and THEN run this script" echo "First source all variables and THEN run this script"
read something read something
LOG=~/master-thesis/netpfga/log/compile-$(date +%F-%H%M%S) SUFFIX=""
if [ $# -ge 1 ]; then
SUFFIX="-$1"
fi
LOG=~/master-thesis/netpfga/log/compile-$(date +%F-%H%M%S)$SUFFIX
( (

15
p4src/minip4_solution.p4
View file

@ -50,13 +50,14 @@ struct digest_data_t {
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
parser TopParser(packet_in packet, parser TopParser(packet_in packet,
out headers hdr, out headers hdr,
// out metadata meta, out metadata meta,
out user_metadata_t user_metadata, // out user_metadata_t user_metadata,
out digest_data_t digest_data, out digest_data_t digest_data,
inout sume_metadata_t standard_metadata) { inout sume_metadata_t standard_metadata) {
state start { state start {
packet.extract(hdr.ethernet); packet.extract(hdr.ethernet);
user_metadata.unused = 0; //user_metadata.unused = 0;
meta.task = 0; // all others missing
digest_data.unused = 0; digest_data.unused = 0;
transition accept; transition accept;
@ -77,8 +78,8 @@ parser TopParser(packet_in packet,
// inout sume_metadata_t sume_metadata) { // inout sume_metadata_t sume_metadata) {
control TopPipe(inout headers hdr, control TopPipe(inout headers hdr,
//inout metadata meta, inout metadata meta,
inout user_metadata_t user_metadata, //inout user_metadata_t user_metadata,
inout digest_data_t digest_data, inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) { inout sume_metadata_t sume_metadata) {
@ -244,8 +245,8 @@ control TopPipe(inout headers hdr,
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
control TopDeparser(packet_out packet, control TopDeparser(packet_out packet,
in headers hdr, in headers hdr,
in user_metadata_t user_metadata, //in user_metadata_t user_metadata,
// in metadata meta, in metadata meta,
inout digest_data_t digest_data, inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) { inout sume_metadata_t sume_metadata) {