Tests: Bump up TRIV Arch Spec to v2.4.4

This patch bumps up the test cases' TRIV Arch Spec to v2.4.4. This is a
workaround to enable CI/CD pipelines.

Change-Id: Ic1a24dbcdc3f4da72dd5e197f0c509316e967702
Signed-off-by: Wook Song <wook16.song@samsung.com>

diff --git a/tests/apptests/meson.build b/tests/apptests/meson.build
index 2905d9c2be1811496a959b113ec61e8f59aa76a6..acdb0e5d17faa5e05e1996f9167c92d91309756f 100644 (file)
--- a/tests/apptests/meson.build
+++ b/tests/apptests/meson.build
@@ -179,15 +179,15 @@ test('apptest_tvn_triv23_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ jo
 
 # Test TRIV 2.4
 
-test('apptest_tvn_triv24', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '-v', '2.4' ], timeout: 100, suite: ['fast-test'])
-test('apptest_tvn_triv24_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV243/MAX_POOL_2D_000')+','+join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '2.4' ], suite: ['fast-test'])
-test('apptest_tvn_triv24_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/MOBILENET_V1'), '-v', '2.4' ], timeout : 200, suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '1', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '2', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '3', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '4', '10', '-v', '2.4'], suite: ['fast-test'])
-test('apptest_tvn_triv24_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/MOBILENET_V1'), '-p', 'visa', '-v', '2.4'], timeout: 100, suite: ['fast-test'])
-test('apptest_tvn_triv24_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243/CONV_2D_300'), '-v', '2.4'], timeout : 100, suite: ['fast-test'])
+test('apptest_tvn_triv24', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '-v', '2.4' ], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv24_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV244/MAX_POOL_2D_000')+','+join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '2.4' ], suite: ['fast-test'])
+test('apptest_tvn_triv24_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/MOBILENET_V1'), '-v', '2.4' ], timeout : 200, suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '1', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '2', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '3', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '4', '10', '-v', '2.4'], suite: ['fast-test'])
+test('apptest_tvn_triv24_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/MOBILENET_V1'), '-p', 'visa', '-v', '2.4'], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv24_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244/CONV_2D_300'), '-v', '2.4'], timeout : 100, suite: ['fast-test'])
 test('apptest_tvn_triv24_xml', apptest_tvn_triv2_xml, env: testenv, args: [join_paths(meson.source_root(), 'utils/resource/model_24.xml'), '-v', '2.4'], timeout: 100, suite: ['fast-test'])
 
-test('apptest_tvn_triv24_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV243'), '-v', '2.4'], timeout: 2500)
+test('apptest_tvn_triv24_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV244'), '-v', '2.4'], timeout: 2500)

diff --git a/utils/resource/model_24.xml b/utils/resource/model_24.xml
index 7a958747700b1f5e1463c25f150113659874ab70..f27a5acce7c943cf91aabcb1b61ea9f1e168bba6 100644 (file)
--- a/utils/resource/model_24.xml
+++ b/utils/resource/model_24.xml
@@ -1,8 +1,8 @@
 <testcases>
  <model name="mobilenet_v1" timeout="3000" priority="1">
-  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV243/MOBILENET_V1</dirpath>
+  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV244/MOBILENET_V1</dirpath>
  </model>
  <model name="mobilenet_v2" timeout="1000" priority="2">
-  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV243/MOBILENET_V2</dirpath>
+  <dirpath>/opt/trinity/share/npu-engine/testdata/TRIV244/MOBILENET_V2</dirpath>
  </model>
 </testcases>

diff --git a/utils/trinity_test/model.xml.in b/utils/trinity_test/model.xml.in
index b2e5c13f5e3339106aaf56a01f054f3038c26adc..2c1a8cf209f755e8a83da80aef768e43c2aa74d7 100644 (file)
--- a/utils/trinity_test/model.xml.in
+++ b/utils/trinity_test/model.xml.in
@@ -1,8 +1,8 @@
 <testcases>
  <model name="mobilenet_v1" timeout="3000" priority="1">
-  <dirpath>@PREFIX_SHARE@/npu-engine/testdata/TRIV243/MOBILENET_V1</dirpath>
+  <dirpath>@PREFIX_SHARE@/npu-engine/testdata/TRIV244/MOBILENET_V1</dirpath>
  </model>
  <model name="mobilenet_v2" timeout="1000" priority="2">
-  <dirpath>@PREFIX_SHARE@/npu-engine/testdata/TRIV243/MOBILENET_V2</dirpath>
+  <dirpath>@PREFIX_SHARE@/npu-engine/testdata/TRIV244/MOBILENET_V2</dirpath>
  </model>
 </testcases>