[CI] Revise test report directory (#7994)

Divide test report directory for each scheduler
Use mixed backend test for graph generation test

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

diff --git a/infra/scripts/test_arm_neurun_acl_cl.sh b/infra/scripts/test_arm_neurun_acl_cl.sh
index c418625..0c7e5dd 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_cl.sh
+++ b/infra/scripts/test_arm_neurun_acl_cl.sh
@@ -21,16 +21,16 @@ cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux ./Product/out/unittes
 export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_cl" .
+        --reportdir="$ROOT_PATH/report/acl_cl/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_cl" .
+        --reportdir="$ROOT_PATH/report/acl_cl/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_cl" .
+        --reportdir="$ROOT_PATH/report/acl_cl/parallel" .
 
 popd > /dev/null

diff --git a/infra/scripts/test_arm_neurun_acl_neon.sh b/infra/scripts/test_arm_neurun_acl_neon.sh
index 3c6e6ce..32ea810 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_neon.sh
+++ b/infra/scripts/test_arm_neurun_acl_neon.sh
@@ -22,19 +22,19 @@ export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_neon" .
+        --reportdir="$ROOT_PATH/report/acl_neon/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_neon" .
+        --reportdir="$ROOT_PATH/report/acl_neon/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/acl_neon" .
+        --reportdir="$ROOT_PATH/report/acl_neon/parallel" .
 
 
 popd > /dev/null

diff --git a/infra/scripts/test_arm_neurun_cpu.sh b/infra/scripts/test_arm_neurun_cpu.sh
index 6bf4859..5582ef7 100755 (executable)
--- a/infra/scripts/test_arm_neurun_cpu.sh
+++ b/infra/scripts/test_arm_neurun_cpu.sh
@@ -22,19 +22,19 @@ export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/cpu" .
+        --reportdir="$ROOT_PATH/report/cpu/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/cpu" .
+        --reportdir="$ROOT_PATH/report/cpu/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/cpu" .
+        --reportdir="$ROOT_PATH/report/cpu/parallel" .
 
 # Test tflite_loader
 source ./tests/scripts/test_driver.sh \
@@ -42,6 +42,6 @@ source ./tests/scripts/test_driver.sh \
         --framework_driverbin="$ROOT_PATH/Product/out/bin/tflite_loader_test_tool" \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
         --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report/cpu" .
+        --reportdir="$ROOT_PATH/report/cpu/tfliteloader" .
 
 popd > /dev/null

diff --git a/infra/scripts/test_coverage.sh b/infra/scripts/test_coverage.sh
index 7dd5ece..b0b2bbd 100755 (executable)
--- a/infra/scripts/test_coverage.sh
+++ b/infra/scripts/test_coverage.sh
@@ -26,10 +26,9 @@ pushd $ROOT_PATH > /dev/null
 ./infra/scripts/test_arm_neurun_acl_cl.sh
 ./infra/scripts/test_arm_neurun_acl_neon.sh
 ./infra/scripts/test_arm_neurun_cpu.sh
-./infra/scripts/test_arm_neurun_mixed.sh
 
-# Enable all logs (acl_cl kernel)
-NEURUN_LOG_ENABLE=1 GRAPH_DOT_DUMP=1 ./infra/scripts/test_arm_neurun_acl_cl.sh
+# Enable all logs (mixed kernel)
+NEURUN_LOG_ENABLE=1 GRAPH_DOT_DUMP=1 ./infra/scripts/test_arm_neurun_mixed.sh
 
 # Interpreter
 ./infra/scripts/test_neurun_interp.sh

diff --git a/infra/scripts/test_neurun_interp.sh b/infra/scripts/test_neurun_interp.sh
index 16b6ab3..4162b17 100755 (executable)
--- a/infra/scripts/test_neurun_interp.sh
+++ b/infra/scripts/test_neurun_interp.sh
@@ -19,6 +19,7 @@ export DISABLE_COMPILE=1
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.noarch.interp ./Product/out/unittest/nnapi_gtest.skip
 ./tests/scripts/test_driver.sh \
-  --ldlibrarypath=$ROOT_PATH/Product/out/lib --unittest .
+  --ldlibrarypath=$ROOT_PATH/Product/out/lib --unittest \
+  --reportdir="$ROOT_PATH/report/interp" .
 
 popd > /dev/null