Commit graph

15829 commits

Author SHA1 Message Date
David Gross
29d90d1455 "successful preparation means successful execution" guarantee neglects bad operation inputs
Under certain circumstances, we guarantee that a prepared model can be
executed successfully.  In describing those circumstances, we
neglected to specify that operation input operands must have legal
values for the guarantee to hold.  For example, the guarantee doesn't
hold if an ADD operation has an activation input that is not one of
the defined values; or if a RESHAPE operation has a shape input in
which two or more components are -1.

This change modifies the guarantee to apply only when operation input
operands have legal values.  It also documents this guarantee for
burst execution.

Note that if an operation has an input operand that can be proven to
have an illegal value at preparation time (e.g., a constant value that
is illegal), model preparation might (but is not required to) fail for
that reason.

Bug: 135933040

Test: $ cd neuralnetworks ; mma
Change-Id: I8b421550dd89e4bbbdae899e7cb5e9e88a46d2fb
(cherry picked from commit 48544cc38a)
2019-09-12 14:27:35 -07:00
Michael Butler
71cb010ba3 Merge "Consolidate NNAPI VTS utility code" 2019-09-11 19:03:06 +00:00
Michael Butler
13b0516e56 Consolidate NNAPI VTS utility code
This CL does additional NNAPI VTS test cleanup, including consolidating
duplicate functionality. Specifically, this CL:
* consolidates the createPreparedModel function, removing the duplicate
* consolidates the std::out ErrorStatus and DeviceStatus code into Utils
* changes non-null constant pointers to constant references
* removes redudant leading namespace specifiers (V1_0::, ::testing, etc.)
* makes the Valdiation tests free functions
* renames device to kDevice and mTestModel to kTestModel

Bug: N/A
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Change-Id: Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7
Merged-In: Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7
(cherry picked from commit e16af0a44b)
2019-09-11 11:04:54 -07:00
Colin Cross
5d81a5814b Remove unused libcrypto dependency.
libcrypto is unused, which causes problems when boringssl hash
injection is turned on as the code is all stripped and there is
nothing left to inject the hash into.

Bug: 137267623
Test: Ran the following together with the changes from
      http://r.android.com/q/topic:bug137267623_bsslselftest

      m VtsHalDrmV1_{0,1,2}TargetTest \
        VtsHalWifiHostapdV1_{0,1}TargetTest{,Util} \
        VtsHalWifiSupplicantV1_{0,1,2}TargetTest{,Util} \
        VtsHalWifiSupplicantP2pV1_{0,2}TargetTest

      (croot hardware/interfaces/confirmationui ; mma)
      (croot hardware/interfaces/drm ; mma)
      (croot hardware/interfaces/keymaster ; mma)

Change-Id: Ib0607671ef71d99becb483774f810aad9762f4f1
2019-09-10 00:05:33 +01:00
Amy
98cf3408af Tuner HAL Demux Filter VTS
Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 135708935
Change-Id: I2b6b7e904cb274e7ccd10e481b04dfd9394afe3e
Merged-In: I2b6b7e904cb274e7ccd10e481b04dfd9394afe3e
2019-09-06 22:40:40 +00:00
Amy
481066c7ce Tuner HAL Filter APIs default implementation
Bug: 135709325
Test: manual
Change-Id: If10acac560d3130105079121602be576eb0b225a
Merged-In: If10acac560d3130105079121602be576eb0b225a
2019-09-06 22:40:09 +00:00
Amy Zhang
aedfe936ef Merge changes I1f2c9bfe,I38a92abb
* changes:
  Tuner HAL VTS for Demux and Descrambler Interface.
  Tuner HAL default implementation for Demux and Descrambler Interface.
2019-09-06 21:35:56 +00:00
Treehugger Robot
b1f3e7d8ee Merge "Add filter function to Demux interface and Add program info to Descrambler" 2019-09-06 21:14:23 +00:00
Steven Moreland
6b62c58a9a Merge "Remove libhwbinder/libhidltransport deps" 2019-09-06 19:33:26 +00:00
Treehugger Robot
321f443d65 Merge "Using named pipe as input/output of the CEC hal mock impl" 2019-09-06 03:47:13 +00:00
Henry Fang
7d01fdb66e Add filter function to Demux interface and Add program info to Descrambler
bug: 135708935
Test: Manual
Change-Id: Iacaebdac6a8ce08ca47ae272be13d51fbd502959
Merged-In: Iacaebdac6a8ce08ca47ae272be13d51fbd502959
2019-09-06 02:55:39 +00:00
Amy Zhang
7048f252cf Merge "Add Demux and Descrambler interface to Tuner HAL Test: Manual bug: 135709729" 2019-09-06 01:42:09 +00:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Treehugger Robot
52119b7ee2 Merge "Adding OWNER for the TunerHAL implementation" 2019-09-05 23:31:22 +00:00
Treehugger Robot
9cee443046 Merge "Add an OWNER file to the Tuner HAL 1.0 VTS" 2019-09-05 22:03:51 +00:00
Amy
4a93c03793 Tuner HAL VTS for Demux and Descrambler Interface.
Bug: 135708935
Test: Manual
Change-Id: I1f2c9bfe6036dc6070dbf88d9728645f2568dcde
Merged-In: I1f2c9bfe6036dc6070dbf88d9728645f2568dcde
2019-09-05 21:55:24 +00:00
Amy
4424c6e20a Tuner HAL default implementation for Demux and Descrambler Interface.
Bug: 135709325
Test: Manual
Change-Id: I38a92abb761d2d39e8e6a495f2d93dee5f1c9d90
Merged-In: I38a92abb761d2d39e8e6a495f2d93dee5f1c9d90
2019-09-05 21:55:17 +00:00
Henry Fang
cf05ed7e03 Add Demux and Descrambler interface to Tuner HAL
Test: Manual
bug: 135709729

Change-Id: I78283acdd7c22a2d4a785fa050bedd5e7ccc593e
Merged-In: I78283acdd7c22a2d4a785fa050bedd5e7ccc593e
2019-09-05 21:54:32 +00:00
Amy
7bbbdd2499 Adding OWNER for the TunerHAL implementation
Test: manual
Change-Id: Ia716b7ddabe80203b19d80cf54efb7fb93df3e10
2019-09-05 11:01:25 -07:00
Amy
5c6e59b1b0 Add an OWNER file to the Tuner HAL 1.0 VTS
Test: manual
Change-Id: I2e5992a827dc430118cfbd68982c4ef08aa9b0e1
2019-09-05 10:56:25 -07:00
Xin Li
8190dbeef0 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:18 +00:00
Treehugger Robot
0504b501ff Merge "Rename a2dp impl as mock." 2019-09-05 10:53:27 +00:00
Xin Li
e55800f1fc DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I77f2eb0feebc7f2c49bf693e96a6b63265ea4beb
2019-09-04 13:34:19 -07:00
Steven Moreland
59d39ab02c Rename a2dp impl as mock.
So that it isn't accidentally used.

Bug: 140115084
Test: codesearching for usages
Change-Id: I2736a875d8a3021ce496847c45259f10aa148bc0
2019-08-30 11:53:44 -07:00
Michael Butler
f952adda07 Cleanup NNAPI VTS tests
am: 62749b917e

Change-Id: Ia71e9765a810b2f07c4dbec5e101e357c64ba91d
2019-08-30 11:17:32 -07:00
Michael Butler
62749b917e Cleanup NNAPI VTS tests
This CL includes the following cleanups:
* namespace compression
* remove "using" from header files
* remove no-op code, default no-op constructors
* clang-formats the code

Bug: N/A
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest
Change-Id: I023997d8686ca65223858eed3a0881f5444ed2d6
Merged-In: I023997d8686ca65223858eed3a0881f5444ed2d6
(cherry picked from commit bbe5dad266)
2019-08-29 12:55:56 -07:00
David Gross
c9981f9592 Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return"
am: 15b826ad6a

Change-Id: I81b920f6c0edb6f1709af8d8b609e21d64e5755e
2019-08-29 11:14:21 -07:00
David Gross
15b826ad6a Merge "Fix V1_2::IDevice::getType documentation: was @param instead of @return" 2019-08-29 17:44:04 +00:00
Michael Butler
52da1b820c NNAPI Combine Compatability test with VTS test
am: 3247f76e35

Change-Id: If447a9db2d0a9d5906396eb5f927a0df13f868ae
2019-08-28 14:12:36 -07:00
Michael Butler
ba2da6c2d3 Change NNAPI VTS to use static library
am: 01ba094edb

Change-Id: Ia6d6fc4f68c77a36c514025af4384bbe18b0db99
2019-08-28 14:12:28 -07:00
Xusong Wang
0ac1896ef5 Merge changes from topic "nnapi_test_dynamic_reg"
am: 6568622209

Change-Id: I298f137a70b07bdb7f9e6f85d8b293ec1bad7c86
2019-08-28 13:21:01 -07:00
Xusong Wang
5fb57da9a2 Update VTS tests with the new test harness.
am: bcaa78293a

Change-Id: I690d0111167d8ec1e7db98021a6f302dfe01f839
2019-08-28 13:20:49 -07:00
David Gross
9dedd439ab Fix V1_2::IDevice::getType documentation: was @param instead of @return
Bug: 124346013

Test: $ cd neuralnetworks/1.2 ; mma
Change-Id: I45d1320a9edae73cde7d9ccaca57b5b9519b0210
Merged-In: I45d1320a9edae73cde7d9ccaca57b5b9519b0210
(cherry picked from commit c7cdd550a0)
2019-08-28 11:40:01 -07:00
Michael Butler
3247f76e35 NNAPI Combine Compatability test with VTS test
Bug: 139889855
Fixes: 140120312
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Change-Id: Ib93d159dc657eaf292d16140ebdd9de3b0f5f1d3
Merged-In: Ib93d159dc657eaf292d16140ebdd9de3b0f5f1d3
(cherry picked from commit 72227f3ef8)
2019-08-28 11:35:29 -07:00
Michael Butler
01ba094edb Change NNAPI VTS to use static library
This CL also adds Compilation Caching tests to the Presubmit tests,
which were missing configuration files before.

Bug: 139889855
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Test: VtsHalNeuralnetworksV1_*CompatV1_*TargetTest (with sample-all)
Change-Id: I65274b5f72def815ff238a8d8df10c9d014afc44
Merged-In: I65274b5f72def815ff238a8d8df10c9d014afc44
(cherry picked from commit f7a8f03e3d)
2019-08-28 11:34:58 -07:00
Xusong Wang
6568622209 Merge changes from topic "nnapi_test_dynamic_reg"
* changes:
  Statically check test enums against HIDL definitions.
  Update VTS tests with the new test harness.
2019-08-28 18:02:59 +00:00
Steven Moreland
c0f9a7935b Merge "Rename dumpstate service to include '.example'."
am: b25a7316a5

Change-Id: I4d40f208d81bc4bf48f6808bee0d164aef4be206
2019-08-27 16:26:16 -07:00
Xusong Wang
e44f9e509c [automerger skipped] Merge changes from topic "nnapi-cp-test-model"
am: 70764914db -s ours
am skip reason: change_id I54ac97f62898e47a338b51cc6d895a0309ab001f with SHA1 6d0270b056 is in history

Change-Id: Iedddfbe74f07a856dbe63d07cd4ee9d629c88883
2019-08-27 16:25:43 -07:00
Xusong Wang
ee80b02ae9 Statically check test enums against HIDL definitions.
Fixes: 123092187
Test: mma all VTS
Test: Attempt to modify test enum value,
      confirm that there is build error with proper error message.

Change-Id: I0129378c87637b33bb145ec93307634273a9d2fd
Merged-In: I0129378c87637b33bb145ec93307634273a9d2fd
(cherry picked from commit cbfa6b998e)
2019-08-27 16:09:30 -07:00
Xusong Wang
bcaa78293a Update VTS tests with the new test harness.
Bug: 120601396
Test: All VTS
Change-Id: I539e75585b2cc01d153565814491361adfa048be
Merged-In: I539e75585b2cc01d153565814491361adfa048be
(cherry picked from commit 9e2b97b83c)
2019-08-27 16:09:12 -07:00
Xusong Wang
a94e5846da [automerger skipped] Modify 1.2 VTS tests to consume test struct directly.
am: ead950d402 -s ours
am skip reason: change_id I54ac97f62898e47a338b51cc6d895a0309ab001f with SHA1 6d0270b056 is in history

Change-Id: Iee182115d04a18f7b99730843997fdbc7b37a9bd
2019-08-27 16:07:47 -07:00
Treehugger Robot
b25a7316a5 Merge "Rename dumpstate service to include '.example'." 2019-08-27 22:57:45 +00:00
Treehugger Robot
70764914db Merge changes from topic "nnapi-cp-test-model"
* changes:
  Modify 1.2 VTS tests to consume test struct directly.
  Modify 1.1 VTS tests to consume test struct directly.
  Modify 1.0 VTS tests to consume test struct directly.
2019-08-27 22:11:33 +00:00
Steven Moreland
cf157ceac4 Rename dumpstate service to include '.example'.
Since it only prints a date.

Bug: 140115084
Test: boot device and check that this can run (as I've also had to
    update file contexts for it)
Change-Id: Id22452cec4f32c2bbfa07065cb5e9c5d2b9936bf
2019-08-27 13:15:48 -07:00
Xusong Wang
323ba2ee8b Modify validateBurstSanitized to take a single request.
This CL is to modify validateBurstSanitized implementation in accordance
with the new test generator and test harness change in the same topic.

Bug: 123092187
Test: 1.2 VTS
Change-Id: Iacfe0e3bba8b4b44b7aee023d1c8129cbd089d4a
Merged-In: Iacfe0e3bba8b4b44b7aee023d1c8129cbd089d4a
(cherry picked from commit 8fc4622bf1)
2019-08-27 10:45:03 -07:00
Xusong Wang
6d0270b056 Modify 1.2 VTS tests to consume test struct directly.
Comparing with v1.1, the converter for 1.2 HIDL model has additional support
for extraParam, dynamic output shape, and zero-sized output.

Modify CompilationCachingTests to use the new test struct.

Bug: 123092187
Bug: 138718240
Test: All VTS
Change-Id: I54ac97f62898e47a338b51cc6d895a0309ab001f
Merged-In: I54ac97f62898e47a338b51cc6d895a0309ab001f
(cherry picked from commit 491b0a8913)
2019-08-27 10:44:29 -07:00
Xusong Wang
0c03b85005 Modify 1.1 VTS tests to consume test struct directly.
This CL is very similar to the 1.0 VTS CL. The only difference is that
1.1 Models have an additional field for relaxed model computation.

Bug: 123092187
Bug: 138718240
Test: All VTS
Change-Id: I9264e5b2468b9c6db47d86683d24f8c2c5ec46aa
Merged-In: I9264e5b2468b9c6db47d86683d24f8c2c5ec46aa
(cherry picked from commit 6aad040278)
2019-08-27 10:43:51 -07:00
Xusong Wang
8487c5e21f Modify 1.0 VTS tests to consume test struct directly.
Implement converter utilities constructing HIDL model and request from
TestModel.

Bug: 123092187
Bug: 138718240
Test: All VTS
Change-Id: I0b26b7f41d31d5e63ed083ab5f6f269a3620f034
Merged-In: I0b26b7f41d31d5e63ed083ab5f6f269a3620f034
(cherry picked from commit 8e8b70c439)
2019-08-27 10:43:45 -07:00
Steven Moreland
83bb776d31 Merge "Deprecate thermal@1.1 HAL for launching devices." into stage-aosp-master 2019-08-27 16:28:58 +00:00
Shuo Qian
2f055676a0 Merge "Update the currentCalls before VTS notification."
am: f0796fd497

Change-Id: I6c5748081b255d2b38e51aa285f60a786d72383a
2019-08-27 08:46:54 -07:00