3 files changed, 71 insertions, 1 deletions
diff --git a/configs/boot/netperf-stream-udp-client.rcS b/configs/boot/netperf-stream-udp-client.rcS
new file mode 100644
index 000000000..91268ea50
--- /dev/null
+++ b/configs/boot/netperf-stream-udp-client.rcS
@@ -0,0 +1,45 @@
+#!/bin/sh
+SERVER=10.0.0.1
+CLIENT=10.0.0.2
+
+echo "setting up network..."
+ifconfig lo 127.0.0.1
+ifconfig eth0 $CLIENT txqueuelen 1000
+
+echo "0" > /proc/sys/net/ipv4/tcp_timestamps
+echo "0" > /proc/sys/net/ipv4/tcp_sack
+echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_rmem
+echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_wmem
+echo "5000000 5000000 5000000" > /proc/sys/net/ipv4/tcp_mem
+echo "262143" > /proc/sys/net/core/rmem_max
+echo "262143" > /proc/sys/net/core/wmem_max
+echo "262143" > /proc/sys/net/core/rmem_default
+echo "262143" > /proc/sys/net/core/wmem_default
+echo "262143" > /proc/sys/net/core/optmem_max
+echo "100000" > /proc/sys/net/core/netdev_max_backlog
+
+echo -n "waiting for server..."
+netcat -c -l -p 8000
+
+BINARY=/benchmarks/netperf-bin/netperf
+TEST="UDP_STREAM"
+SHORT_ARGS="-l 2 -- -m 4096"
+#LONG_ARGS="-k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144"
+
+
+SHORT="$BINARY -H $SERVER -t $TEST $SHORT_ARGS"
+LONG="$BINARY -H $SERVER -t $TEST $LONG_ARGS"
+
+echo "starting test..."
+echo "netperf warmup"
+echo $SHORT
+eval $SHORT
+
+#echo "netperf benchmark"
+#echo $LONG
+#/sbin/m5 ivlb 1
+#/sbin/m5 resetstats
+#/sbin/m5 dumpresetstats 200000000 2000000000
+#/sbin/m5 checkpoint 200000000 2000000000
+#eval $LONG
+/sbin/m5 exit
diff --git a/configs/boot/netperf-stream-udp-local.rcS b/configs/boot/netperf-stream-udp-local.rcS
new file mode 100644
index 000000000..ccd7654e2
--- /dev/null
+++ b/configs/boot/netperf-stream-udp-local.rcS
@@ -0,0 +1,22 @@
+#!/bin/sh
+SERVER=127.0.0.1
+CLIENT=127.0.0.1
+
+echo "setting up network..."
+ifconfig lo 127.0.0.1
+
+BINARY=/benchmarks/netperf-bin/netperf
+TEST="UDP_STREAM"
+SHORT_ARGS="-l 2 -- -m 4096"
+
+echo "running netserver..."
+/benchmarks/netperf-bin/netserver
+
+
+SHORT="$BINARY -H $SERVER -t $TEST $SHORT_ARGS"
+
+echo "starting test..."
+echo $SHORT
+eval $SHORT
+
+/sbin/m5 exit
diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py
index eda0e80f9..9ec0f97b1 100644
--- a/configs/common/Benchmarks.py
+++ b/configs/common/Benchmarks.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,9 @@ Benchmarks = {
 
     'NetperfStream':	[SysConfig('netperf-stream-client.rcS'),
                          SysConfig('netperf-server.rcS')],
+    'NetperfStreamUdp':	[SysConfig('netperf-stream-udp-client.rcS'),
+                         SysConfig('netperf-server.rcS')],
+    'NetperfUdpLocal':	[SysConfig('netperf-stream-udp-local.rcS')],
     'NetperfStreamNT':	[SysConfig('netperf-stream-nt-client.rcS'),
                          SysConfig('netperf-server.rcS')],
     'NetperfMaerts':	[SysConfig('netperf-maerts-client.rcS'),