Skip to content

Commit 71a6c06

Browse files
committed
common: align verbose level interface
Align dnnl_set_verbose(int level) and DNNL_VERBOSE=level handling of verbose_t::warn.
1 parent 729590f commit 71a6c06

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/common/verbose.cpp

+4-9
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,8 @@ uint32_t get_verbose(verbose_t::flag_kind verbosity_kind,
181181
// Legacy: we accept values 0,1,2
182182
// 0 and none erase previously set flags, including error
183183
if (s == "0" || s == "none") k = verbose_t::none;
184-
if (s == "1") k |= verbose_t::exec_profile;
185-
if (s == "2")
186-
k |= verbose_t::exec_profile | verbose_t::create_profile;
184+
if (s == "1") k |= verbose_t::level1;
185+
if (s == "2") k |= verbose_t::level2;
187186
if (s == "all" || s == "-1") k |= verbose_t::all;
188187
if (s == "error") k |= verbose_t::error;
189188
if (s == "check")
@@ -1824,12 +1823,8 @@ dnnl_status_t dnnl_set_verbose(int level) {
18241823
if (level < 0 || level > 2) return invalid_arguments;
18251824

18261825
uint32_t verbose_level = verbose_t::none;
1827-
if (level == 1)
1828-
verbose_level
1829-
= verbose_t::error | verbose_t::exec_profile | verbose_t::warn;
1830-
if (level == 2)
1831-
verbose_level = verbose_t::error | verbose_t::exec_profile
1832-
| verbose_t::create_profile | verbose_t::warn;
1826+
if (level == 1) verbose_level = verbose_t::level1;
1827+
if (level == 2) verbose_level = verbose_t::level2;
18331828
// we put the lower byte of level as devinfo to preserve backward
18341829
// compatibility with historical VERBOSE={1,2}
18351830
if (level == 1 || level == 2) verbose_level |= (level << 24);

src/common/verbose.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ struct verbose_t {
174174
warn = 1 << 9,
175175
// the upper 8 bits are reserved for devinfo levels
176176
debuginfo = 1 << 24,
177+
177178
//
179+
level1 = error | exec_profile | warn,
180+
level2 = error | exec_profile | warn | create_profile,
181+
178182
all = (uint32_t)-1,
179183
};
180184

0 commit comments

Comments
 (0)