commit e86f992d26a79cad76244c4444d113e45afa9b88
author Jakub Sujak <jakub.sujak@arm.com> Wed Jul 05 17:30:02 2023 +0100
committer Jakub Sujak <jakub.sujak@arm.com> Thu Jul 06 15:22:08 2023 +0000
tree 4d02dae037303678123958d3b237fb5d66a513c6
parent 2ae536a6ff4e7547c3c8d5fc2be8b7e815ca5f3d

Pack CKW objects into Compute Library archive

Previously, building the `arm_compute-static` archive would fail the linking stage due to the Compute Kernel Writer (CKW) symbols not being correctly included. We fix this issue by collecting the built CKW objects and packing them into the Compute Library archive during SCons build time.

Compiling the shared library remains unchanged, and still statically links against CKW.

Resolves: COMPMID-6342

Change-Id: I841ed7379652fbede6afe9e90a98202656683086
Signed-off-by: Jakub Sujak <jakub.sujak@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9873
Reviewed-by: SiCong Li <sicong.li@arm.com>
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>

SConstruct

diff --git a/SConstruct b/SConstruct
index 4ab9fdd..4480c71 100644
--- a/SConstruct
+++ b/SConstruct
@@ -453,9 +453,9 @@
 
     # Configure CKW static objects with -fPIC (CMAKE_POSITION_INDEPENDENT_CODE) option to enable linking statically to ACL
     CKW_CMAKE_CONFIGURE_STATIC = CKW_CMAKE_CMD + "-DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
-    CKW_CMAKE_BUILD = "cmake --build {CKW_BUILD_DIR} -j{NUM_JOBS}".format(CKW_BUILD_DIR=CKW_BUILD_DIR,
-                                                                          NUM_JOBS=GetOption('num_jobs')
-                                                                          )
+    CKW_CMAKE_BUILD = "cmake --build {CKW_BUILD_DIR} --target ckw_prototype -j{NUM_JOBS}".format(CKW_BUILD_DIR=CKW_BUILD_DIR,
+                                                                                                 NUM_JOBS=GetOption('num_jobs')
+                                                                                                 )
 
     # Build Compute Kernel Writer Static Library
     subprocess.check_call(CKW_CMAKE_CONFIGURE_STATIC, stderr=subprocess.STDOUT, shell=True)