Skip to content

Commit

Permalink
Replace scripts/cperf with `make benchmarks'.
Browse files Browse the repository at this point in the history
  • Loading branch information
eugeneia committed Sep 25, 2015
1 parent 131890c commit 2384a59
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 433 deletions.
5 changes: 4 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,8 @@ mrproper: clean
$(E) "RM $(RMOBJS)"
$(Q)-rm -rf $(RMOBJS)

.PHONY: clean $(TESTMODS) $(TESTSCRIPTS)
benchmarks:
$(Q) (scripts/bench.sh)

.PHONY: clean $(TESTMODS) $(TESTSCRIPTS) benchmarks

5 changes: 5 additions & 0 deletions src/bench/basic1-100e6
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -e
out=$(./snabb snabbmark basic1 100e6)
# Extract floating point Mpps number from output.
echo "$out" | tail -n 1 | cut -d " " -f 9
13 changes: 13 additions & 0 deletions src/bench/packetblaster-64
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -e

export PCIADDR=$SNABB_PCI_INTEL0
[ ! -z "$PCIADDR" ] || export PCIADDR=$SNABB_PCI0
[ ! -z "$PCIADDR" ] || exit 1

out=$(./snabb packetblaster replay --duration 1 \
program/packetblaster/64.pcap \
"$PCIADDR")
# Extract floating point Mpps number from output.
pps=$(echo "$out" | grep TXDGPC | cut -f 3 | sed s/,//g)
echo "scale=2; $pps / 1000000" | bc
5 changes: 5 additions & 0 deletions src/bench/snabbnfv-iperf-1500
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -e
out=$(program/snabbnfv/selftest.sh bench)
# Extract floating point Gbits number from output.
echo "$out" | grep IPERF-1500 | cut -d " " -f 2
5 changes: 5 additions & 0 deletions src/bench/snabbnfv-iperf-jumbo
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -e
out=$(program/snabbnfv/selftest.sh bench jumbo)
# Extract floating point Gbits number from output.
echo "$out" | grep IPERF-JUMBO | cut -d " " -f 2
5 changes: 5 additions & 0 deletions src/bench/snabbnfv-loadgen-dpdk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -e
out=$(program/snabbnfv/packetblaster_bench.sh)
# Extract floating point Mpps number from output.
echo "$out" | tail -n 1 | cut -f 2
5 changes: 5 additions & 0 deletions src/scripts/bench.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

for bench in $(ls bench/); do
echo $bench $(bench/$bench || echo "0")
done
71 changes: 0 additions & 71 deletions src/scripts/cperf/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions src/scripts/cperf/benchmarks/basic1-10e6

This file was deleted.

18 changes: 0 additions & 18 deletions src/scripts/cperf/benchmarks/iperf-1500

This file was deleted.

18 changes: 0 additions & 18 deletions src/scripts/cperf/benchmarks/iperf-jumbo

This file was deleted.

22 changes: 0 additions & 22 deletions src/scripts/cperf/benchmarks/loadgen-snabb-nic-guest

This file was deleted.

23 changes: 0 additions & 23 deletions src/scripts/cperf/benchmarks/nfvconfig-template

This file was deleted.

24 changes: 0 additions & 24 deletions src/scripts/cperf/benchmarks/packetblaster-64

This file was deleted.

Loading

0 comments on commit 2384a59

Please sign in to comment.