[kbenchmark] rename acl kernel directory (#5570)

* [kbenchmark] rename acl kernel directory

armcl to acl_cl
armne to acl_neon

Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
* Change the include directory path

* Do not print psABI warnings

diff --git a/tools/kbenchmark/CMakeLists.txt b/tools/kbenchmark/CMakeLists.txt
index 148db8c..ebf9a67 100644 (file)
--- a/tools/kbenchmark/CMakeLists.txt
+++ b/tools/kbenchmark/CMakeLists.txt
@@ -18,6 +18,7 @@ endif(NOT Boost_FOUND)
 file(GLOB_RECURSE SOURCES "*.cc")
 
 add_executable(kbenchmark ${SOURCES})
+target_compile_options(kbenchmark PRIVATE -Wno-psabi)
 target_include_directories(kbenchmark PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(kbenchmark PUBLIC nonius)
 target_link_libraries(kbenchmark PUBLIC dl)

diff --git a/tools/kbenchmark/kernels/armcl/CMakeLists.txt b/tools/kbenchmark/kernels/acl_cl/CMakeLists.txt
similarity index 55%
rename from tools/kbenchmark/kernels/armcl/CMakeLists.txt
rename to tools/kbenchmark/kernels/acl_cl/CMakeLists.txt
index 752d4e3..c727905 100644 (file)
--- a/tools/kbenchmark/kernels/armcl/CMakeLists.txt
+++ b/tools/kbenchmark/kernels/acl_cl/CMakeLists.txt
@@ -3,17 +3,18 @@ if(NOT ARMCompute_FOUND)
   return()
 endif(NOT ARMCompute_FOUND)
 
-function(add_kben_armcl_library)
+function(add_kben_acl_cl_library)
   cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
 
   add_library(${ARG_NAME} SHARED ${ARG_SOURCES})
-  target_include_directories(${ARG_NAME} PUBLIC ../acl_common)
+  target_compile_options(${ARG_NAME} PRIVATE -Wno-psabi)
+  target_include_directories(${ARG_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
   target_link_libraries(${ARG_NAME} nonius)
   target_link_libraries(${ARG_NAME} arm_compute)
   target_link_libraries(${ARG_NAME} arm_compute_ex)
   target_link_libraries(${ARG_NAME} pthread)
   install(TARGETS ${ARG_NAME} DESTINATION lib/kben)
-endfunction(add_kben_armcl_library)
+endfunction(add_kben_acl_cl_library)
 
-add_kben_armcl_library(NAME kben_armcl_conv SOURCES Convolution.cpp)
-add_kben_armcl_library(NAME kben_armcl_transpose_conv SOURCES TransposeConv.cpp)
+add_kben_acl_cl_library(NAME kben_acl_cl_conv SOURCES Convolution.cpp)
+add_kben_acl_cl_library(NAME kben_acl_cl_transpose_conv SOURCES TransposeConv.cpp)

diff --git a/tools/kbenchmark/kernels/armcl/Convolution.cpp b/tools/kbenchmark/kernels/acl_cl/Convolution.cpp
similarity index 100%
rename from tools/kbenchmark/kernels/armcl/Convolution.cpp
rename to tools/kbenchmark/kernels/acl_cl/Convolution.cpp

diff --git a/tools/kbenchmark/kernels/armcl/TransposeConv.cpp b/tools/kbenchmark/kernels/acl_cl/TransposeConv.cpp
similarity index 99%
rename from tools/kbenchmark/kernels/armcl/TransposeConv.cpp
rename to tools/kbenchmark/kernels/acl_cl/TransposeConv.cpp
index 2c72ecd..8278a61 100644 (file)
--- a/tools/kbenchmark/kernels/armcl/TransposeConv.cpp
+++ b/tools/kbenchmark/kernels/acl_cl/TransposeConv.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include "Utils.h"
+#include "acl_common/Utils.h"
 
 using namespace arm_compute;
 using namespace kbenchmark::kernels::acl_common;

diff --git a/tools/kbenchmark/kernels/armne/CMakeLists.txt b/tools/kbenchmark/kernels/acl_neon/CMakeLists.txt
similarity index 51%
rename from tools/kbenchmark/kernels/armne/CMakeLists.txt
rename to tools/kbenchmark/kernels/acl_neon/CMakeLists.txt
index d267c36..54afdab 100644 (file)
--- a/tools/kbenchmark/kernels/armne/CMakeLists.txt
+++ b/tools/kbenchmark/kernels/acl_neon/CMakeLists.txt
@@ -3,16 +3,17 @@ if(NOT ARMCompute_FOUND)
   return()
 endif(NOT ARMCompute_FOUND)
 
-function(add_kben_armne_library)
+function(add_kben_acl_neon_library)
   cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
 
   add_library(${ARG_NAME} SHARED ${ARG_SOURCES})
-  target_include_directories(${ARG_NAME} PUBLIC ../acl_common)
+  target_compile_options(${ARG_NAME} PRIVATE -Wno-psabi)
+  target_include_directories(${ARG_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
   target_link_libraries(${ARG_NAME} nonius)
   target_link_libraries(${ARG_NAME} arm_compute)
   target_link_libraries(${ARG_NAME} pthread)
   install(TARGETS ${ARG_NAME} DESTINATION lib/kben)
-endfunction(add_kben_armne_library)
+endfunction(add_kben_acl_neon_library)
 
-add_kben_armne_library(NAME kben_armne_conv SOURCES Convolution.cpp)
-add_kben_armne_library(NAME kben_armne_transpose_conv SOURCES TransposeConv.cpp)
+add_kben_acl_neon_library(NAME kben_acl_neon_conv SOURCES Convolution.cpp)
+add_kben_acl_neon_library(NAME kben_acl_neon_transpose_conv SOURCES TransposeConv.cpp)

diff --git a/tools/kbenchmark/kernels/armne/Convolution.cpp b/tools/kbenchmark/kernels/acl_neon/Convolution.cpp
similarity index 100%
rename from tools/kbenchmark/kernels/armne/Convolution.cpp
rename to tools/kbenchmark/kernels/acl_neon/Convolution.cpp

diff --git a/tools/kbenchmark/kernels/armne/TransposeConv.cpp b/tools/kbenchmark/kernels/acl_neon/TransposeConv.cpp
similarity index 99%
rename from tools/kbenchmark/kernels/armne/TransposeConv.cpp
rename to tools/kbenchmark/kernels/acl_neon/TransposeConv.cpp
index bb61b86..0878499 100644 (file)
--- a/tools/kbenchmark/kernels/armne/TransposeConv.cpp
+++ b/tools/kbenchmark/kernels/acl_neon/TransposeConv.cpp
@@ -28,7 +28,7 @@
 #include <cassert>
 #include <stdexcept>
 
-#include "Utils.h"
+#include "acl_common/Utils.h"
 
 using namespace arm_compute;
 using namespace kbenchmark::kernels::acl_common;