Add revision to --showhw

Code changes related to the following:
  * Added 'rsmi_dev_revision_get()' related code
  * Test code
  * Functional tests

Change-Id: I8c2097c65384a028c8c8437b717d05d52fe45250
Signed-off-by: Oliveira, Daniel <daniel.oliveira@amd.com>

python_smi_tools/rocm_smi.py

@@ -249,6 +249,17 @@ def getId(device):
         return hex(dv_id.value)
 
 
+def getRev(device):
+    """ Return the hexadecimal value of a device's Revision
+
+    @param device: DRM device identifier
+    """
+    dv_rev = c_short()
+    ret = rocmsmi.rsmi_dev_revision_get(device, byref(dv_rev))
+    if rsmi_ret_ok(ret, device, 'get_device_rev'):
+        return hex(dv_rev.value)
+
+
 def getMaxPower(device):
     """ Return the maximum power cap of a given device
 
@@ -1601,19 +1612,23 @@ def showAllConciseHw(deviceList):
         print('ERROR: Cannot print JSON/CSV output for concise hardware output')
         sys.exit(1)
     printLogSpacer(' Concise Hardware Info ')
-    header = ['GPU', 'DID', 'GFX RAS', 'SDMA RAS', 'UMC RAS', 'VBIOS', 'BUS']
+    header = ['GPU', 'DID', 'DREV', 'GFX RAS', 'SDMA RAS', 'UMC RAS', 'VBIOS', 'BUS']
     head_widths = [len(head) + 2 for head in header]
     values = {}
     for device in deviceList:
         gpuid = getId(device)
         if str(gpuid).startswith('0x'):
             gpuid = str(gpuid)[2:]
+        gpurev = getRev(device)
+        if str(gpurev).startswith('0x'):
+            gpurev = str(gpurev)[2:]
+
         gfxRas = getRasEnablement(device, 'GFX')
         sdmaRas = getRasEnablement(device, 'SDMA')
         umcRas = getRasEnablement(device, 'UMC')
         vbios = getVbiosVersion(device)
         bus = getBus(device)
-        values['card%s' % (str(device))] = [device, gpuid, gfxRas, sdmaRas, umcRas, vbios, bus]
+        values['card%s' % (str(device))] = [device, gpuid, gpurev, gfxRas, sdmaRas, umcRas, vbios, bus]
     val_widths = {}
     for device in deviceList:
         val_widths[device] = [len(str(val)) + 2 for val in values['card%s' % (str(device))]]
@@ -1952,6 +1967,7 @@ def showId(deviceList):
     printLogSpacer(' ID ')
     for device in deviceList:
         printLog(device, 'GPU ID', getId(device))
+        printLog(device, 'GPU Rev', getRev(device))
     printLogSpacer()
 
 

python_smi_tools/rsmiBindings.py.in

@@ -11,8 +11,16 @@ import os
 
 # Use ROCm installation path if running from standard installation
 # With File Reorg rsmiBindings.py will be installed in  /opt/rocm/libexec/rocm_smi.
-# relative path changed accordingly
-path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+# relative path changed accordingly.
+# if ROCM_SMI_LIB_PATH is set, we can load 'librocm_smi64.so' from that location
+#
+path_librocm = str()
+rocm_smi_lib_path = os.getenv('ROCM_SMI_LIB_PATH')
+if (rocm_smi_lib_path != None):
+    path_librocm = rocm_smi_lib_path
+else:
+    path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+
 if not os.path.isfile(path_librocm):
     print('Unable to find %s . Trying /opt/rocm*' % path_librocm)
     for root, dirs, files in os.walk('/opt', followlinks=True):
@@ -22,9 +30,10 @@ if not os.path.isfile(path_librocm):
         print('Using lib from %s' % path_librocm)
     else:
         print('Unable to find librocm_smi64.so.@VERSION_MAJOR@')
+else:
+    print('Library loaded from: %s ' % path_librocm)
 
 # ----------> TODO: Support static libs as well as SO
-
 try:
     cdll.LoadLibrary(path_librocm)
     rocmsmi = CDLL(path_librocm)
@@ -36,7 +45,6 @@ except OSError:
           .format('\33[33m', '\033[0m'))
     exit()
 
-
 # Device ID
 dv_id = c_uint64()
 # GPU ID