Update `run_benchmark_op.sh` to enable neon properly (#3318)
author이상규/동작제어Lab(SR)/Principal Engineer/삼성전자 <sg5.lee@samsung.com>
Wed, 24 Oct 2018 11:03:30 +0000 (20:03 +0900)
committer오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Wed, 24 Oct 2018 11:03:30 +0000 (20:03 +0900)
Related Issue: #3262

`run_benchmark_op.sh` was written in the era of legacy runtime.
Currently we uses pure acl runtime as default.
Thus, I updated the way of enabling neon, and the labels.

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>
tools/test_driver/run_benchmark_op.sh

index 8ff80a4..c08e93b 100755 (executable)
@@ -131,56 +131,37 @@ function run_benchmark_test()
         REPORT_MODEL_DIR=$BENCHMARK_REPORT_DIR/$MODEL
         mkdir -p $REPORT_MODEL_DIR
 
-        # TFLite(CPU fallback)
+        # TFLite Interpreter
         LOG_FILE=$REPORT_MODEL_DIR/tflite_cpu_op.txt
         RESULT_FILE=$REPORT_MODEL_DIR/tflite_cpu_op.result
-        echo -n "TFLite(CPU fallback)................... "
+        echo -n "TFLite Interpreter............. "
         unset USE_NNAPI
         RESULT=$(get_result_of_benchmark_test $BENCHMARK_RUN_TEST_SH $DRIVER_BIN $MODEL $LOG_FILE)
         echo "$RESULT ms"
-        print_result_of_benchmark_test "TFLite_CPU" $RESULT $RESULT_FILE
+        print_result_of_benchmark_test "TFLite_Interpreter" $RESULT $RESULT_FILE
 
-        # TFLite+NNRuntime(CPU fallback)
-        LOG_FILE=$REPORT_MODEL_DIR/tflite_nnrt_cpu_op.txt
-        RESULT_FILE=$REPORT_MODEL_DIR/tflite_nnrt_cpu_op.result
-        echo -n "TFLite + NNRuntime(CPU fallback)............ "
-        export USE_NNAPI=1
-        RESULT=$(get_result_of_benchmark_test $BENCHMARK_RUN_TEST_SH $DRIVER_BIN $MODEL $LOG_FILE)
-        echo "$RESULT ms"
-        print_result_of_benchmark_test "TFLite_NNRT_CPU" $RESULT $RESULT_FILE
-
-        # TFLite+NNRuntime+ACL-Neon
+        # PureACL-Neon
         LOG_FILE=$REPORT_MODEL_DIR/tflite_nnrt_acl_neon_op.txt
         RESULT_FILE=$REPORT_MODEL_DIR/tflite_nnrt_acl_neon_op.result
-        echo -n "TFLite + NNRuntime + ACL-Neon............ "
-        switch_nnfw_kernel_env "ON" "neon"
+        echo -n "PureACL-Neon................... "
+        export USE_NNAPI=1
+        export NEON=1
         RESULT=$(get_result_of_benchmark_test $BENCHMARK_RUN_TEST_SH $DRIVER_BIN $MODEL $LOG_FILE)
         echo "$RESULT ms"
-        print_result_of_benchmark_test "TFLite_NNRT_ACL-NEON" $RESULT $RESULT_FILE
-        switch_nnfw_kernel_env "OFF"
+        print_result_of_benchmark_test "PureACL_Neon" $RESULT $RESULT_FILE
 
-        # TFLite+NNRuntime+ACL-OpenCL
+        # PureACL-CL
         LOG_FILE=$REPORT_MODEL_DIR/tflite_nnrt_acl_opencl_op.txt
         RESULT_FILE=$REPORT_MODEL_DIR/tflite_nnrt_acl_opencl_op.result
-        echo -n "TFLite + NNRuntime + ACL-OpenCL............ "
-        switch_nnfw_kernel_env "ON" "acl"
+        export USE_NNAPI=1
+        unset NEON
+        echo -n "PureACL-CL..................... "
         RESULT=$(get_result_of_benchmark_test $BENCHMARK_RUN_TEST_SH $DRIVER_BIN $MODEL $LOG_FILE)
         echo "$RESULT ms"
-        print_result_of_benchmark_test "TFLite_NNRT_ACL-OPENCL" $RESULT $RESULT_FILE
-        switch_nnfw_kernel_env "OFF"
+        print_result_of_benchmark_test "PureACL-CL" $RESULT $RESULT_FILE
 
-        # TFLite+PureACLRuntime+ACL-OpenCL
-        if [ ! -d "$PURE_ACL_RT_LIB_PATH" ]; then
-            echo "Skip $MODEL in Pure ACL Runtime "
-            continue
-        fi
-        LOG_FILE=$REPORT_MODEL_DIR/tflite_pureaclrt_acl_opencl_op.txt
-        RESULT_FILE=$REPORT_MODEL_DIR/tflite_pureaclrt_acl_opencl_op.result
-        echo -n "TFLite + PureACLRuntime + ACL-OpenCL............ "
-        RESULT=$(get_result_of_benchmark_test $BENCHMARK_RUN_TEST_SH $DRIVER_BIN $MODEL $LOG_FILE $PURE_ACL_RT_LIB_PATH)
-        echo "$RESULT ms"
-        print_result_of_benchmark_test "TFLite_PUREACLRT_ACL-OPENCL" $RESULT $RESULT_FILE
-        unset USE_NNAPI
+        # Clean Up
+        unset USE_NNAPI NEON
 
         if [[ $i -ne $(echo $BENCHMARK_MODEL_LIST | wc -w)-1 ]]; then
             echo ""