[SWDEV-488303] Updated CU occupancy for per-process retrieval (#243)
Change-Id: I2990597c6dd4b2e8cf3e11ce60f72049ebdd9a8c Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Cette révision appartient à :
Arif, Maisam a créé et 
GitHub a révisé
1 Parent
fba62e2270
révision
0fdaebdbaa
12 fichiers modifiés
+232
-259
Aucun fichier ne correspond à votre recherche
@@ -3300,8 +3300,21 @@ class AMDSMICommands():
|
||||
|
||||
filtered_process_values = []
|
||||
for process_info in process_list:
|
||||
process_info['mem_usage'] = process_info.pop('mem')
|
||||
process_info['usage'] = process_info.pop('engine_usage')
|
||||
process_info = {
|
||||
"name": process_info["name"],
|
||||
"pid": process_info["pid"],
|
||||
"memory_usage": {
|
||||
"gtt_mem": process_info["memory_usage"]["gtt_mem"],
|
||||
"cpu_mem": process_info["memory_usage"]["cpu_mem"],
|
||||
"vram_mem": process_info["memory_usage"]["vram_mem"],
|
||||
},
|
||||
"mem_usage": process_info["mem"],
|
||||
"usage": {
|
||||
"gfx": process_info["engine_usage"]["gfx"],
|
||||
"enc": process_info["engine_usage"]["enc"],
|
||||
},
|
||||
"cu_occupancy": process_info["cu_occupancy"]
|
||||
}
|
||||
|
||||
engine_usage_unit = "ns"
|
||||
memory_usage_unit = "B"
|
||||
@@ -5714,35 +5727,43 @@ class AMDSMICommands():
|
||||
logging.debug("Failed to get process list for gpu %s | %s", gpu_id, e.get_error_info())
|
||||
raise e
|
||||
|
||||
try:
|
||||
num_compute_units = amdsmi_interface.amdsmi_get_gpu_asic_info(args.gpu)['num_compute_units']
|
||||
except (KeyError, amdsmi_exception.AmdSmiLibraryException) as e:
|
||||
num_compute_units = "N/A"
|
||||
logging.debug("Failed to get num compute units for gpu %s | %s", gpu_id, e.get_error_info())
|
||||
|
||||
# Clean processes dictionary
|
||||
filtered_process_values = []
|
||||
for process_info in process_list:
|
||||
process_info['mem_usage'] = process_info.pop('mem')
|
||||
process_info['usage'] = process_info.pop('engine_usage')
|
||||
process_info.pop('mem') # Remove 'mem' value
|
||||
process_info.pop('engine_usage') # Remove 'engine_usage' value
|
||||
|
||||
engine_usage_unit = "ns"
|
||||
memory_usage_unit = "B"
|
||||
|
||||
if self.logger.is_human_readable_format():
|
||||
process_info['mem_usage'] = self.helpers.convert_bytes_to_readable(process_info['mem_usage'])
|
||||
for usage_metric in process_info['memory_usage']:
|
||||
process_info["memory_usage"][usage_metric] = self.helpers.convert_bytes_to_readable(process_info["memory_usage"][usage_metric])
|
||||
memory_usage_unit = ""
|
||||
|
||||
process_info['mem_usage'] = self.helpers.unit_format(self.logger,
|
||||
process_info['mem_usage'],
|
||||
memory_usage_unit)
|
||||
|
||||
for usage_metric in process_info['usage']:
|
||||
process_info['usage'][usage_metric] = self.helpers.unit_format(self.logger,
|
||||
process_info['usage'][usage_metric],
|
||||
engine_usage_unit)
|
||||
|
||||
for usage_metric in process_info['memory_usage']:
|
||||
process_info['memory_usage'][usage_metric] = self.helpers.unit_format(self.logger,
|
||||
process_info['memory_usage'][usage_metric],
|
||||
memory_usage_unit)
|
||||
|
||||
if 'cu_occupancy' in process_info:
|
||||
try:
|
||||
cu_occupancy = process_info['cu_occupancy']
|
||||
if num_compute_units != "N/A" and num_compute_units > 0:
|
||||
cu_percentage = round((cu_occupancy / num_compute_units) * 100, 1)
|
||||
process_info['cu_occupancy'] = self.helpers.unit_format(self.logger,
|
||||
cu_percentage,
|
||||
'%')
|
||||
else:
|
||||
process_info['cu_occupancy'] = "N/A"
|
||||
except Exception as e:
|
||||
process_info['cu_occupancy'] = "N/A"
|
||||
logging.debug("Failed to calculate cu_occupancy percentage for GPU %s | %s", gpu_id, str(e))
|
||||
|
||||
filtered_process_values.append({'process_info': process_info})
|
||||
|
||||
# If no processes are populated then we populate an N/A placeholder
|
||||
@@ -5757,8 +5778,7 @@ class AMDSMICommands():
|
||||
# Build the process table's title and header
|
||||
self.logger.secondary_table_title = "PROCESS INFO"
|
||||
self.logger.secondary_table_header = 'GPU'.rjust(3) + "NAME".rjust(22) + "PID".rjust(9) + "GTT_MEM".rjust(10) + \
|
||||
"CPU_MEM".rjust(10) + "VRAM_MEM".rjust(10) + "MEM_USAGE".rjust(11) + \
|
||||
"GFX".rjust(8) + "ENC".rjust(8)
|
||||
"CPU_MEM".rjust(10) + "VRAM_MEM".rjust(10) + "CU%".rjust(9)
|
||||
|
||||
if watching_output:
|
||||
self.logger.secondary_table_header = 'TIMESTAMP'.rjust(10) + ' ' + self.logger.secondary_table_header
|
||||
|
||||
@@ -214,9 +214,9 @@ class AMDSMILogger():
|
||||
if process_dict['process_info'] == "No running processes detected":
|
||||
# Add N/A for empty process_info
|
||||
table_values += "N/A".rjust(20) + "N/A".rjust(9) + "N/A".rjust(10) + \
|
||||
"N/A".rjust(10) + "N/A".rjust(10) + "N/A".rjust(11) + \
|
||||
"N/A".rjust(8) + "N/A".rjust(8) + '\n'
|
||||
"N/A".rjust(10) + "N/A".rjust(10) + "N/A".rjust(9) + '\n'
|
||||
else:
|
||||
#Fix this herre
|
||||
for process_key, process_value in process_dict['process_info'].items():
|
||||
string_process_value = str(process_value)
|
||||
if process_key == "name":
|
||||
@@ -230,11 +230,8 @@ class AMDSMILogger():
|
||||
elif process_key == "memory_usage":
|
||||
for memory_key, memory_value in process_value.items():
|
||||
table_values += str(memory_value).rjust(10)
|
||||
elif process_key == "mem_usage":
|
||||
table_values += string_process_value.rjust(11)
|
||||
elif process_key == "usage":
|
||||
for usage_key, usage_value in process_value.items():
|
||||
table_values += str(usage_value).rjust(8)
|
||||
elif process_key == "cu_occupancy":
|
||||
table_values += string_process_value.rjust(9)
|
||||
# Add the stored gpu and stored timestamp to the next line
|
||||
table_values += '\n'
|
||||
if stored_timestamp:
|
||||
@@ -486,20 +483,6 @@ class AMDSMILogger():
|
||||
raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported")
|
||||
|
||||
|
||||
def _store_output_rocmsmi(self, gpu_id, argument, data):
|
||||
if self.is_json_format():
|
||||
# put output into self.json_output
|
||||
pass
|
||||
elif self.is_csv_format():
|
||||
# put output into self.csv_output
|
||||
pass
|
||||
elif self.is_human_readable_format():
|
||||
# put output into self.human_readable_output
|
||||
pass
|
||||
else:
|
||||
raise amdsmi_cli_exceptions(self, "Invalid output format given, only json, csv, and human_readable supported")
|
||||
|
||||
|
||||
def store_multiple_device_output(self):
|
||||
""" Store the current output into the multiple_device_output
|
||||
then clear the current output
|
||||
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur