Skip to content

Revert "[QNN EP] Fix error messages being logged as VERBOSE instead o… #27650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianleiwu merged 2 commits into from
Mar 14, 2026
Merged

Revert "[QNN EP] Fix error messages being logged as VERBOSE instead o… #27650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbec5a
Revert "[QNN EP] Fix error messages being logged as VERBOSE instead o…
derdeljan-msft Mar 13, 2026
1b2a166
Merge remote-tracking branch 'origin/main' into derdeljan/revert_qnn_…
tianleiwu Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ void QnnLogging(const char* format,
QnnLog_Level_t level,
uint64_t timestamp,
va_list argument_parameter) {
ORT_UNUSED_PARAMETER(level);
ORT_UNUSED_PARAMETER(timestamp);

if (!::onnxruntime::logging::LoggingManager::HasDefaultLogger()) {
Expand All @@ -454,8 +455,7 @@ void QnnLogging(const char* format,
}

const auto& logger = ::onnxruntime::logging::LoggingManager::DefaultLogger();
// Map QNN log level to ORT severity
logging::Severity severity = QnnBackendManager::MapQNNLogLevelToOrtSeverity(level);
const auto severity = ::onnxruntime::logging::Severity::kVERBOSE;
const auto data_type = ::onnxruntime::logging::DataType::SYSTEM;

if (logger.OutputIsEnabled(severity, data_type)) {
Expand Down Expand Up @@ -529,22 +529,6 @@ QnnLog_Level_t QnnBackendManager::MapOrtSeverityToQNNLogLevel(logging::Severity
}
}

/* static */ logging::Severity QnnBackendManager::MapQNNLogLevelToOrtSeverity(QnnLog_Level_t qnn_log_level) {
// Map QNN log level to ORT log severity
switch (qnn_log_level) {
case QNN_LOG_LEVEL_VERBOSE:
case QNN_LOG_LEVEL_DEBUG:
return logging::Severity::kVERBOSE;
case QNN_LOG_LEVEL_INFO:
return logging::Severity::kINFO;
case QNN_LOG_LEVEL_WARN:
return logging::Severity::kWARNING;
case QNN_LOG_LEVEL_ERROR:
default:
return logging::Severity::kERROR;
}
}

Status QnnBackendManager::ResetQnnLogLevel(std::optional<logging::Severity> ort_log_level) {
std::lock_guard<std::recursive_mutex> lock(logger_recursive_mutex_);
if (!backend_setup_completed_ || logger_ == nullptr) {
Expand Down
4 changes: 1 addition & 3 deletions onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,6 @@ class QnnBackendManager : public std::enable_shared_from_this<QnnBackendManager>
Qnn_ErrorHandle_t ReleaseDmaData(Qnn_ContextBinaryDmaDataMem_t data_mem, void* mapped_base_ptr);
#endif

QnnLog_Level_t MapOrtSeverityToQNNLogLevel(logging::Severity ort_log_level);
static logging::Severity MapQNNLogLevelToOrtSeverity(QnnLog_Level_t qnn_log_level);

#ifdef QNN_FILE_MAPPED_WEIGHTS_AVAILABLE
typedef struct FileMappingCallbackInfo {
void* const mapped_file_ptr;
Expand Down Expand Up @@ -379,6 +376,7 @@ class QnnBackendManager : public std::enable_shared_from_this<QnnBackendManager>

const char* QnnProfileErrorToString(QnnProfile_Error_t error);
std::string QnnErrorHandleToString(Qnn_ErrorHandle_t error);
QnnLog_Level_t MapOrtSeverityToQNNLogLevel(logging::Severity ort_log_level);

// Adds a new QNN context.
// Transfers ownership of `context_handle` (i.e., responsibility of freeing it) to this instance
Expand Down
Loading