Merge amd-staging into amd-master 20220722

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: I1575353fb596e1fa001b888ff8c3a4555375efee
此提交包含在:
Hao Zhou
2022-07-22 11:51:56 +08:00
當前提交 350b77a1fc
共有 2 個檔案被更改,包括 7 行新增 和 2 行删除
+6 -2
查看文件
@@ -3300,6 +3300,12 @@ if __name__ == '__main__':
if args.save: if args.save:
save(deviceList, args.save) save(deviceList, args.save)
if RETCODE and not PRINT_JSON:
logging.debug(' \t\t One or more commands failed.')
# Set RETCODE value to 0, unless loglevel is None or 'warning' (default)
if args.loglevel is None or getattr(logging, args.loglevel.upper(), logging.WARNING) == logging.WARNING:
RETCODE = 0
if PRINT_JSON: if PRINT_JSON:
# Check that we have some actual data to print, instead of the # Check that we have some actual data to print, instead of the
# empty list that we initialized above # empty list that we initialized above
@@ -3327,8 +3333,6 @@ if __name__ == '__main__':
devCsv = formatCsv(deviceList) devCsv = formatCsv(deviceList)
print(devCsv) print(devCsv)
if RETCODE and not PRINT_JSON:
logging.debug(' \t\t One or more commands failed.')
printLogSpacer(footerString) printLogSpacer(footerString)
rsmi_ret_ok(rocmsmi.rsmi_shut_down()) rsmi_ret_ok(rocmsmi.rsmi_shut_down())
+1
查看文件
@@ -153,6 +153,7 @@ def perf_level_string(i):
5: 'STABLE_PEAK', 5: 'STABLE_PEAK',
6: 'STABLE_MIN_MCLK', 6: 'STABLE_MIN_MCLK',
7: 'STABLE_MIN_SCLK', 7: 'STABLE_MIN_SCLK',
8: 'PERF_DETERMINISM',
} }
return switcher.get(i, 'UNKNOWN') return switcher.get(i, 'UNKNOWN')