cmake changes for HexagonBuffer unit test

CMakeLists.txt

@@ -293,7 +293,6 @@ list(APPEND COMPILER_SRCS "src/target/datatype/myfloat/myfloat.cc")
 file(GLOB RUNTIME_SRCS
   src/runtime/*.cc
   src/runtime/vm/*.cc
-  src/runtime/hexagon/hexagon/hexagon_buffer.cc
 )
 
 if(BUILD_FOR_HEXAGON)
@@ -600,6 +599,8 @@ endif()
 if(GTEST_FOUND)
   file(GLOB_RECURSE TEST_SRCS tests/cpp/*.cc)
   add_executable(cpptest ${TEST_SRCS})
+  # include runtime files for unit testing
+  target_include_directories(cpptest PUBLIC "src/runtime")
   target_link_libraries(cpptest PRIVATE ${TVM_TEST_LIBRARY_NAME} GTest::GTest GTest::Main pthread dl)
   set_target_properties(cpptest PROPERTIES EXCLUDE_FROM_ALL 1)
   set_target_properties(cpptest PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)

cmake/modules/Hexagon.cmake

@@ -56,6 +56,8 @@ endif()
 # Don't run these checks when compiling Hexagon device code,
 # e.g. when compiling the TVM runtime for Hexagon.
 if (NOT BUILD_FOR_HEXAGON)
+  # append select runtime sources for unit testing
+  list(APPEND RUNTIME_SRCS src/runtime/hexagon/hexagon/hexagon_buffer.cc)
   if(USE_HEXAGON_LAUNCHER STREQUAL "ON")
     set(USE_HEXAGON_DEVICE "${PICK_SIM}")
   else()

src/runtime/hexagon/hexagon/hexagon_buffer.cc

@@ -17,7 +17,8 @@
  * under the License.
  */
 
-#include <tvm/runtime/hexagon/hexagon_buffer.h>
+#include "hexagon_buffer.h"
+
 #include <tvm/runtime/module.h>
 
 #include "hexagon_common.h"
@@ -49,7 +50,7 @@ struct Allocation {
 struct DDRAllocation : public Allocation {
   DDRAllocation(size_t nbytes, size_t alignment) : Allocation(nbytes, alignment) {
 #ifdef _WIN32
-    data_ = _aligned_malloc(size_t nbytes, size_t alignment);
+    data_ = _aligned_malloc(nbytes, alignment);
     CHECK(data != nullptr);
 #else
     int ret = posix_memalign(&data_, alignment, nbytes);

include/tvm/runtime/hexagon/hexagon_buffer.h → src/runtime/hexagon/hexagon/hexagon_buffer.h

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_H_
-#define TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_H_
+#ifndef TVM_RUNTIME_HEXAGON_HEXAGON_HEXAGON_BUFFER_H_
+#define TVM_RUNTIME_HEXAGON_HEXAGON_HEXAGON_BUFFER_H_
 
 #include <tvm/runtime/c_runtime_api.h>
 #include <tvm/runtime/device_api.h>
@@ -160,4 +160,4 @@ class HexagonBuffer {
 }  // namespace runtime
 }  // namespace tvm
 
-#endif  // TVM_RUNTIME_HEXAGON_HEXAGON_BUFFER_H_
+#endif  // TVM_RUNTIME_HEXAGON_HEXAGON_HEXAGON_BUFFER_H_

src/runtime/hexagon/hexagon/hexagon_common.cc

@@ -23,7 +23,6 @@
 
 #include "hexagon_common.h"
 
-#include <tvm/runtime/hexagon/hexagon_buffer.h>
 #include <tvm/runtime/logging.h>
 #include <tvm/runtime/registry.h>
 
@@ -32,6 +31,8 @@
 #include <utility>
 #include <vector>
 
+#include "hexagon_buffer.h"
+
 namespace tvm {
 namespace runtime {
 namespace hexagon {

src/runtime/hexagon/hexagon/hexagon_device_api_v2.cc

@@ -24,7 +24,6 @@
 #include "hexagon_device_api_v2.h"
 
 #include <dmlc/thread_local.h>
-#include <tvm/runtime/hexagon/hexagon_buffer.h>
 #include <tvm/runtime/logging.h>
 #include <tvm/runtime/ndarray.h>
 #include <tvm/runtime/registry.h>
@@ -33,6 +32,7 @@
 #include <cstring>
 
 #include "../../workspace_pool.h"
+#include "hexagon_buffer.h"
 #include "hexagon_common.h"
 
 namespace tvm {

src/runtime/hexagon/hexagon/hexagon_module.cc

@@ -24,7 +24,6 @@
 #include "../hexagon_module.h"
 
 #include <dmlc/memory_io.h>
-#include <tvm/runtime/hexagon/hexagon_buffer.h>
 #include <tvm/runtime/module.h>
 #include <tvm/runtime/registry.h>
 
@@ -33,6 +32,7 @@
 #include <vector>
 
 #include "../../library_module.h"
+#include "hexagon_buffer.h"
 #include "hexagon_common.h"
 
 namespace tvm {

tests/cpp/hexagon_test.cc

@@ -18,8 +18,8 @@
  */
 
 #include <gtest/gtest.h>
+#include <hexagon/hexagon/hexagon_buffer.h>
 #include <tvm/runtime/container/optional.h>
-#include <tvm/runtime/hexagon/hexagon_buffer.h>
 
 using namespace tvm::runtime;
 using namespace tvm::runtime::hexagon;