commit 13ef1763d6eef9606afaed90fb258d1a4577f15b
author Georgios Pinitas <georgios.pinitas@arm.com> Wed Jul 14 17:14:43 2021 +0100
committer Georgios Pinitas <georgios.pinitas@arm.com> Thu Jul 15 11:48:48 2021 +0000
tree 92ad13235ea6983a5bab0e561b72796c027d9f7f
parent 7b23732bc8815c7084d4b5f453340fcd740a00fe

Improve filelist for GPU

Resolves: COMPMID-4653

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I4f69d42369bf8ab91cd027acf1c97e92ec1ef554
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5948
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

SConscript

diff --git a/SConscript b/SConscript
index 03b87e7..886ad08 100644
--- a/SConscript
+++ b/SConscript
@@ -272,7 +272,7 @@
 runtime_files = Glob('src/runtime/CPP/functions/*.cpp')
 
 # C API files
-runtime_files_hp += filelist['c_api']['cpu']
+runtime_files_hp += filelist['c_api']['common']
 
 if env['opencl']:
     runtime_files_hp += filelist['c_api']['gpu']
@@ -297,19 +297,8 @@
      runtime_files_hp += Glob('src/runtime/OMP/OMPScheduler.cpp')
 
 if env['opencl']:
-    core_files += Glob('src/core/CL/*.cpp')
-    core_files += Glob('src/core/gpu/cl/*.cpp')
-
-    runtime_files += Glob('src/runtime/CL/*.cpp')
+    runtime_files_hp += filelist['gpu']['common']
     runtime_files += Glob('src/runtime/CL/functions/*.cpp')
-    runtime_files += Glob('src/runtime/CL/gemm/*.cpp')
-    runtime_files += Glob('src/runtime/CL/tuners/*.cpp')
-    runtime_files += Glob('src/runtime/gpu/cl/*.cpp')
-    runtime_files += Glob('src/runtime/CL/mlgo/*.cpp')
-    runtime_files += Glob('src/runtime/CL/gemm_auto_heuristics/*.cpp')
-
-    runtime_files += Glob('src/gpu/cl/*.cpp')
-    graph_files += Glob('src/graph/backends/CL/*.cpp')
 
     operators = filelist['gpu']['operators']
     for operator in operators:
@@ -317,6 +306,8 @@
         if "kernel" in operators[operator]["files"]:
             core_files += operators[operator]["files"]["kernel"]
 
+    graph_files += Glob('src/graph/backends/CL/*.cpp')
+
 sve_o = []
 core_files_sve = []
 if env['neon']:
@@ -330,8 +321,6 @@
                                       "arm_compute/core/NEON/kernels/assembly/",
                                       "src/core/cpu/kernels/assembly/",])
 
-    graph_files += Glob('src/graph/backends/NEON/*.cpp')
-
     # Load files based on user's options
     operators = filelist['cpu']['operators']
     for operator in operators:
@@ -346,9 +335,11 @@
             core_files += file_list
             core_files_sve += file_list_sve
 
+    runtime_files_hp += filelist['cpu']['common']
     runtime_files_hp += Glob('src/runtime/NEON/*.cpp')
     runtime_files += Glob('src/runtime/NEON/functions/*.cpp')
-    runtime_files_hp += filelist['cpu']['all']
+
+    graph_files += Glob('src/graph/backends/NEON/*.cpp')
 
 bootcode_o = []
 if env['os'] == 'bare_metal':