platform/upstream/armnn.git
5 years agoIVGCVSW-2993: Investigate TfLite Parser test output shape validation
Narumol Prangnawarat [Mon, 29 Apr 2019 15:40:55 +0000 (16:40 +0100)]
IVGCVSW-2993: Investigate TfLite Parser test output shape validation

 * Get outputTensorInfo from runtime outputs to ensure that
the results are from the running network

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: Ib35afeaf5f6121df7f6379cfc557ae77e5214d69

5 years agoIVGCVSW-2405 Rename SubGraph to SubgraphView
Derek Lamberti [Fri, 26 Apr 2019 12:05:17 +0000 (13:05 +0100)]
IVGCVSW-2405 Rename SubGraph to SubgraphView

Change-Id: Ie50aeccf053c20c3a01a75042bbc3acd824375af
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
5 years agoIVGCVSW-2948 Add DeepSpeech v1 support to TensorFlowLiteSupport.md
Narumol Prangnawarat [Mon, 29 Apr 2019 16:43:36 +0000 (17:43 +0100)]
IVGCVSW-2948 Add DeepSpeech v1 support to TensorFlowLiteSupport.md

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I18697fde21e90723bcc36cc9cc1b571652fa54e7

5 years agoIVGCVSW-2983 activation layers support for QSymm16
Teresa Charlin [Wed, 24 Apr 2019 09:17:46 +0000 (10:17 +0100)]
IVGCVSW-2983 activation layers support for QSymm16
!armnn:1023

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ie4e5c4e7cb9edec690235393fff0721fca5da6cc

5 years agoFixing a broken link to MLPlatform.org
Brian Joyce [Mon, 29 Apr 2019 11:42:27 +0000 (12:42 +0100)]
Fixing a broken link to MLPlatform.org

Signed-off-by: Brian Joyce <brian.joyce@arm.com>
Change-Id: Ie9e8ba683f4475af15db37f1949a330132055561

5 years agoIVGCVSW-2843 Support QSymm16 via Command-line quantizer tool
Sadik Armagan [Fri, 26 Apr 2019 16:11:47 +0000 (17:11 +0100)]
IVGCVSW-2843 Support QSymm16 via Command-line quantizer tool

 * Added quantization scheme support to ArmnnQuantizer

Change-Id: Ia0202bfcd8cac0695aa3b18f9447a19b27f74f67
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2982 Refactor reference Activation workload
Nattapat Chaimanowong [Wed, 24 Apr 2019 15:19:57 +0000 (16:19 +0100)]
IVGCVSW-2982 Refactor reference Activation workload

Change-Id: Ia3b9a56787cc68822a3c1635de82e03ecc0aae27
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2773 Update clframework pin for the jenkins timing tests
Ruomei Yan [Fri, 26 Apr 2019 08:43:43 +0000 (09:43 +0100)]
IVGCVSW-2773 Update clframework pin for the jenkins timing tests

!android-nn-driver:1035
Change-Id: I36859d21f452df92f2a23d2f9f9c669f4284ac07
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
5 years agoIVGCVSW-2396 Go back to using offset memory manager
Sadik Armagan [Fri, 26 Apr 2019 15:04:34 +0000 (16:04 +0100)]
IVGCVSW-2396 Go back to using offset memory manager

Change-Id: If6cf69b1569eb69c9481369a99ca7066be0fdd9d
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2996 Add Reshape layer to ParseFullyConnected in TfLite parser
Narumol Prangnawarat [Wed, 24 Apr 2019 14:52:20 +0000 (15:52 +0100)]
IVGCVSW-2996 Add Reshape layer to ParseFullyConnected in TfLite parser
when input is > 2D to flatten the input to 2D [batch_size, input_size]

Change-Id: Id9d9ff996225c7d0938204ae0ceb330a11e264f5
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
5 years agoIVGCVSW-3007 ArmnnConverter: Fix bug with optional --input-tensor-shape argument
Matthew Bentham [Fri, 26 Apr 2019 15:57:29 +0000 (16:57 +0100)]
IVGCVSW-3007 ArmnnConverter: Fix bug with optional --input-tensor-shape argument

Change-Id: Icae21aa39bea57fd5de4278756cc620ffe684ed7
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2657: Fix to force correct quantisation parameters for QASYMM8 Softmax
David Monahan [Thu, 25 Apr 2019 15:03:38 +0000 (16:03 +0100)]
IVGCVSW-2657: Fix to force correct quantisation parameters for QASYMM8 Softmax
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I0989ea843714ba1d5da756bb87ddefa3706b07eb

5 years agoIVGCVSW-3005 Correct the order of inputs and outputs of deepspeech v1
Narumol Prangnawarat [Fri, 26 Apr 2019 12:48:57 +0000 (13:48 +0100)]
IVGCVSW-3005 Correct the order of inputs and outputs of deepspeech v1

Change-Id: I36b3467e74508ad4e8f3140285f965bc63433d1d
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
5 years agoMLCE-111: ONNX parser raw data bug
Pablo Tello [Wed, 24 Apr 2019 13:20:21 +0000 (14:20 +0100)]
MLCE-111: ONNX parser raw data bug

Fixed bug in ONNX parser: unable to load raw data from the binary
models.

Change-Id: Iec60d2f90b78ffe6910fdec6e6bd2eb05802ffd0
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
5 years agoIVGCVSW-2993: Investigate TfLite Parser test output shape validation
Nina Drozd [Wed, 24 Apr 2019 14:49:12 +0000 (15:49 +0100)]
IVGCVSW-2993: Investigate TfLite Parser test output shape validation

* Added a check after enqueue workload to ensure that the outputs have the correct number of dimensions
* OutputTensors cannot be used for this as in RunTest we're specifically creating these with expected number of dimensions

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: Ib6e5a138240e2f639f462f58caa72ae760e2b406

5 years agoIVGCVSW-2994 Add Reshape layer to ParseUnpack in TfLite parser
Narumol Prangnawarat [Tue, 23 Apr 2019 14:28:06 +0000 (15:28 +0100)]
IVGCVSW-2994 Add Reshape layer to ParseUnpack in TfLite parser
to remove the unpacked dimension of each output from Splitter
and correct ReshapeFixtureWithReshapeDimsFlatten test output shape

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I517d315475612ac8b773930f9b58cac316fa8553

5 years agoRemove incorrect documentation line
Matthew Bentham [Thu, 25 Apr 2019 08:12:09 +0000 (09:12 +0100)]
Remove incorrect documentation line

This line is definitely wrong, plenty of float32 things
work in the TFLite parser, so it sets the wrong expectations.

Change-Id: I87ac01e14b916ccd767429c124c353ab136174d8
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2657: New Mobilenet Timings test which includes quantisation and softmax
David Monahan [Tue, 23 Apr 2019 10:03:38 +0000 (11:03 +0100)]
IVGCVSW-2657: New Mobilenet Timings test which includes quantisation and softmax
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: Ieeb6ead55a3af851eea666334e41c3c9c3e3803b

5 years agoIVGCVSW-2657: Model update to fix failing timings test: TfLiteVGG16Quantized
David Monahan [Tue, 23 Apr 2019 09:54:34 +0000 (10:54 +0100)]
IVGCVSW-2657: Model update to fix failing timings test: TfLiteVGG16Quantized
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I49bd93766f8f3cf41a9471c87c1c61ed1ec6034c

5 years agoIVGCVSW-2918 Implement ExecutionFrame.
Teresa Charlin [Wed, 10 Apr 2019 12:59:49 +0000 (13:59 +0100)]
IVGCVSW-2918 Implement ExecutionFrame.

*Add interface IExecutionFrame.
*Add basic implementation ExecutionFrame.
*Add Unit Test

Change-Id: I960ac84a05c0c9b03735ec5e9c63f6f8f95b57b5
Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
5 years agoIVGCVSW-2899 Create a tool to preprocess the images, generating the RAW tensor data...
Sadik Armagan [Fri, 19 Apr 2019 08:55:06 +0000 (09:55 +0100)]
IVGCVSW-2899 Create a tool to preprocess the images, generating the RAW tensor data from the image files

 * ImageTensorGenerator tool generates .raw file contains tensor of the image
 * ImageCSVFileGenerator tool generates .csv file contains list of .raw files

Change-Id: Ic7e148857b9f885044bd69da1077b60104cd6509
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2925: Combine Pad with Convolution2d in the Optimizer
Nina Drozd [Thu, 18 Apr 2019 13:48:51 +0000 (14:48 +0100)]
IVGCVSW-2925: Combine Pad with Convolution2d in the Optimizer

* Added new optimization for folding pad layer into convolution2d layer following it
* Added new test in OptimizerTests.cpp
* Added new optimization into All optimizations
* Added call to new optimization in Optimize in Network.cpp
* Updated CMakeLists.txt

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: I682e07c71bbd42c49c02dda30a848a9ab2b16e7e

5 years agoIVGCVSW-2987 Modify ParseSplit in TfLite parser
Narumol Prangnawarat [Thu, 18 Apr 2019 15:56:19 +0000 (16:56 +0100)]
IVGCVSW-2987 Modify ParseSplit in TfLite parser

 * Allow input data with dimension not greater than 4D
 * Correct input order
 * Get split dimension from buffer data
 * Unit tests

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I285851b19e6fa7c715e5fe4853df167e7c856647

5 years agoIVGCVSW-2980 Build ArmNN with the latest version of the driver stack library
Matteo Martincigh [Wed, 17 Apr 2019 14:37:30 +0000 (15:37 +0100)]
IVGCVSW-2980 Build ArmNN with the latest version of the driver stack library

 * Changed the pre-compiled object held by the pre-compiled layer into
   a unique pointer, so that now the layer has the ownership of it
 * Changed the pre-compiled object held by the descriptor and the workload
   into a naked pointer, to leave the ownership to the layer

Change-Id: I4a582e45ca0aa3978e8e40b786c743a6eddce852
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
5 years agoIVGCVSW-2855 Update Command Line Processing of commonOptions
Jim Flynn [Wed, 17 Apr 2019 09:16:58 +0000 (10:16 +0100)]
IVGCVSW-2855 Update Command Line Processing of commonOptions

Change-Id: I79f483b9854bd57cd712bc29b83983342cf8191f
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2849 Add TfLite Parser support for Rank-0 operands and unit tests
Narumol Prangnawarat [Wed, 17 Apr 2019 10:22:38 +0000 (11:22 +0100)]
IVGCVSW-2849 Add TfLite Parser support for Rank-0 operands and unit tests

Change-Id: I6dab12aed395a30466d66421c6e5a12659fedac8
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
5 years agoIVGCVSW-2957 MergerLayer subtensor optimization now backend agnostic
Derek Lamberti [Mon, 15 Apr 2019 17:37:35 +0000 (18:37 +0100)]
IVGCVSW-2957 MergerLayer subtensor optimization now backend agnostic

+ Update clframework pin
+ Cl and Neon Merger workloads updated to use MemoryLayout agnostic API
+ Workloads only use sub-tensor optimization if ALL input tensors are sub-tensors
+ Refactor LayerSupportCommon code to be a bit more succinct

Change-Id: Ib61ad4ccbd767e924dff07e61022e0cda4069828
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2425 Add unit test for Logistic (Sigmoid) in NEON
Narumol Prangnawarat [Mon, 15 Apr 2019 13:14:27 +0000 (14:14 +0100)]
IVGCVSW-2425 Add unit test for Logistic (Sigmoid) in NEON

Change-Id: I557b76ea8c066161f3eb866daabca63694d46f4e
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
5 years agoIVGCVSW-2855 Create TfLite reference test for DeepSpeechV1
Jim Flynn [Mon, 15 Apr 2019 13:34:17 +0000 (14:34 +0100)]
IVGCVSW-2855 Create TfLite reference test for DeepSpeechV1

Change-Id: I4492a85c8337bf4ea0eb998c88b9cbfc932dc4e6
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2959: Update TfLiteResNetV2-50-Quantized-Armnn test
Nina Drozd [Tue, 16 Apr 2019 09:28:19 +0000 (10:28 +0100)]
IVGCVSW-2959: Update TfLiteResNetV2-50-Quantized-Armnn test

* updated the output name parameter in TfLiteResNetV2-50-Quantized test to correct output name as in model

Change-Id: Ic657d5e7972a610ea63d4fc709fe42c86c997249
Signed-off-by: Nina Drozd <nina.drozd@arm.com>
5 years agoMLCE-103: MDK changes for running multiple inferences qasymm8
Pablo Tello [Mon, 15 Apr 2019 14:44:39 +0000 (15:44 +0100)]
MLCE-103: MDK changes for running multiple inferences qasymm8

Change-Id: I34e8e0736e133ffb5f931ce3b5f5bfa4e2c975c2
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
5 years agoIVGCVSW-2965: Add ResnetV2 50 Timings job in CI
Nina Drozd [Mon, 15 Apr 2019 16:18:36 +0000 (17:18 +0100)]
IVGCVSW-2965: Add ResnetV2 50 Timings job in CI

* Added building of TfLiteParserTest target and sources for TfLiteResNetV2-50-Quantized-Armnn test

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: I0cfc48ee3426187f748d3731e6c060302e9b6afa

5 years agoIVGCVSW-2928 Fix issue with GPU profiling
Matthew Bentham [Tue, 9 Apr 2019 12:10:46 +0000 (13:10 +0100)]
IVGCVSW-2928 Fix issue with GPU profiling

Correctly enable GPU profiling when test profiling is enabled.

Remove extra copy of the profiling-enabled flag from InferenceModel::Params
and correctly pass around the copy that is in InferenceTestOptions.

!referencetests:180329

Change-Id: I0daa1bab2e7068fc479bf417a553183b1d922166
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2848 - Add TfLite Parser support for Unpack layer
Nina Drozd [Mon, 15 Apr 2019 08:47:39 +0000 (09:47 +0100)]
IVGCVSW-2848 - Add TfLite Parser support for Unpack layer

* Added ParseUnpack in TfLiteParser
* New Unpack test file with test reproducing unpack in DeepSpeechV1 model
* Added documentation for supported Unpack to TensorflorLiteSupport.md

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: Ie920d46254ff4b4ab544407ace4c1d489af83157

5 years agoIVGCVSW-2959 Update TfLiteResNetV2-50-Quantized-Armnn test
nikraj01 [Mon, 15 Apr 2019 08:55:15 +0000 (09:55 +0100)]
IVGCVSW-2959 Update TfLiteResNetV2-50-Quantized-Armnn test

Change-Id: I6cbf2a6668894b7964f98b70216f56db4c99b718
Signed-off-by: nikraj01 <nikhil.raj@arm.com>
5 years agoIVGCVSW-2955 Update the Quantizer Tool to take an additional parameter for the user...
Sadik Armagan [Fri, 12 Apr 2019 14:17:02 +0000 (15:17 +0100)]
IVGCVSW-2955 Update the Quantizer Tool to take an additional parameter for the user to specify a CSV file

Change-Id: Id56e09f147cca5c1301ec1b6bac656cd50bfd583
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2543 Add timing for ExecuteNetwork inference
James Conroy [Thu, 11 Apr 2019 09:23:58 +0000 (10:23 +0100)]
IVGCVSW-2543 Add timing for ExecuteNetwork inference

  * Adds a new command line option 'threshold-time'
    to ExecuteNetwork, the maximum allowed time for
    inference in EnqueueWorkload.
  * ExecuteNetwork now outputs inference time
    elapsed and (if supplied) threshold time.
  * If actual elapsed inference time is greater
    than supplied threshold time, fail the test.

Change-Id: If441b49a29cf5450687c07500c9046a80ece56fc
Signed-off-by: James Conroy <james.conroy@arm.com>
5 years agoIVGCVSW-2912 Change get_compute_libary.sh -p exit code to 0
Jim Flynn [Thu, 11 Apr 2019 12:10:46 +0000 (13:10 +0100)]
IVGCVSW-2912 Change get_compute_libary.sh -p exit code to 0

Change-Id: Id53d32f07c2c555d4ed86bcba31a860a698ff3e9
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2873 Update documentation for Serializer/Deserializer
Sadik Armagan [Wed, 10 Apr 2019 13:16:44 +0000 (14:16 +0100)]
IVGCVSW-2873 Update documentation for Serializer/Deserializer

 * Updated Serializer/Deserializer support documentation for Quantize Operation.

Change-Id: I8cc670a58756c9f2d7294131c4715bee5ae7a647
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2947 Remove boost dependency from include/TypesUtils.hpp
Aron Virginas-Tar [Tue, 9 Apr 2019 13:08:06 +0000 (14:08 +0100)]
IVGCVSW-2947 Remove boost dependency from include/TypesUtils.hpp

!android-nn-driver:968

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I03ccb4842b060a9893567542bfcadc180bbc7311

5 years agoIVGCVSW-2946 RefElementwiseWorkload configures prior to first execute
Derek Lamberti [Tue, 9 Apr 2019 09:25:02 +0000 (10:25 +0100)]
IVGCVSW-2946 RefElementwiseWorkload configures prior to first execute

+ Added PostAllocationConfigure() method to workload interface
+ Elementwise function now deduces types based on Functor
- Replaced RefComparisonWorkload with RefElementwiseWorkload specialization
+ Fixed up unit tests and minor formatting

Change-Id: I33d08797767bba01cf4efb2904920ce0f950a4fe
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2912 Make get_compute_library.sh sole source for clframework pin
Jim Flynn [Tue, 2 Apr 2019 14:19:08 +0000 (15:19 +0100)]
IVGCVSW-2912 Make get_compute_library.sh sole source for clframework pin

* Also incorporated fix for break in master build
  32-bit NEDepthwiseConvolution errors in clframework
* Fixed a failure in the Float16 workloads for ElementwiseOperations

!android-nn-driver:963

Change-Id: Ic2cdb0e6c9399fa42b56001c6f4b46b7f150f143
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2862 Extend the Elementwise Workload to support QSymm16 Data Type
Sadik Armagan [Tue, 9 Apr 2019 13:20:12 +0000 (14:20 +0100)]
IVGCVSW-2862 Extend the Elementwise Workload to support QSymm16 Data Type
IVGCVSW-2863 Unit test per Elementwise operator with QSymm16 Data Type
 * Added QSymm16 support for Elementwise Operators
 * Added QSymm16 unit tests for Elementwise Operators

Change-Id: I4e4e2938f9ed2cbbb1f05fb0f7dc476768550277
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2845: Add TfLite Parser support for TanH activation layer
Nina Drozd [Tue, 9 Apr 2019 08:37:38 +0000 (09:37 +0100)]
IVGCVSW-2845: Add TfLite Parser support for TanH activation layer

* Added ParseTanH in TfLiteParser
* Added testcase for parsing TanH activation in Activations.cpp
* Added new supported TanH operator in TensorflowLiteSupport.md

Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Change-Id: Ie60f38994d76b077f86828c21c57381bdeeaeb5a

5 years agoIVGCVSW-2861 Refactor the Reference Elementwise workload
Sadik Armagan [Wed, 3 Apr 2019 16:48:18 +0000 (17:48 +0100)]
IVGCVSW-2861 Refactor the Reference Elementwise workload
 * Refactor Reference Comparison workload
 * Removed templating based on the DataType
 * Implemented BaseIterator to do decode/encode

Change-Id: I18f299f47ee23772f90152c1146b42f07465e105
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>
5 years agoIVGCVSW-2844: Add TfLite Parser support for Split layer
Nina Drozd [Mon, 8 Apr 2019 09:52:10 +0000 (10:52 +0100)]
IVGCVSW-2844: Add TfLite Parser support for Split layer

* Added ParseSplit method
* New Unit test Split.cpp
* Updated TensorflowLiteSupport.md with new supported operator

Change-Id: Iec80ba9ad7b48db8e86589ebae77bd7d8ed38fb2
Signed-off-by: Nina Drozd <nina.drozd@arm.com>
5 years agoIVGCVSW-2927 Fix Streamline annotations
Matthew Bentham [Fri, 5 Apr 2019 08:35:15 +0000 (09:35 +0100)]
IVGCVSW-2927 Fix Streamline annotations

Change-Id: Ia3f4852e6ba1358c6798210ecf94105a130cb1b9
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2914 Add Switch Layer and no-op factory method
Sadik Armagan [Fri, 5 Apr 2019 14:25:46 +0000 (15:25 +0100)]
IVGCVSW-2914 Add Switch Layer and no-op factory method

Change-Id: I6a6ece708a49e8a97c83a3e7fec11c88af1e1cfa
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
5 years agoIVGCVSW-2915 Add Merge Layer and no-op factory method
Nattapat Chaimanowong [Fri, 5 Apr 2019 12:37:19 +0000 (13:37 +0100)]
IVGCVSW-2915 Add Merge Layer and no-op factory method

Change-Id: I54549671e0d3b207904cf9796a843eb2b0a631f7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2926 Add test for ResNetV2 50 quantized tflite model
nikraj01 [Fri, 5 Apr 2019 10:42:45 +0000 (11:42 +0100)]
IVGCVSW-2926 Add test for ResNetV2 50 quantized tflite model

Change-Id: I9389cf32d0efb303ea0930ecb4a87af884943b06
Signed-off-by: nikraj01 <nikhil.raj@arm.com>
5 years agoIVGCVSW-2539 Improve ExecuteNetwork error logging
Francis Murtagh [Thu, 4 Apr 2019 10:16:29 +0000 (11:16 +0100)]
IVGCVSW-2539 Improve ExecuteNetwork error logging

 * Add check to ensure requested input node exists
   otherwise give coherent error message

Change-Id: Ifee5f1d459f989c2e808cf78806f9a9a7f7c763f
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
5 years agoIVGCVSW-2802 Ability to run FP16 turbo mode through ExecuteNetwork
Ruomei Yan [Tue, 2 Apr 2019 15:47:34 +0000 (16:47 +0100)]
IVGCVSW-2802 Ability to run FP16 turbo mode through ExecuteNetwork

Change-Id: I679883234d78b95d1e01ed5602c5cab296b0c6bf
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
5 years agoIVGCVSW-2875 Enable QuantisedSymm16 support for ref Dequantize workload
Nattapat Chaimanowong [Tue, 2 Apr 2019 10:41:45 +0000 (11:41 +0100)]
IVGCVSW-2875 Enable QuantisedSymm16 support for ref Dequantize workload

Change-Id: I4b1c1f963214433ad67d5a311fbea5f21177f6a2
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2872 Unit tests for Quantize layer and reference workload
Nattapat Chaimanowong [Mon, 1 Apr 2019 16:04:53 +0000 (17:04 +0100)]
IVGCVSW-2872 Unit tests for Quantize layer and reference workload

Change-Id: I291c08cb6e359453978b398255cf8ff051ed2686
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2832 (Part 2) update clframework pin to b4a44ff3aa98d2b51f1621a7525db3f81108a1bd
Jim Flynn [Mon, 1 Apr 2019 12:22:21 +0000 (13:22 +0100)]
IVGCVSW-2832 (Part 2) update clframework pin to b4a44ff3aa98d2b51f1621a7525db3f81108a1bd

* Change in clframework to remove check for data format in the NE/CLReductionOperationKernel
  that was preventing a Resnet v2 50 model from running to completion

!android-nn-driver:925

Change-Id: Ia7da001dd231d97b538846b69a40165fa64d1ff3
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2871 Ref QuantizeLayer workload
Derek Lamberti [Mon, 25 Mar 2019 15:41:58 +0000 (15:41 +0000)]
IVGCVSW-2871 Ref QuantizeLayer workload

Change-Id: If048b2a053c542b31ae344fe0af04d9b4f40eb6d
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2875 Reference implementation and unit tests for Dequantize
Nattapat Chaimanowong [Fri, 29 Mar 2019 15:25:04 +0000 (15:25 +0000)]
IVGCVSW-2875 Reference implementation and unit tests for Dequantize

Change-Id: Ie4ade0519cb0bbe35dc36be6c9cd749b9171c74b
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2866 Implement RegisterDebugCallback for RefDebugWorkload
Nattapat Chaimanowong [Thu, 28 Mar 2019 10:29:12 +0000 (10:29 +0000)]
IVGCVSW-2866 Implement RegisterDebugCallback for RefDebugWorkload

Change-Id: I9144fb6b7d05561b5b8fd9db5dbe31c9257f10ca
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoMLCE-101 Deeplab v3+ (Add Tf Lite Parser Dilation Check)
Kevin May [Tue, 26 Mar 2019 11:39:19 +0000 (11:39 +0000)]
MLCE-101 Deeplab v3+ (Add Tf Lite Parser Dilation Check)

    * Add Parse Exception for convolutions without default dilation

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1b8f75c2d871d81161eb5378ced277438e809ba2

5 years agoIVGCVSW-2885 fix ArmnnConverter help text
Les Bell [Thu, 28 Mar 2019 12:26:46 +0000 (12:26 +0000)]
IVGCVSW-2885 fix ArmnnConverter help text

Change-Id: I2d4ee593f5bbfb4519724d28aa8b2862bf5e5c92
Signed-off-by: Les Bell <les.bell@arm.com>
5 years agoIVGCVSW-2874 Add DequantizeLayer and no-op factory method
Nattapat Chaimanowong [Thu, 28 Mar 2019 09:56:53 +0000 (09:56 +0000)]
IVGCVSW-2874 Add DequantizeLayer and no-op factory method

*Add Dequantize layer to the frontend
*Add Serializer and Deserializer for Dequantize

Change-Id: Ide2647b9e0348d599deb97e61ca4bf66e2f17fc0
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2880 Refactor order of methods
Derek Lamberti [Mon, 25 Mar 2019 16:28:44 +0000 (16:28 +0000)]
IVGCVSW-2880 Refactor order of methods

Change-Id: I1c08ea47c19477e739d7b0f35e6f97928d53d469
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2827: adding Validation file for TfLiteInceptionV4Quantized
Nina Drozd [Wed, 27 Mar 2019 09:33:54 +0000 (09:33 +0000)]
IVGCVSW-2827: adding Validation file for TfLiteInceptionV4Quantized

Change-Id: I209e4e4e674f486328197eda6438e93ba0c7bda6
Signed-off-by: Nina Drozd <nina.drozd@arm.com>
5 years agoIVGCVSW-2870 Serialize quantize layer
Derek Lamberti [Wed, 27 Mar 2019 16:51:31 +0000 (16:51 +0000)]
IVGCVSW-2870 Serialize quantize layer

Change-Id: I2cff85a3cb4d47aa09227a6810812a142f2aedd3
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2870 Support QuantizeLayer on frontend
Derek Lamberti [Mon, 25 Mar 2019 15:41:58 +0000 (15:41 +0000)]
IVGCVSW-2870 Support QuantizeLayer on frontend

Change-Id: I2014a8d801f1f222d27a80dddf4f188ddcb3a5c9
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2884:Add Validation.txt for TfliteInceptionV3
nikraj01 [Wed, 27 Mar 2019 10:37:34 +0000 (10:37 +0000)]
IVGCVSW-2884:Add Validation.txt for TfliteInceptionV3

Change-Id: I08fb551d27ad80e657460242f567a59303d4879b
Signed-off-by: nikraj01 <nikhil.raj@arm.com>
5 years agoIVGCVSW-2817 Inherit SerializerVisitor from the ILayerVisitor interface class
Francis Murtagh [Wed, 27 Mar 2019 10:17:21 +0000 (10:17 +0000)]
IVGCVSW-2817 Inherit SerializerVisitor from the ILayerVisitor interface class

 * Inherit SerializerVisitor from the ILayerVisitor interface
   class rather than the base class

Change-Id: If531ec6bc3ae20bfff679fbf5f7535706eac17a2
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
5 years agoIVGCVSW-2881 Remove DebugDescriptor
Nattapat Chaimanowong [Tue, 26 Mar 2019 11:03:26 +0000 (11:03 +0000)]
IVGCVSW-2881 Remove DebugDescriptor

* Also update Debug layer to use layer guid information

Change-Id: I9ec1f639299c3f855b670ff031a0e88d685cfc6b
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2832 Update CL pin to 2761c2f0b60175469e959982a25ff0abdca6c9ce
Jim Flynn [Fri, 22 Mar 2019 15:58:39 +0000 (15:58 +0000)]
IVGCVSW-2832 Update CL pin to 2761c2f0b60175469e959982a25ff0abdca6c9ce

* Removes data format check from NE and CL CopyLayerKernel to fix customer issue
  with Resnet v1 and v2 50 models failing to run
* COMPMID-2075 Fix Segfault in NELSTM (2761c2f0b60175469e959982a25ff0abdca6c9ce)
* Added include <functional> to include/armnn/Types.hpp to fix compile failure on CI

!android-nn-driver:891

Change-Id: Icbe58b7e6d3276b0e983bdd1c004906b3d0a7a6e
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2882 Fix include order in armnn public headers
Matthew Bentham [Mon, 25 Mar 2019 17:37:47 +0000 (17:37 +0000)]
IVGCVSW-2882 Fix include order in armnn public headers

Change-Id: I111eab934824348f5e9c1d1384be5a24546dc19a
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2865 add missing include of functional
Matthew Bentham [Mon, 25 Mar 2019 12:30:56 +0000 (12:30 +0000)]
IVGCVSW-2865 add missing include of functional

Change-Id: Ib110f8fe8b8980ad948d2ca22061e9d020cb33d7
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoUse unique names for temporary files
Matthew Bentham [Wed, 20 Mar 2019 12:46:58 +0000 (12:46 +0000)]
Use unique names for temporary files

Change-Id: I06653135c5fef38a52995da6c4b6de7ba5786b6a
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2861 Refactor the Reference Elementwise workloads
Sadik Armagan [Mon, 25 Mar 2019 09:03:35 +0000 (09:03 +0000)]
IVGCVSW-2861 Refactor the Reference Elementwise workloads
 * Refactored Elementwise Workload into the single workload.
 * Execute() function will react based on the DataType.

Change-Id: I6d4d6a74cec150ed8cb252e70b629ed968e7093d
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2865 Extend IRuntime to add a new method RegisterDebugCallback(...)
Nattapat Chaimanowong [Fri, 22 Mar 2019 14:01:46 +0000 (14:01 +0000)]
IVGCVSW-2865 Extend IRuntime to add a new method RegisterDebugCallback(...)

* Made changes to LoadedNetwork and IWorkload to pass on the registered
callback function

Change-Id: I6ea10f2a299d6de8bf681c8ff36d3fbed1d6d887
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2859 Add unit tests for QSymm16 quantization
Nattapat Chaimanowong [Thu, 21 Mar 2019 11:02:13 +0000 (11:02 +0000)]
IVGCVSW-2859 Add unit tests for QSymm16 quantization

* Add quantization test under QSymm16 scheme for all layers
* Refactor existing tests to reduce code duplication

Change-Id: I66c9437b3247d78acbb4ebc2c2481f3238268038
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2694: serialize/deserialize LSTM
Jim Flynn [Tue, 19 Mar 2019 17:22:29 +0000 (17:22 +0000)]
IVGCVSW-2694: serialize/deserialize LSTM

* added serialize/deserialize methods for LSTM and tests

Change-Id: Ic59557f03001c496008c4bef92c2e0406e1fbc6c
Signed-off-by: Nina Drozd <nina.drozd@arm.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2850 Fix Circular Dependency Issue
Sadik Armagan [Wed, 20 Mar 2019 12:28:32 +0000 (12:28 +0000)]
IVGCVSW-2850 Fix Circular Dependency Issue
 * Create the SerilizationID for fb base layer before creating inputs and connections.

Change-Id: I3dbb18e455c1fe9d7ea0fc11988ea55655ee398f
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2858 Add support for QSymm16 quantization
Nattapat Chaimanowong [Wed, 20 Mar 2019 11:51:14 +0000 (11:51 +0000)]
IVGCVSW-2858 Add support for QSymm16 quantization

Change-Id: Ia7c305c30c39ec0e9db447a461479be17fde250c
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2814 AllTypesAreEqualImpl handles odd num params correctly.
Derek Lamberti [Wed, 20 Mar 2019 13:07:57 +0000 (13:07 +0000)]
IVGCVSW-2814 AllTypesAreEqualImpl handles odd num params correctly.

Change-Id: I9b661cabab41f6997dac808cca15995834bb0313
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2814 Extensive ref IsSupported for Activation & Addition
Derek Lamberti [Wed, 13 Mar 2019 14:16:15 +0000 (14:16 +0000)]
IVGCVSW-2814 Extensive ref IsSupported for Activation & Addition

Change-Id: Ib1a795eb129de1ec3f02807a2dff7613d7c6c28d
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2788 Modify Serializer test to use introspection API
Nattapat Chaimanowong [Wed, 20 Mar 2019 11:19:52 +0000 (11:19 +0000)]
IVGCVSW-2788 Modify Serializer test to use introspection API

Change-Id: Ie97012b42cd7847a437dd9f21c9b59179b2e7897
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2839 Add QuantisedSymm16 support to the ArmNN frontend
Nattapat Chaimanowong [Tue, 19 Mar 2019 12:26:36 +0000 (12:26 +0000)]
IVGCVSW-2839 Add QuantisedSymm16 support to the ArmNN frontend

Change-Id: I76f4e7db55b0efbb1a5f7d1a32bf451e66add0c7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoMLCE-105 Fix use of std::unique_lock in LoadedNetwork
Matthew Bentham [Tue, 19 Mar 2019 10:11:01 +0000 (10:11 +0000)]
MLCE-105 Fix use of std::unique_lock in LoadedNetwork

You can't use a unique_lock to check lock ownership by a
particular thread - it just checks whether the mutex
is locked by that lock.

Change-Id: I28190dc3bea91b3cc68f9b9381751e70fd70f43f
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
5 years agoIVGCVSW-2686 Add Serializer and Deserializer for DetectionPostProcess
Nattapat Chaimanowong [Mon, 18 Mar 2019 12:37:06 +0000 (12:37 +0000)]
IVGCVSW-2686 Add Serializer and Deserializer for DetectionPostProcess

Change-Id: Ife48db5fdb005ebca0a6f21862b0ce971ccf58b7
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2354 Caffe SqueezeNet through armnn Cl and Neon
Narumol Prangnawarat [Thu, 14 Mar 2019 11:55:03 +0000 (11:55 +0000)]
IVGCVSW-2354 Caffe SqueezeNet through armnn Cl and Neon

 * Compute Softmax Acl axis for Cl and Neon
 * Add unittests for Softmax in 3D and 4D
 * Correct input and output layer names in CaffeSqueezeNet inference test

Change-Id: I2d369d9a2db19c40f2af3341039dd33f0c5637b1
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
5 years agoIVGCVSW-2429 Add Detection PostProcess Parser to TensorFlow Lite Parser
keidav01 [Thu, 14 Mar 2019 17:12:10 +0000 (17:12 +0000)]
IVGCVSW-2429 Add Detection PostProcess Parser to TensorFlow Lite Parser

    * Add helper function to generate custom data for detectPostProcess
    * Test helper function within current test suite

Change-Id: I9e66d0a28d69b1376da67723f03b112d17e97281
Signed-off-by: keidav01 <keith.davis@arm.com>
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
5 years agoIVGCVSW-2574 Create a converter application for all the supported ArmNN Networks
Sadik Armagan [Wed, 13 Mar 2019 18:33:10 +0000 (18:33 +0000)]
IVGCVSW-2574 Create a converter application for all the supported ArmNN Networks

 * Added Caffe, TfLite and Onnx support to ArmnnConverter

Change-Id: I9807064152f23a24d280118dbed0396eb7d47420
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2735 Failure to find flatbuffers is not a fatal build error
Ruomei Yan [Fri, 8 Mar 2019 17:50:25 +0000 (17:50 +0000)]
IVGCVSW-2735 Failure to find flatbuffers is not a fatal build error

!referencetests:176231

Change-Id: Ic8a641507c6af2f38e535b0208eb406e74a334a1
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
5 years agoIVGCVSW-2709 Serialize / de-serialize the Splitter layer
Jim Flynn [Fri, 8 Mar 2019 11:08:30 +0000 (11:08 +0000)]
IVGCVSW-2709 Serialize / de-serialize the Splitter layer

* fixed typo in Ref Merger Workload comment
* fixed typo in ViewsDescriptor comment
* made the origins descriptor accessable in the ViewsDescriptor
  (needed for serialization)
* based the unit test on the use of the splitter in the CaffeParser

Change-Id: I3e716839adb4eee5a695633377b49e7e18ec2aa9
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2800 Update CL pin to latest master
Conor Kennedy [Fri, 8 Mar 2019 10:55:32 +0000 (10:55 +0000)]
IVGCVSW-2800 Update CL pin to latest master

Change-Id: Id04be4950e09452a056883ba68e9dcf0c6f4ee2d
Signed-off-by: Conor Kennedy <conor.kennedy@arm.com>
5 years agoIVGCVSW-2792 Update Neon Mul/Sub workload for latest CL master
Conor Kennedy [Fri, 8 Mar 2019 08:24:41 +0000 (08:24 +0000)]
IVGCVSW-2792 Update Neon Mul/Sub workload for latest CL master

* Update Neon Subtraction/Multiplication to use BaseWorkload
* Add Uint8 tests for Subtraction/Multiplication

Change-Id: Ied2aa048924817a4db0025b9bd9e54151667bd74
Signed-off-by: Conor Kennedy <conor.kennedy@arm.com>
5 years agoIVGCVSW-2769 Don't process node if already visited
Derek Lamberti [Thu, 28 Feb 2019 09:30:16 +0000 (09:30 +0000)]
IVGCVSW-2769 Don't process node if already visited

Change-Id: I1eb06a044ea702fce00910d84fd20a680c03f1cc
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
5 years agoIVGCVSW-2693 Serialize/de-serialize L2Normalization
Narumol Prangnawarat [Thu, 7 Mar 2019 17:31:34 +0000 (17:31 +0000)]
IVGCVSW-2693 Serialize/de-serialize L2Normalization

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I6a53ac576260383f32fb0d878b42d1251ffde94a

5 years agoIVGCVSW-2697 Add Serialize/Deserialize for the Merger Layer
Jim Flynn [Thu, 28 Feb 2019 10:40:49 +0000 (10:40 +0000)]
IVGCVSW-2697 Add Serialize/Deserialize for the Merger Layer

* Force generation of schema header in every build
* Also fixed typo in OriginsDescriptor comment (Descriptors.hpp)
* Added Serialize/Deserialize check on Addition Layer
* Added Serialize/Deserialize check on Floor Layer
* Added Serialize/Deserialize check on Minimum Layer
* Added Serialize/Deserialize check on Maximum Layer
* Added Serialize/Deserialize check on Multiplication Layer
* Added Serialize/Deserialize check on Division Layer

Change-Id: I1358ea4db7ca506d8bcec2ee64e1fbad6005e723
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
5 years agoIVGCVSW-2783 Fix Deserializer connections for layer with multiple outputs
Nattapat Chaimanowong [Mon, 4 Mar 2019 17:10:40 +0000 (17:10 +0000)]
IVGCVSW-2783 Fix Deserializer  connections for layer with multiple outputs

Change-Id: Icb278dfd8900334665432963fa6f6341a461ef3b
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2696 Serialize / de-serialize the Mean layer
Sadik Armagan [Mon, 4 Mar 2019 17:44:21 +0000 (17:44 +0000)]
IVGCVSW-2696 Serialize / de-serialize the Mean layer

Change-Id: Iee4bab5a6d6b992cf4bba8697a2918f854c906a3
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
5 years agoIVGCVSW-2689 Fix Floor Deserilizer discarding layer name
Nattapat Chaimanowong [Tue, 5 Mar 2019 17:35:28 +0000 (17:35 +0000)]
IVGCVSW-2689 Fix Floor Deserilizer discarding layer name

Change-Id: Ic402041b18654e008473893f30f2d6f8ee9535fd
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
5 years agoIVGCVSW-2691 Add Serialize/Deseralize Gather layer
Matteo Martincigh [Mon, 4 Mar 2019 14:34:30 +0000 (14:34 +0000)]
IVGCVSW-2691 Add Serialize/Deseralize Gather layer

Change-Id: I445c4475e5abfe500b61ce8b7138c45322043c8b
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
5 years agoIVGCVSW-2681 Fix layer name in BatchNormalization deserialization
ruoyan01 [Mon, 4 Mar 2019 14:48:02 +0000 (14:48 +0000)]
IVGCVSW-2681 Fix layer name in BatchNormalization deserialization

Change-Id: Iec43db205d77dc9864abe1fe85104722a6954d57
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>
5 years agoIVGCVSW-2691 Add Serialize/Deseralize Gather layer
Saoirse Stewart [Mon, 4 Mar 2019 13:40:12 +0000 (13:40 +0000)]
IVGCVSW-2691 Add Serialize/Deseralize Gather layer

Change-Id: I589d37c9f65801b701858d6e68e2e3151fac6e16
Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>