diff mbox

[PATCHv10] validation: add new test l2fwd_run

Message ID 1428056190-7641-1-git-send-email-maxim.uvarov@linaro.org
State New
Headers show

Commit Message

Maxim Uvarov April 3, 2015, 10:16 a.m. UTC 
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 v10: in odp_l2fwd_run simple add PATH to find generator and l2fwd binary.

 test/performance/Makefile.am   |  2 +-
 test/performance/odp_l2fwd_run | 65 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100755 test/performance/odp_l2fwd_run

Comments

Ciprian Barbu April 6, 2015, 9:57 a.m. UTC | #1 
On Fri, Apr 3, 2015 at 1:16 PM, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
> ---
>  v10: in odp_l2fwd_run simple add PATH to find generator and l2fwd binary.
>
>  test/performance/Makefile.am   |  2 +-
>  test/performance/odp_l2fwd_run | 65 ++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 66 insertions(+), 1 deletion(-)
>  create mode 100755 test/performance/odp_l2fwd_run
>
> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
> index b501584..63f73e0 100644
> --- a/test/performance/Makefile.am
> +++ b/test/performance/Makefile.am
> @@ -6,7 +6,7 @@ EXECUTABLES = odp_atomic
>
>  COMPILE_ONLY = odp_scheduling odp_l2fwd
>
> -TESTSCRIPTS = odp_scheduling_run
> +TESTSCRIPTS = odp_scheduling_run odp_l2fwd_run
>
>  if test_perf
>  TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
> diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run
> new file mode 100755
> index 0000000..33296ba
> --- /dev/null
> +++ b/test/performance/odp_l2fwd_run
> @@ -0,0 +1,65 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2015, Linaro Limited
> +# All rights reserved.
> +#
> +# SPDX-License-Identifier:     BSD-3-Clause
> +#
> +
> +TEST_DIR=$(dirname $0)
> +
> +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH
> +
> +# exit codes expected by automake for skipped tests
> +TEST_SKIPPED=77
> +
> +# Use installed pktio env or for make check take it from platform directory
> +if [ -f "./pktio_env" ]; then
> +       . ./pktio_env
> +else if  [ "$ODP_PLATFORM" = "" ]; then
> +       echo "$0: error: ODP_PLATFORM must be defined"
> +       # not skipped as this should never happen via "make check"
> +       exit 1
> +else if [ -f ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ]; then
> +       . ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env
> +else
> +       echo "BUG: unable to find pktio_env!"
> +       echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test."
> +       echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
> +       exit 1
> +       fi
> +fi
> +fi
> +
> +run_l2fwd()
> +{
> +       setup_pktio_env
> +       if [ $? -ne 0 ]; then
> +               echo "setup_pktio_env error $?"
> +               exit $TEST_SKIPPED
> +       fi
> +
> +       #@todo: limit odp_generator to cores
> +       #https://bugs.linaro.org/show_bug.cgi?id=1398
> +       (odp_generator -I $IF0 \
> +                       --srcmac fe:0f:97:c9:e0:44  --dstmac 32:cb:9b:27:2f:1a \

Are the MAC addresses meaningful, they look very different? If they're
random, maybe you should define them at the top of the file, maybe IPs
as well.

> +                       --srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1 > /dev/null) \
> +                       2>&1 > /dev/null &
> +
> +       echo "Run odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2"
> +       odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2
> +
> +       cleanup_pktio_env
> +       if [ $? -ne 0 ]; then
> +               echo "cleanup_pktio_env error $?"
> +               exit $TEST_SKIPPED
> +       fi
> +
> +       exit 0
> +}
> +
> +case "$1" in
> +       setup)   setup_pktio_env   ;;
> +       cleanup) cleanup_pktio_env ;;
> +       *)       run_l2fwd ;;
> +esac
> --
> 1.9.1
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
Maxim Uvarov April 6, 2015, 11:39 a.m. UTC | #2 
On 04/06/15 12:57, Ciprian Barbu wrote:
> On Fri, Apr 3, 2015 at 1:16 PM, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>> ---
>>   v10: in odp_l2fwd_run simple add PATH to find generator and l2fwd binary.
>>
>>   test/performance/Makefile.am   |  2 +-
>>   test/performance/odp_l2fwd_run | 65 ++++++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 66 insertions(+), 1 deletion(-)
>>   create mode 100755 test/performance/odp_l2fwd_run
>>
>> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
>> index b501584..63f73e0 100644
>> --- a/test/performance/Makefile.am
>> +++ b/test/performance/Makefile.am
>> @@ -6,7 +6,7 @@ EXECUTABLES = odp_atomic
>>
>>   COMPILE_ONLY = odp_scheduling odp_l2fwd
>>
>> -TESTSCRIPTS = odp_scheduling_run
>> +TESTSCRIPTS = odp_scheduling_run odp_l2fwd_run
>>
>>   if test_perf
>>   TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>> diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run
>> new file mode 100755
>> index 0000000..33296ba
>> --- /dev/null
>> +++ b/test/performance/odp_l2fwd_run
>> @@ -0,0 +1,65 @@
>> +#!/bin/sh
>> +#
>> +# Copyright (c) 2015, Linaro Limited
>> +# All rights reserved.
>> +#
>> +# SPDX-License-Identifier:     BSD-3-Clause
>> +#
>> +
>> +TEST_DIR=$(dirname $0)
>> +
>> +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH
>> +
>> +# exit codes expected by automake for skipped tests
>> +TEST_SKIPPED=77
>> +
>> +# Use installed pktio env or for make check take it from platform directory
>> +if [ -f "./pktio_env" ]; then
>> +       . ./pktio_env
>> +else if  [ "$ODP_PLATFORM" = "" ]; then
>> +       echo "$0: error: ODP_PLATFORM must be defined"
>> +       # not skipped as this should never happen via "make check"
>> +       exit 1
>> +else if [ -f ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ]; then
>> +       . ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env
>> +else
>> +       echo "BUG: unable to find pktio_env!"
>> +       echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test."
>> +       echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
>> +       exit 1
>> +       fi
>> +fi
>> +fi
>> +
>> +run_l2fwd()
>> +{
>> +       setup_pktio_env
>> +       if [ $? -ne 0 ]; then
>> +               echo "setup_pktio_env error $?"
>> +               exit $TEST_SKIPPED
>> +       fi
>> +
>> +       #@todo: limit odp_generator to cores
>> +       #https://bugs.linaro.org/show_bug.cgi?id=1398
>> +       (odp_generator -I $IF0 \
>> +                       --srcmac fe:0f:97:c9:e0:44  --dstmac 32:cb:9b:27:2f:1a \
> Are the MAC addresses meaningful, they look very different? If they're
> random, maybe you should define them at the top of the file, maybe IPs
> as well.

I copy pasted them from ./odp_generator --help.

Actually it can be anything. But it's question to odp_generator to use 
random values, not to this script.

Maxim.

>
>> +                       --srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1 > /dev/null) \
>> +                       2>&1 > /dev/null &
>> +
>> +       echo "Run odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2"
>> +       odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2
>> +
>> +       cleanup_pktio_env
>> +       if [ $? -ne 0 ]; then
>> +               echo "cleanup_pktio_env error $?"
>> +               exit $TEST_SKIPPED
>> +       fi
>> +
>> +       exit 0
>> +}
>> +
>> +case "$1" in
>> +       setup)   setup_pktio_env   ;;
>> +       cleanup) cleanup_pktio_env ;;
>> +       *)       run_l2fwd ;;
>> +esac
>> --
>> 1.9.1
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/lng-odp
Ciprian Barbu April 7, 2015, 1:40 p.m. UTC | #3 
There was also this problem with the scripts not being able to find
the test binaries, which was fixed by Stuart here:
http://git.linaro.org/lng/odp.git/commit/681336670799981137bc52813a9ee98ee4271c6b

Is it possible to add something similar to odp_l2fwd_run ?

On Mon, Apr 6, 2015 at 2:39 PM, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
> On 04/06/15 12:57, Ciprian Barbu wrote:
>>
>> On Fri, Apr 3, 2015 at 1:16 PM, Maxim Uvarov <maxim.uvarov@linaro.org>
>> wrote:
>>>
>>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>>> ---
>>>   v10: in odp_l2fwd_run simple add PATH to find generator and l2fwd
>>> binary.
>>>
>>>   test/performance/Makefile.am   |  2 +-
>>>   test/performance/odp_l2fwd_run | 65
>>> ++++++++++++++++++++++++++++++++++++++++++
>>>   2 files changed, 66 insertions(+), 1 deletion(-)
>>>   create mode 100755 test/performance/odp_l2fwd_run
>>>
>>> diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
>>> index b501584..63f73e0 100644
>>> --- a/test/performance/Makefile.am
>>> +++ b/test/performance/Makefile.am
>>> @@ -6,7 +6,7 @@ EXECUTABLES = odp_atomic
>>>
>>>   COMPILE_ONLY = odp_scheduling odp_l2fwd
>>>
>>> -TESTSCRIPTS = odp_scheduling_run
>>> +TESTSCRIPTS = odp_scheduling_run odp_l2fwd_run
>>>
>>>   if test_perf
>>>   TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>>> diff --git a/test/performance/odp_l2fwd_run
>>> b/test/performance/odp_l2fwd_run
>>> new file mode 100755
>>> index 0000000..33296ba
>>> --- /dev/null
>>> +++ b/test/performance/odp_l2fwd_run
>>> @@ -0,0 +1,65 @@
>>> +#!/bin/sh
>>> +#
>>> +# Copyright (c) 2015, Linaro Limited
>>> +# All rights reserved.
>>> +#
>>> +# SPDX-License-Identifier:     BSD-3-Clause
>>> +#
>>> +
>>> +TEST_DIR=$(dirname $0)
>>> +
>>> +PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH
>>> +
>>> +# exit codes expected by automake for skipped tests
>>> +TEST_SKIPPED=77
>>> +
>>> +# Use installed pktio env or for make check take it from platform
>>> directory
>>> +if [ -f "./pktio_env" ]; then
>>> +       . ./pktio_env
>>> +else if  [ "$ODP_PLATFORM" = "" ]; then
>>> +       echo "$0: error: ODP_PLATFORM must be defined"
>>> +       # not skipped as this should never happen via "make check"
>>> +       exit 1
>>> +else if [ -f ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ];
>>> then
>>> +       . ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env
>>> +else
>>> +       echo "BUG: unable to find pktio_env!"
>>> +       echo "pktio_env has to be in current directory or in
>>> platform/\$ODP_PLATFORM/test."
>>> +       echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
>>> +       exit 1
>>> +       fi
>>> +fi
>>> +fi
>>> +
>>> +run_l2fwd()
>>> +{
>>> +       setup_pktio_env
>>> +       if [ $? -ne 0 ]; then
>>> +               echo "setup_pktio_env error $?"
>>> +               exit $TEST_SKIPPED
>>> +       fi
>>> +
>>> +       #@todo: limit odp_generator to cores
>>> +       #https://bugs.linaro.org/show_bug.cgi?id=1398
>>> +       (odp_generator -I $IF0 \
>>> +                       --srcmac fe:0f:97:c9:e0:44  --dstmac
>>> 32:cb:9b:27:2f:1a \
>>
>> Are the MAC addresses meaningful, they look very different? If they're
>> random, maybe you should define them at the top of the file, maybe IPs
>> as well.
>
>
> I copy pasted them from ./odp_generator --help.
>
> Actually it can be anything. But it's question to odp_generator to use
> random values, not to this script.
>
> Maxim.
>
>
>>
>>> +                       --srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1
>>> > /dev/null) \
>>> +                       2>&1 > /dev/null &
>>> +
>>> +       echo "Run odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2"
>>> +       odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2
>>> +
>>> +       cleanup_pktio_env
>>> +       if [ $? -ne 0 ]; then
>>> +               echo "cleanup_pktio_env error $?"
>>> +               exit $TEST_SKIPPED
>>> +       fi
>>> +
>>> +       exit 0
>>> +}
>>> +
>>> +case "$1" in
>>> +       setup)   setup_pktio_env   ;;
>>> +       cleanup) cleanup_pktio_env ;;
>>> +       *)       run_l2fwd ;;
>>> +esac
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> lng-odp mailing list
>>> lng-odp@lists.linaro.org
>>> https://lists.linaro.org/mailman/listinfo/lng-odp
>
>
diff mbox

Patch

diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am
index b501584..63f73e0 100644
--- a/test/performance/Makefile.am
+++ b/test/performance/Makefile.am
@@ -6,7 +6,7 @@  EXECUTABLES = odp_atomic
 
 COMPILE_ONLY = odp_scheduling odp_l2fwd
 
-TESTSCRIPTS = odp_scheduling_run
+TESTSCRIPTS = odp_scheduling_run odp_l2fwd_run
 
 if test_perf
 TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
diff --git a/test/performance/odp_l2fwd_run b/test/performance/odp_l2fwd_run
new file mode 100755
index 0000000..33296ba
--- /dev/null
+++ b/test/performance/odp_l2fwd_run
@@ -0,0 +1,65 @@ 
+#!/bin/sh
+#
+# Copyright (c) 2015, Linaro Limited
+# All rights reserved.
+#
+# SPDX-License-Identifier:	BSD-3-Clause
+#
+
+TEST_DIR=$(dirname $0)
+
+PATH=$TEST_DIR:$TEST_DIR/../../example/generator:$PATH
+
+# exit codes expected by automake for skipped tests
+TEST_SKIPPED=77
+
+# Use installed pktio env or for make check take it from platform directory
+if [ -f "./pktio_env" ]; then
+	. ./pktio_env
+else if  [ "$ODP_PLATFORM" = "" ]; then
+	echo "$0: error: ODP_PLATFORM must be defined"
+	# not skipped as this should never happen via "make check"
+	exit 1
+else if [ -f ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env ]; then
+	. ${TEST_DIR}/../../platform/$ODP_PLATFORM/test/pktio_env
+else
+	echo "BUG: unable to find pktio_env!"
+	echo "pktio_env has to be in current directory or in platform/\$ODP_PLATFORM/test."
+	echo "ODP_PLATFORM=\"$ODP_PLATFORM\""
+	exit 1
+	fi
+fi
+fi
+
+run_l2fwd()
+{
+	setup_pktio_env
+	if [ $? -ne 0 ]; then
+		echo "setup_pktio_env error $?"
+		exit $TEST_SKIPPED
+	fi
+
+	#@todo: limit odp_generator to cores
+	#https://bugs.linaro.org/show_bug.cgi?id=1398
+	(odp_generator -I $IF0 \
+			--srcmac fe:0f:97:c9:e0:44  --dstmac 32:cb:9b:27:2f:1a \
+			--srcip 192.168.0.1 --dstip 192.168.0.2 -m u 2>&1 > /dev/null) \
+			2>&1 > /dev/null &
+
+	echo "Run odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2"
+	odp_l2fwd -i $IF1,$IF2 -m 0 -t 30 -c 2
+
+	cleanup_pktio_env
+	if [ $? -ne 0 ]; then
+		echo "cleanup_pktio_env error $?"
+		exit $TEST_SKIPPED
+	fi
+
+	exit 0
+}
+
+case "$1" in
+	setup)   setup_pktio_env   ;;
+	cleanup) cleanup_pktio_env ;;
+	*)       run_l2fwd ;;
+esac