[Fuego] Bonnie fixes

[Fuego] Bonnie fixes

[Daniel Sangorrin]

Hi Tim,

I found out that bonnie wasn't working when I used
the debian armhf toolchain for one of my boards.
The reason was the well-known mis-matching problem
so I decided to modify the test so that it uses
static linking (it worked).

At the same time I added a couple more fixes. Please
check the commit logs for details.

[PATCH 1/4] bonnie: move prechecks to test_pre_check
[PATCH 2/4] bonnie: use static linking
[PATCH 3/4] bonnie: support binaries in the target
[PATCH 4/4] bonnie: add a hint to the parser

Thanks,
Daniel

[Fuego] [PATCH 1/4] bonnie: move prechecks to test_pre_check

[Daniel Sangorrin]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.bonnie/fuego_test.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
index cfa1c95..b96807c 100755
--- a/engine/tests/Benchmark.bonnie/fuego_test.sh
+++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
@@ -1,5 +1,12 @@
 tarball=bonnie++-1.03e.tar.gz
 
+function test_pre_check {
+    assert_define BENCHMARK_BONNIE_MOUNT_BLOCKDEV
+    assert_define BENCHMARK_BONNIE_MOUNT_POINT
+    assert_define BENCHMARK_BONNIE_SIZE
+    assert_define BENCHMARK_BONNIE_ROOT
+}
+
 function test_build {
     ./configure --host=$HOST --build=`uname -m`-linux-gnu;
     make
@@ -10,11 +17,6 @@ function test_deploy {
 }
 
 function test_run {
-    assert_define BENCHMARK_BONNIE_MOUNT_BLOCKDEV
-    assert_define BENCHMARK_BONNIE_MOUNT_POINT
-    assert_define BENCHMARK_BONNIE_SIZE
-    assert_define BENCHMARK_BONNIE_ROOT
-
     if [ -z "$BENCHMARK_BONNIE_RAM" ] ; then
         BENCHMARK_BONNIE_RAM=0
     fi
-- 
2.7.4

[Fuego] [PATCH 2/4] bonnie: use static linking

[Daniel Sangorrin]

I already found problems running the test on newer file systems
because the runtime C++ library was mis-matching so make it
link static. ./configure doesn't seem to have an option
for that so I dig into the Makefile and found this LFLAGS,
which looks like an errata of LDFLAGS, and used it to
add the -static flag.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.bonnie/fuego_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
index b96807c..4831de9 100755
--- a/engine/tests/Benchmark.bonnie/fuego_test.sh
+++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
@@ -9,7 +9,7 @@ function test_pre_check {
 
 function test_build {
     ./configure --host=$HOST --build=`uname -m`-linux-gnu;
-    make
+    LFLAGS="-static" make
 }
 
 function test_deploy {
-- 
2.7.4

[Fuego] [PATCH 3/4] bonnie: support binaries in the target

[Daniel Sangorrin]

This should be done with the NEED_XXX framework so that
the build and deploy phases are skipped. But since that
is not yet available I added some ifs for now.

I tested it on debian jessie and found that the output
format of new versions of bonnie has changed and for
that reason our parser fails. I think we should upgrade
the test version, maybe for the next release.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.bonnie/fuego_test.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
index 4831de9..a6240fb 100755
--- a/engine/tests/Benchmark.bonnie/fuego_test.sh
+++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
@@ -5,15 +5,22 @@ function test_pre_check {
     assert_define BENCHMARK_BONNIE_MOUNT_POINT
     assert_define BENCHMARK_BONNIE_SIZE
     assert_define BENCHMARK_BONNIE_ROOT
+    is_on_target_path bonnie\+\+ PROGRAM_BONNIE
 }
 
 function test_build {
-    ./configure --host=$HOST --build=`uname -m`-linux-gnu;
-    LFLAGS="-static" make
+    if [ -z "$PROGRAM_BONNIE" ]; then
+        ./configure --host=$HOST --build=`uname -m`-linux-gnu;
+        LFLAGS="-static" make
+    else
+        echo "Skipping build phase, bonnie++ is already on the target"
+    fi
 }
 
 function test_deploy {
-    put bonnie++  $BOARD_TESTDIR/fuego.$TESTDIR/
+    if [ -z "$PROGRAM_BONNIE" ]; then
+        put bonnie++  $BOARD_TESTDIR/fuego.$TESTDIR/
+    fi
 }
 
 function test_run {
@@ -33,7 +40,13 @@ function test_run {
         BONNIE_ROOT_PARAM=""
     fi
 
-    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR $BONNIE_ROOT_PARAM -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM -n $BENCHMARK_BONNIE_NUM_FILES -m $NODE_NAME"
+    if [ -z "$PROGRAM_BONNIE" ]; then
+        BONNIE_CMD="./bonnie\+\+"
+    else
+        BONNIE_CMD="bonnie\+\+"
+    fi
+
+    report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; $BONNIE_CMD -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR $BONNIE_ROOT_PARAM -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM -n $BENCHMARK_BONNIE_NUM_FILES -m $NODE_NAME"
 
     sync
 
-- 
2.7.4

[Fuego] [PATCH 4/4] bonnie: add a hint to the parser

[Daniel Sangorrin]

My boards are too powerful for the default spec but the parser
was not giving any hint for the failure. I added a small hint
so that users know they should change their spec.

Note: personally I would make the more-data spec the default spec.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/tests/Benchmark.bonnie/parser.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engine/tests/Benchmark.bonnie/parser.py b/engine/tests/Benchmark.bonnie/parser.py
index f5e809a..a2bdf00 100755
--- a/engine/tests/Benchmark.bonnie/parser.py
+++ b/engine/tests/Benchmark.bonnie/parser.py
@@ -81,4 +81,8 @@ if not '+' in results[25]:
 if not '+' in results[26]:
     measurements["Random_Create.Delete"].append({"name": "CPU", "measure" : float(results[26])})
 
+# Add a hint when the spec seems to require a bigger SIZE
+if '+' in results[4]:
+    print "\nWARNING: it seems like you need bigger size, try the more-data spec\n"
+
 sys.exit(plib.process(measurements))
-- 
2.7.4

Re: [Fuego] Bonnie fixes

[Tim.Bird]

OK - all fixes look good.  
Applied and pushed.

Thanks very much!

I actually took a look at the compiler warnings, on one of my platforms,
and one of them was reporting a real bug.  I fixed this and  put another
patch on top of these for this test.

Thanks again.
 -- Tim


> -----Original Message-----
> From: fuego-bounces@lists.linuxfoundation.org [mailto:fuego-
> bounces@lists.linuxfoundation.org] On Behalf Of Daniel Sangorrin
> Sent: Wednesday, March 28, 2018 1:32 AM
> To: fuego@lists.linuxfoundation.org
> Subject: [Fuego] Bonnie fixes
> 
> Hi Tim,
> 
> I found out that bonnie wasn't working when I used
> the debian armhf toolchain for one of my boards.
> The reason was the well-known mis-matching problem
> so I decided to modify the test so that it uses
> static linking (it worked).
> 
> At the same time I added a couple more fixes. Please
> check the commit logs for details.
> 
> [PATCH 1/4] bonnie: move prechecks to test_pre_check
> [PATCH 2/4] bonnie: use static linking
> [PATCH 3/4] bonnie: support binaries in the target
> [PATCH 4/4] bonnie: add a hint to the parser
> 
> Thanks,
> Daniel
> 
> 
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego