Merge amd-staging into amd-master 20230615

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: I67e22b2d06c8a9cd21aa3034bc78627d2fd0c586

python_smi_tools/rocm_smi.py

@@ -559,7 +559,7 @@ def printLog(device, metricName, value=None, extraSpace=False):
     else:
         logstr = 'GPU[%s]\t\t: %s' % (device, metricName)
     if device is None:
-        logstr = logstr.split(':')[1][1:]
+        logstr = logstr.split(':', 1)[1][1:]
     # Force thread safe printing
     lock = multiprocessing.Lock()
     lock.acquire()
@@ -2582,8 +2582,12 @@ def printTempGraph(deviceList, delay):
             if terminalWidth < originalTerminalWidth:
                 print('Terminal size cannot be decreased.\n\r')
                 return
+            if type(temp) == str:
+                tempString = temp
+            else:
+                tempString = str(int(temp))
             # Two spare Spaces
-            tempString = (str(int(temp)) + '°C').ljust(5)
+            tempString = (tempString + '°C').ljust(5)
             printStrings.append('\033[2;30;47mGPU[%d] Temp %s|%s%s\x1b[0m%s' % (device, tempString, color, paddingSpace[1:], remainderSpace))
             originalTerminalWidth = terminalWidth
             time.sleep((delay / 1000))

tests/rocm_smi_test/rsmitst.exclude

@@ -13,7 +13,9 @@ PERMANENT_BLACKLIST_ALL_ASICS=
 # This is the temporary blacklist for all ASICs. This is to be used when a test
 # is failing consistently
 TEMPORARY_BLACKLIST_ALL_ASICS=\
-"rsmitstReadOnly.TestVoltCurvRead"
+"rsmitstReadOnly.TestVoltCurvRead:"\
+"rsmitstReadOnly.TestFrequenciesRead:"\
+"rsmitstReadWrite.TestFrequenciesReadWrite"
 
 
 if [ -z "$PERMANENT_BLACKLIST_ALL_ASICS" -a -z "$TEMPORARY_BLACKLIST_ALL_ASICS" ]; then
@@ -21,7 +23,7 @@ if [ -z "$PERMANENT_BLACKLIST_ALL_ASICS" -a -z "$TEMPORARY_BLACKLIST_ALL_ASICS"
 else
   BLACKLIST_ALL_ASICS=\
 "$PERMANENT_BLACKLIST_ALL_ASICS:"\
-"$TEMPORARY_BLACKLIST_ALL_ASICS"
+"$TEMPORARY_BLACKLIST_ALL_ASICS:"
 fi
 
 # Device specific blacklists