Revert "Update SNPE to 1.61.0.3358 (commaai#24253)"

This reverts commit 40cf4a7.

release/files_tici

@@ -1,5 +1,5 @@
 third_party/snpe/larch64**
-third_party/snpe/aarch64-ubuntu-gcc7.5/*
+third_party/snpe/aarch64-linux-gcc4.9/*
 third_party/mapbox-gl-native-qt/include/*
 
 selfdrive/timezoned.py

selfdrive/modeld/SConscript

@@ -4,7 +4,7 @@ Import('env', 'arch', 'cereal', 'messaging', 'common', 'gpucommon', 'visionipc')
 lenv = env.Clone()
 
 libs = [cereal, messaging, common, visionipc, gpucommon,
-        'OpenCL', 'SNPE', 'capnp', 'zmq', 'kj', 'yuv']
+        'OpenCL', 'SNPE', 'symphony-cpu', 'capnp', 'zmq', 'kj', 'yuv']
 
 def get_dlsym_offset():
   """Returns the offset between dlopen and dlsym in libdl.so"""
@@ -57,6 +57,7 @@ else:
 
     # no SNPE on Mac
     del libs[libs.index('SNPE')]
+    del libs[libs.index('symphony-cpu')]
     del common_src[common_src.index('runners/snpemodel.cc')]
 
 common_model = lenv.Object(common_src)

third_party/snpe/include/DlSystem/DlEnums.hpp

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-//  Copyright (c) 2014-2021 Qualcomm Technologies, Inc.
+//  Copyright (c) 2014-2020 Qualcomm Technologies, Inc.
 //  All Rights Reserved.
 //  Confidential and Proprietary - Qualcomm Technologies, Inc.
 //
@@ -76,8 +76,6 @@ enum class RuntimeCheckOption_t
    NORMAL_CHECK = 0,
    /// Perform basic runtime available check, may be runtime specific
    BASIC_CHECK = 1,
-   /// Perform unsignedPD runtime available check
-   UNSIGNEDPD_CHECK = 2,
 };
 
 /**
@@ -198,36 +196,6 @@ enum class ImageEncoding_t
    BGR = 6
 };
 
-/**
- * Enumeration that lists the supported LogLevels that can be set by users.
- */
-enum class LogLevel_t
-{
-    /// Enumeration variable to be used by user to set logging level to FATAL.
-    LOG_FATAL = 0,
-
-    /// Enumeration variable to be used by user to set logging level to ERROR.
-    LOG_ERROR = 1,
-
-    /// Enumeration variable to be used by user to set logging level to WARN.
-    LOG_WARN = 2,
-
-    /// Enumeration variable to be used by user to set logging level to INFO.
-    LOG_INFO = 3,
-
-    /// Enumeration variable to be used by user to set logging level to VERBOSE.
-    LOG_VERBOSE = 4
-};
-
-typedef enum : int
-{
-   UNSPECIFIED = 0,
-   FLOATING_POINT_32 = 1,
-   FLOATING_POINT_16 = 2,
-   FIXED_POINT_8 =  3,
-   FIXED_POINT_16 = 4
-} IOBufferDataType_t;
-
 }} // namespaces end
 
 

third_party/snpe/include/DlSystem/DlError.hpp

@@ -1,6 +1,6 @@
 //==============================================================================
 //
-//  Copyright (c) 2016-2021 Qualcomm Technologies, Inc.
+//  Copyright (c) 2016-2020 Qualcomm Technologies, Inc.
 //  All Rights Reserved.
 //  Confidential and Proprietary - Qualcomm Technologies, Inc.
 //
@@ -59,7 +59,6 @@ enum class ZDL_EXPORT ErrorCode : uint32_t {
    SNPE_DLSYSTEM_BUFFER_CAST_FAILED                      = 216,
    SNPE_DLSYSTEM_WRONG_TRANSITION_TYPE                   = 217,
    SNPE_DLSYSTEM_LAYER_ALREADY_REGISTERED                = 218,
-   SNPE_DLSYSTEM_TENSOR_DIM_INVALID                      = 219,
 
    SNPE_DLSYSTEM_BUFFERENCODING_UNKNOWN                  = 240,
    SNPE_DLSYSTEM_BUFFER_INVALID_PARAM                    = 241,
@@ -90,7 +89,6 @@ enum class ZDL_EXPORT ErrorCode : uint32_t {
    SNPE_NETWORK_MISMATCH_BETWEEN_NAMES_AND_DIMS          = 404,
    SNPE_NETWORK_MISSING_INPUT_NAMES                      = 405,
    SNPE_NETWORK_MISSING_OUTPUT_NAMES                     = 406,
-   SNPE_NETWORK_EXECUTION_FAILED                         = 407,
 
    // Host runtime errors
    SNPE_HOST_RUNTIME_TARGET_UNAVAILABLE                  = 500,
@@ -142,13 +140,6 @@ enum class ZDL_EXPORT ErrorCode : uint32_t {
    SNPE_DSP_RUNTIME_INVALID_PARAM_ERROR                  = 909,
    SNPE_DSP_RUNTIME_SYSTEM_ERROR                         = 910,
    SNPE_DSP_RUNTIME_CRASHED_ERROR                        = 911,
-   SNPE_DSP_BUFFER_SIZE_ERROR                            = 912,
-   SNPE_DSP_UDO_EXECUTE_ERROR                            = 913,
-   SNPE_DSP_UDO_LIB_NOT_REGISTERED_ERROR                 = 914,
-   SNPE_DSP_UDO_INVALID_QUANTIZATION_TYPE_ERROR          = 915,
-   SNPE_DSP_RUNTIME_INVALID_RPC_DRIVER                   = 916,
-   SNPE_DSP_RUNTIME_RPC_PERMISSION_ERROR                 = 917,
-   SNPE_DSP_RUNTIME_DSP_FILE_OPEN_ERROR                  = 918,
 
    // Model validataion errors
    SNPE_MODEL_VALIDATION_LAYER_NOT_SUPPORTED             = 1000,
@@ -205,10 +196,7 @@ enum class ZDL_EXPORT ErrorCode : uint32_t {
 
    // Infrastructure Errors
    SNPE_INFRA_CLUSTERMGR_INSTANCE_INVALID                = 1600,
-   SNPE_INFRA_CLUSTERMGR_EXECUTE_SYNC_FAILED             = 1601,
-
-   // Memory Errors
-   SNPE_MEMORY_CORRUPTION_ERROR                          = 1700
+   SNPE_INFRA_CLUSTERMGR_EXECUTE_SYNC_FAILED             = 1601
 
 };
 

third_party/snpe/include/DlSystem/IUDL.hpp

@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//  Copyright (c) 2016-2021 Qualcomm Technologies, Inc.
+//  Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
 //  All Rights Reserved.
 //  Confidential and Proprietary - Qualcomm Technologies, Inc.
 //
@@ -13,10 +13,10 @@
 
 namespace zdl {
 namespace DlSystem {
+/** @addtogroup c_plus_plus_apis C++
+@{ */
 
 /**
- * NOTE: DEPRECATED, MAY BE REMOVED IN THE FUTURE.
- *
  * @brief .
  *
  * Base class user concrete UDL implementation.
@@ -32,17 +32,13 @@ namespace DlSystem {
 class ZDL_EXPORT IUDL {
 public:
    /**
-    * NOTE: DEPRECATED, MAY BE REMOVED IN THE FUTURE.
-    *
     * @brief .
     *
     * Destructor
     */
    virtual ~IUDL() = default;
 
    /**
-    * NOTE: DEPRECATED, MAY BE REMOVED IN THE FUTURE.
-    *
     * @brief Sets up the user's environment.
     * This is called by the SNPE framework to allow the user the
     * opportunity to setup anything which is needed for running
@@ -70,8 +66,6 @@ class ZDL_EXPORT IUDL {
                       size_t outsz, const size_t **outdim, const size_t *outdimsz)  = 0;
 
    /**
-    * NOTE: DEPRECATED, MAY BE REMOVED IN THE FUTURE.
-    *
     * @brief Close the instance. Invoked by the SNPE
     * framework to allow the user the opportunity to release any resources
     * allocated during setup.
@@ -81,8 +75,6 @@ class ZDL_EXPORT IUDL {
    virtual void close(void *cookie) noexcept = 0;
 
    /**
-    * NOTE: DEPRECATED, MAY BE REMOVED IN THE FUTURE.
-    *
     * @brief Execute the user defined layer
     *
     * @param cookie User provided opaque data returned by the SNPE 
@@ -97,6 +89,7 @@ class ZDL_EXPORT IUDL {
     */
    virtual bool execute(void *cookie, const float **input, float **output)  = 0;
 };
+/** @} */ /* end_addtogroup c_plus_plus_apis C++ */
 
 } // ns DlSystem