commit bd738081b8fcea4599a06f01d5c07979f3b0fcb3
author David Monahan <david.monahan@arm.com> Fri Dec 08 12:50:02 2023 +0000
committer David Monahan <david.monahan@arm.com> Mon Jan 22 16:23:48 2024 +0000
tree fa0c5ef9765e5f4de8551114752473c0a71747cd
parent 5bc14146eb310465f3d7c59ac294aa32bc69984a

IVGCVSW-7165 - PreCompiledWorkload and Conv2d Integration work for GpuFsa

* Add PreCompiledWorkload implementation for GpuFsa
* Add ConstantWorkload implementation for GpuFsa
* Add Input/Output workloads for GpuFsa
* Added CopyMemGeneric workload for GpuFsa
* Separate creation and validation of sketch tensors into seperate functions

Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: Ie7299a4c61073b5ca03d9f8681458869ef7ce743

src/backends/gpuFsa/backend.mk

diff --git a/src/backends/gpuFsa/backend.mk b/src/backends/gpuFsa/backend.mk
index d8d2542..a219ad4 100644
--- a/src/backends/gpuFsa/backend.mk
+++ b/src/backends/gpuFsa/backend.mk
@@ -1,5 +1,5 @@
 #
-# Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved.
+# Copyright © 2022-2024 Arm Ltd and Contributors. All rights reserved.
 # SPDX-License-Identifier: MIT
 #
 
@@ -22,7 +22,20 @@
         GpuFsaRegistryInitializer.cpp \
         GpuFsaTensorHandleFactory.cpp \
         GpuFsaWorkloadFactory.cpp \
-        layerValidators/GpuFsaConvolution2dValidate.cpp
+        layers/GpuFsaConvolution2d.cpp
+
+# BACKEND_TEST_SOURCES contains the list of files to be included
+# in the Android unit test build (armnn-tests) and it is picked
+# up by the Android.mk file in the root of ArmNN
+
+# ARMNN_COMPUTE_GPUFSA_ENABLED == 1
+# Include the source files for the GPU Dynamic Fusion backend tests
+
+BACKEND_TEST_SOURCES := \
+        test/GpuFsaEndToEndTests.cpp \
+        test/GpuFsaLayerSupportTests.cpp \
+        test/GpuFsaLayerTests.cpp \
+        test/GpuFsaOptimizedNetworkTests.cpp
 else
 
 # ARMNN_COMPUTE_GPUFSA_ENABLED == 0
@@ -30,25 +43,6 @@
 
 BACKEND_SOURCES :=
 
-endif
-
-# BACKEND_TEST_SOURCES contains the list of files to be included
-# in the Android unit test build (armnn-tests) and it is picked
-# up by the Android.mk file in the root of ArmNN
-
-# The variable to enable/disable the GPU Dynamic Fusion backend
-# (ARMNN_COMPUTE_GPUFSA_ENABLED is declared in android-nn-driver/Android.mk)
-ifeq ($(ARMNN_COMPUTE_GPUFSA_ENABLED),1)
-
-# ARMNN_COMPUTE_GPUFSA_ENABLED == 1
-# Include the source files for the GPU Dynamic Fusion backend tests
-
-BACKEND_TEST_SOURCES := \
-		test/GpuFsaEndToEndTests.cpp \
-        test/GpuFsaLayerSupportTests.cpp \
-        test/GpuFsaLayerTests.cpp \
-        test/GpuFsaOptimizedNetworkTests.cpp
-else
 
 # ARMNN_COMPUTE_GPUFSA_ENABLED == 0
 # No source file will be compiled for the GPU Dynamic Fusion backend tests