[runtime/test] Remove unused part in test driver (#9395)

- Remove USE_NNAPI related argument; use environment variable directly
- Remove ACL_ENV_ON related argument and implementation: not used

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index 60aaf76..8ae2595 100755 (executable)
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -16,23 +16,6 @@
 
 MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-function switch_nnfw_pacl_kernel_env()
-{
-    local switch=$1  # "ON" or "OFF"
-    local mode=$2    # "acl" or "neon" or ""
-
-    # TODO: Handle whether there is nnfw_kernel_env_list.txt or not
-    local NNFW_KERNEL_ENV_FILE=$MY_PATH/nnfw_kernel_env_list.txt
-
-    for ENV in $(cat $NNFW_KERNEL_ENV_FILE); do
-        if [[ "$switch" == "ON" ]]; then
-            export "$ENV=$mode"
-        else
-            unset "$ENV"
-        fi
-    done
-}
-
 function get_result_of_benchmark_test()
 {
     local RUN_TEST_SH=$1

diff --git a/tests/scripts/nnfw_kernel_env_list.txt b/tests/scripts/nnfw_kernel_env_list.txt
deleted file mode 100644 (file)
index 9cb3fc4..0000000
--- a/tests/scripts/nnfw_kernel_env_list.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-NNFW_KERNEL_convFloat32
-NNFW_KERNEL_averagePoolFloat32
-NNFW_KERNEL_maxPoolFloat32
-NNFW_KERNEL_softmaxFloat32
-NNFW_KERNEL_fullyConnectedFloat32
-NNFW_KERNEL_concatenationFloat32
-NNFW_KERNEL_reshapeGeneric

diff --git a/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt b/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt
deleted file mode 100644 (file)
index ec52c36..0000000
--- a/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-add
-average_pool_2d
-cast
-concat/concat1
-concat/concat2
-conv2d
-depthwise_conv_2d
-div
-embedding_lookup
-exp
-floor
-fullyconnected/fc1
-gather
-hashtable_lookup
-l2_normalization
-l2_pool_2d
-logistic
-max_pool_2d
-mean
-MODELS/inception_module
-MODELS/mobilenet
-mul
-neg
-pad/4D_2D
-relu
-reul6
-reshape
-resize_bilinear
-softmax
-space_to_depth
-squeeze
-strided_slice
-sub
-tanh
-topk_v2
-transpose

diff --git a/tests/scripts/test_driver.sh b/tests/scripts/test_driver.sh
index 51820ce..38b5ff5 100755 (executable)
--- a/tests/scripts/test_driver.sh
+++ b/tests/scripts/test_driver.sh
@@ -46,9 +46,6 @@ function Usage()
     echo "--runtestsh               - (default=\$ARTIFACT_PATH/tests/framework/run_test.sh) run_test.sh with path where it is for framework test and verification"
     echo "--unittestdir             - (default=\$ARTIFACT_PATH/Product/out/unittest) directory that has unittest binaries for unit test"
     echo ""
-    echo "--usennapi                - (default=on)  declare USE_NNAPI=1"
-    echo "--nousennapi              - (default=off) declare nothing about USE_NNAPI"
-    echo "--acl_envon               - (default=off) declare envs for ACL"
     echo "--reportdir               - (default=\$ARTIFACT_PATH/report) directory to save report"
     echo ""
 }
@@ -60,14 +57,12 @@ VERIFICATION_DRIVER_BIN=""
 BENCHMARK_DRIVER_BIN=""
 RUN_TEST_SH=""
 UNIT_TEST_DIR=""
-USE_NNAPI="USE_NNAPI=1"
 ALLTEST_ON="true"
 UNITTEST_ON="false"
 UNITTESTALL_ON="false"
 FRAMEWORKTEST_ON="false"
 VERIFICATION_ON="false"
 BENCHMARK_NEURUN_OP_ON="false"
-ACL_ENV_ON="false"
 PROFILE_ON="false"
 REPORT_DIR=""
 
@@ -96,12 +91,6 @@ do
         --unittestdir=*)
             UNIT_TEST_DIR=${i#*=}
             ;;
-        --usennapi)
-            USE_NNAPI="USE_NNAPI=1"
-            ;;
-        --nousennapi)
-            USE_NNAPI=""
-            ;;
         --unittest)
             ALLTEST_ON="false"
             UNITTEST_ON="true"
@@ -130,9 +119,6 @@ do
             ALLTEST_ON="false"
             BENCHMARK_NEURUN_OP_ON="true"
             ;;
-        --acl_envon)
-            ACL_ENV_ON="true"
-            ;;
         --profile)
             ALLTEST_ON="false"
             PROFILE_ON="true"
@@ -167,17 +153,8 @@ if [ -z "$REPORT_DIR" ]; then
     REPORT_DIR=$ARTIFACT_PATH/report
 fi
 
-# Set env
-if [ -n "$USE_NNAPI" ]; then
-    export "$USE_NNAPI"
-fi
-
 source $TEST_DRIVER_DIR/common.sh
 
-if [ "$ACL_ENV_ON" == "true" ]; then
-    switch_nnfw_pacl_kernel_env "ON" "acl"
-fi
-
 # Run unittest in each part such as Runtime
 if [ "$ALLTEST_ON" == "true" ] || [ "$UNITTEST_ON" == "true" ]; then
     if [ "$UNITTESTALL_ON" == "true" ]; then