Fix hexagon_converter and complie merge bugBeluooo

.gitignore

@@ -1,3 +1,4 @@
+.gitignore
 bazel-*
 build/*
 cmake-build/
@@ -39,3 +40,18 @@ __pycache__
 *.egg-info
 .mace_run
 .model
+_fa_out
+BuildProducts.txt
+compileInfo.txt
+opt_conformer.txt
+opt_transformer.txt
+opt_hifigan.txt
+output.txt
+outputs_fa_out
+._qxx
+log
+workspace/
+log
+
+acc_conformer.txt
+conformer_vaild.txt

CMakeLists.txt

@@ -1,6 +1,5 @@
 # new CUDA support requires 3.8 for Linux/Mac, and 3.9 for Windows
 cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
-message("CMAKE_VERSION: ${CMAKE_VERSION}")
 project(mace C CXX)
 
 option(MACE_ENABLE_CPU "whether to enable CPU support" OFF)
@@ -19,8 +18,31 @@ option(MACE_ENABLE_OPT_SIZE "whether to build with optimized binary size" ON)
 option(MACE_ENABLE_OBFUSCATE "whether to build with code obfuscation" ON)
 option(MACE_ENABLE_CCACHE "whether to build with ccache" ON)
 option(MACE_ENABLE_CODE_MODE "whether to use code mode" OFF)
+option(MACE_ENABLE_RPCMEM "whether to use rpcmem" OFF)
 
+message("CMAKE_VERSION: ${CMAKE_VERSION}")
+message("CROSSTOOL_ROOT: ${CROSSTOOL_ROOT}")
+message("CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}")
 message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
+message("MACE_ENABLE_CPU = ${MACE_ENABLE_CPU} ")
+message("MACE_ENABLE_NEON = ${MACE_ENABLE_NEON} ")
+message("MACE_ENABLE_QUANTIZE = ${MACE_ENABLE_QUANTIZE} ")
+message("MACE_ENABLE_OPENCL = ${MACE_ENABLE_OPENCL} ")
+message("MACE_ENABLE_CUDA = ${MACE_ENABLE_CUDA} ")
+message("MACE_ENABLE_HEXAGON_DSP = ${MACE_ENABLE_HEXAGON_DSP} ")
+message("MACE_ENABLE_HEXAGON_HTA = ${MACE_ENABLE_HEXAGON_HTA} ")
+message("MACE_ENABLE_MTK_APU = ${MACE_ENABLE_MTK_APU} ")
+message("MACE_ENABLE_BFLOAT16 = ${MACE_ENABLE_BFLOAT16} ")
+message("MACE_ENABLE_FP16 = ${MACE_ENABLE_FP16} ")
+message("MACE_ENABLE_QNN = ${MACE_ENABLE_QNN} ")
+message("MACE_ENABLE_TESTS = ${MACE_ENABLE_TESTS} ")
+message("MACE_ENABLE_BENCHMARKS = ${MACE_ENABLE_BENCHMARKS} ")
+message("MACE_ENABLE_OPT_SIZE = ${MACE_ENABLE_OPT_SIZE} ")
+message("MACE_ENABLE_OBFUSCATE = ${MACE_ENABLE_OBFUSCATE} ")
+message("MACE_ENABLE_CCACHE = ${MACE_ENABLE_CCACHE} ")
+message("MACE_ENABLE_CODE_MODE = ${MACE_ENABLE_CODE_MODE}")
+message("MACE_ENABLE_RPCMEM = ${MACE_ENABLE_RPCMEM}")
+
 
 string(TOLOWER ${CMAKE_SYSTEM_NAME} MACE_OS)
 string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} MACE_TARGET)
@@ -40,7 +62,10 @@ if(MACE_ENABLE_OPT_SIZE)
  if(APPLE)
  set(MACE_LINKER_FLAGS "${MACE_LINKER_FLAGS} -Wl,-dead_strip -Wl,-dead_strip_dylibs")
  else(APPLE)
- set(MACE_LINKER_FLAGS "${MACE_LINKER_FLAGS} -Wl,--strip-all -Wl,--gc-sections")
+ set(MACE_LINKER_FLAGS "${MACE_LINKER_FLAGS} -Wl,--gc-sections")
+ if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug"))
+ set(MACE_LINKER_FLAGS "${MACE_LINKER_FLAGS} -Wl,--strip-all")
+ endif()
  set(MACE_CC_FLAGS "${MACE_CC_FLAGS} -ffunction-sections -fdata-sections")
  endif(APPLE)
  set(MACE_CC_FLAGS "${MACE_CC_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
@@ -57,7 +82,7 @@ endif(MACE_ENABLE_CODE_MODE)
 if(ANDROID)
  set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -Wall -Werror -Wno-error=unused-command-line-argument -Wno-error=unevaluated-expression -Wno-error=tautological-compare")
 else(ANDROID)
- set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -Wall -Werror")
+ set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -Wall -Werror -Wno-strict-aliasing")
 endif(ANDROID)
 set(MACE_CODE_CC_FLAGS "${MACE_CODE_CC_FLAGS} -std=c++11 -D_GLIBCXX_USE_C99_MATH_TR1")
 
@@ -102,28 +127,25 @@ if(MACE_ENABLE_RPCMEM)
 endif(MACE_ENABLE_RPCMEM)
 
 if(MACE_ENABLE_HEXAGON_DSP OR MACE_ENABLE_HEXAGON_HTA)
- if(ANDROID_ABI STREQUAL "arm64-v8a")
+ set(MACE_ENABLE_HEXAGON ON)
+ if(ANDROID_ABI STREQUAL "arm64-v8a" OR QNX)
  # Use gold linker to avoid linking check of libcdsprpc.so
  set(MACE_LINKER_FLAGS "${MACE_LINKER_FLAGS} -fuse-ld=gold")
- endif(ANDROID_ABI STREQUAL "arm64-v8a")
+ endif()
 endif(MACE_ENABLE_HEXAGON_DSP OR MACE_ENABLE_HEXAGON_HTA)
 
 if(MACE_ENABLE_HEXAGON_DSP)
- if(NOT ANDROID)
- message(FATAL_ERROR "Hexagon DSP is only supported on Android")
- endif(NOT ANDROID)
- # TODO => -DMACE_ENABLE_HEXAGON_DSP
+ if(NOT ANDROID AND NOT QNX)
+ message(FATAL_ERROR "Hexagon DSP is only supported on Android and Qnx")
+ endif()
+ add_definitions(-DMACE_ENABLE_RPCMEM)
  add_definitions(-DMACE_ENABLE_HEXAGON)
 endif(MACE_ENABLE_HEXAGON_DSP)
 
-if(MACE_ENABLE_RPCMEM)
- add_definitions(-DMACE_ENABLE_RPCMEM)
-endif(MACE_ENABLE_RPCMEM)
-
 if(MACE_ENABLE_HEXAGON_HTA)
- if(NOT ANDROID)
- message(FATAL_ERROR "Hexagon HTA is only supported on Android")
- endif(NOT ANDROID)
+ if(NOT ANDROID AND NOT QNX)
+ message(FATAL_ERROR "Hexagon HTA is only supported on Android and Qnx")
+ endif()
  add_definitions(-DMACE_ENABLE_HEXAGON_HTA)
  add_definitions(-DMACE_ENABLE_HTA)
 endif(MACE_ENABLE_HEXAGON_HTA)

cmake/toolchains/aarch64-linux-gnu.cmake

@@ -4,12 +4,12 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 
-set(CMAKE_C_COMPILER "${CROSSTOOL_ROOT}/bin/aarch64-linux-gnu-gcc")
+set( "${CROSSTOOL_ROOT}/bin/aarch64-linux-gnu-gcc")
 set(CMAKE_CXX_COMPILER "${CROSSTOOL_ROOT}/bin/aarch64-linux-gnu-g++")
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+set(CMAKE_FIND_ROOCMAKE_C_COMPILERT_PATH_MODE_PACKAGE ONLY)
 
 set(CMAKE_CXX_FLAGS "-march=armv8-a ${CMAKE_CXX_FLAGS}")

cmake/toolchains/qnx.cmake

@@ -0,0 +1,13 @@
+set(CMAKE_SYSTEM_NAME QNX)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(CMAKE_C_COMPILER "${CROSSTOOL_ROOT}/qnx700/host/linux/x86_64/usr/bin/ntoaarch64-gcc")
+set(CMAKE_CXX_COMPILER "${CROSSTOOL_ROOT}/qnx700/host/linux/x86_64/usr/bin/ntoaarch64-g++")
+set(CMAKE_FIND_ROOT_PATH "${CROSSTOOL_ROOT}/qnx700/target/qnx7")
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_CXX_FLAGS "-D_XOPEN_SOURCE=500 -D_QNX_SOURCE ${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+set(MACE_CC_FLAGS "-D_XOPEN_SOURCE=500 -D_QNX_SOURCE ${MACE_CC_FLAGS}")

include/mace/port/env.h

@@ -22,10 +22,14 @@
 #include <string>
 #include <vector>
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #include <malloc.h>
 #endif
 
+#if defined(__QNX__)
+void *memalign(size_t __alignment, size_t __size);
+#endif
+
 #include <sys/stat.h>
 
 #include "mace/public/mace.h"
@@ -101,7 +105,7 @@ inline MaceStatus Memalign(void **memptr, size_t alignment, size_t size) {
  return MaceStatus::MACE_SUCCESS;
  }
 #else
-#if defined(__ANDROID__) || defined(__hexagon__)
+#if defined(__ANDROID__) || defined(__hexagon__) || defined(__QNX__)
  *memptr = memalign(alignment, size);
  if (*memptr == nullptr) {
  return MaceStatus::MACE_OUT_OF_RESOURCES;