From 71c5d1360c2d414fc167d01d55e4befb13191d55 Mon Sep 17 00:00:00 2001 From: Quentin Khan Date: Fri, 11 Oct 2024 09:46:38 -0700 Subject: [PATCH] Always compile the body of `xnn_datatype_to_string`. This will allow tests compiled in optmimized builds to rely on that function to generate parametrized test names. PiperOrigin-RevId: 684867913 --- src/enums/datatype-strings.c | 2 -- src/xnnpack/log.h | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/enums/datatype-strings.c b/src/enums/datatype-strings.c index ed087f4fe69..7f54f334f44 100644 --- a/src/enums/datatype-strings.c +++ b/src/enums/datatype-strings.c @@ -12,7 +12,6 @@ // This function is defined inline when logging is disabled -#if XNN_LOG_LEVEL > 0 const char* xnn_datatype_to_string(enum xnn_datatype type) { switch (type) { case xnn_datatype_invalid: @@ -45,4 +44,3 @@ const char* xnn_datatype_to_string(enum xnn_datatype type) { XNN_UNREACHABLE; return NULL; } -#endif // XNN_LOG_LEVEL > 0 diff --git a/src/xnnpack/log.h b/src/xnnpack/log.h index 78164f5328c..e59f3a830cf 100644 --- a/src/xnnpack/log.h +++ b/src/xnnpack/log.h @@ -51,13 +51,7 @@ extern "C" { void xnn_vlog_fatal(const char* format, va_list args); #endif -#if XNN_LOG_LEVEL == XNN_LOG_NONE - inline static const char* xnn_datatype_to_string(enum xnn_datatype type) { - return "Unknown"; - } -#else - const char* xnn_datatype_to_string(enum xnn_datatype type); -#endif +const char* xnn_datatype_to_string(enum xnn_datatype type); #ifdef __cplusplus } // extern "C"