From bee49ce4fa50e5192c6652019262d74fc12bbff8 Mon Sep 17 00:00:00 2001
From: Yongjoo Ahn <yongjoo1.ahn@samsung.com>
Date: Thu, 16 Jan 2025 17:12:30 +0900
Subject: [PATCH] [build] Fix vivante and snpe build

- Disable hal_rootstrap_checker for now.
- Set proper compile flags.

Signed-off-by: Yongjoo Ahn <yongjoo1.ahn@samsung.com>
---
 CMakeLists.txt                | 32 +++++++++++++++++++++++---------
 packaging/hal-backend-ml.spec |  4 +++-
 src/hal-backend-ml-vivante.cc |  3 +--
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab9562f..c992964 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,6 @@ SET(HAL_LIBDIR ${CMAKE_HAL_LIBDIR_PREFIX})
 SET(HAL_LICENSEDIR ${CMAKE_HAL_LICENSEDIR_PREFIX})
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(hal_rootstrap_pkgs REQUIRED
-  hal-rootstrap
-)
-
-FOREACH(flag ${hal_rootstrap_pkgs_CFLAGS})
-         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-ENDFOREACH(flag)
 
 # Common Options
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -fomit-frame-pointer -std=gnu++0x")
@@ -33,19 +26,40 @@ ${PROJECT_SOURCE_DIR}/src/hal-backend-ml-vivante.cc
 )
 
 SET(VIVANTE_LIBRARY_NAME "hal-backend-ml-vivante")
+pkg_check_modules(vivante_build_dep_pkgs REQUIRED
+  hal-rootstrap
+  ovxlib
+  amlogic-vsi-npu-sdk
+)
+
+FOREACH(flag ${vivante_build_dep_pkgs_CFLAGS})
+  SET(EXTRA_CFLAGS "${CMAKE_C_FLAGS} ${flag}")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
 ADD_LIBRARY(${VIVANTE_LIBRARY_NAME} SHARED ${VIVANTE_SRCS} ${UTIL_SRCS})
-TARGET_LINK_LIBRARIES(${VIVANTE_LIBRARY_NAME} ${hal_rootstrap_pkgs_LDFLAGS})
+TARGET_LINK_LIBRARIES(${VIVANTE_LIBRARY_NAME} ${vivante_build_dep_pkgs_LDFLAGS})
 INSTALL(TARGETS ${VIVANTE_LIBRARY_NAME} DESTINATION ${HAL_LIBDIR} COMPONENT RuntimeLibraries)
 ENDIF()
 
 # snpe
 IF(ENABLE_SNPE)
+pkg_check_modules(snpe_build_dep_pkgs REQUIRED
+  hal-rootstrap
+  snpe
+)
+
+FOREACH(flag ${snpe_build_dep_pkgs_CFLAGS})
+  SET(EXTRA_CFLAGS "${CMAKE_C_FLAGS} ${flag}")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
 SET(SNPE_SRCS
 ${PROJECT_SOURCE_DIR}/src/hal-backend-ml-snpe.cc
 )
 
 SET(SNPE_LIBRARY_NAME "hal-backend-ml-snpe")
 ADD_LIBRARY(${SNPE_LIBRARY_NAME} SHARED ${SNPE_SRCS} ${UTIL_SRCS})
-TARGET_LINK_LIBRARIES(${SNPE_LIBRARY_NAME} ${hal_rootstrap_pkgs_LDFLAGS})
+TARGET_LINK_LIBRARIES(${SNPE_LIBRARY_NAME} ${snpe_build_dep_pkgs_LDFLAGS})
 INSTALL(TARGETS ${SNPE_LIBRARY_NAME} DESTINATION ${HAL_LIBDIR} COMPONENT RuntimeLibraries)
 ENDIF()
diff --git a/packaging/hal-backend-ml.spec b/packaging/hal-backend-ml.spec
index db5d868..d39e204 100644
--- a/packaging/hal-backend-ml.spec
+++ b/packaging/hal-backend-ml.spec
@@ -9,7 +9,6 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(hal-rootstrap)
 
-
 # For DA
 %if 0%{?_with_da_profile}
 
@@ -28,6 +27,9 @@ BuildRequires:  snpe-devel
 
 %endif # For DA
 
+# Let's disable rootstrap checker for now. It complains that ovxlib, amlogic-vsi-npu-sdk, snpe-devel should be not used.
+%define disable_hal_rootstrap_checker 1
+
 
 %description
 ML HAL backend drivers for various targets
diff --git a/src/hal-backend-ml-vivante.cc b/src/hal-backend-ml-vivante.cc
index 3ea095a..7f85f9f 100644
--- a/src/hal-backend-ml-vivante.cc
+++ b/src/hal-backend-ml-vivante.cc
@@ -160,8 +160,7 @@ static int ml_vivante_invoke(void *backend_private, const GstTensorMemory *input
     vivante->result_vsi_nn_CopyDataToTensor (vivante->graph, tensor, (uint8_t *) input[i].data);
   }
 
-  g_warning ("skip rungraph.. 됐다 치고"); g_usleep (1000 * 100);
-  // vivante->result_vsi_nn_RunGraph (vivante->graph);
+  vivante->result_vsi_nn_RunGraph (vivante->graph);
 
   if (vivante->postProcess)
     vivante->postProcessFunc (vivante->graph);
-- 
2.34.1