Skip to content

[action] [PR:17788] [Mellanox] Update qos sai test for SN56xx buffer configuration alignment #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Apr 28, 2025
Merged

[action] [PR:17788] [Mellanox] Update qos sai test for SN56xx buffer configuration alignment #230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions tests/qos/qos_sai_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,9 @@ def __compute_buffer_threshold_for_nvidia_device(self, dut_asic, table, port, pg
port_dynamic_th = dut_asic.run_redis_cmd(
argv=["redis-cli", "-n", db, "HGET", f'BUFFER_PROFILE_TABLE:{port_profile}', "dynamic_th"]
)[0]
port_profile_reserved_size = dut_asic.run_redis_cmd(
argv=["redis-cli", "-n", db, "HGET", f'BUFFER_PROFILE_TABLE:{port_profile}', "size"]
)[0]
break
if port_dynamic_th:

Expand All @@ -255,17 +258,24 @@ def calculate_alpha(dynamic_th):
)[0]
)

buffer_scale = port_alpha * pg_q_alpha / (port_alpha * pg_q_alpha + pg_q_alpha + 1)
pg_q_reserved_size = int(port_profile_reserved_size) * pg_q_alpha / (1 + pg_q_alpha)
reserved_size = pg_q_reserved_size if pg_q_reserved_size > int(pg_q_buffer_profile["size"]) \
else int(pg_q_buffer_profile["size"])

if pg_q_buffer_profile['dynamic_th'] == "7" and port_dynamic_th != "7":
buffer_scale = port_alpha / (1 + port_alpha)
else:
buffer_scale = port_alpha * pg_q_alpha / (port_alpha * pg_q_alpha + pg_q_alpha + 1)

pg_q_max_occupancy = int(buffer_size * buffer_scale)

pg_q_buffer_profile.update(
{"static_th": int(
pg_q_buffer_profile["size"]) + int(pg_q_max_occupancy)}
{"static_th": int(pg_q_max_occupancy) + int(reserved_size)}
)
pg_q_buffer_profile["pg_q_alpha"] = pg_q_alpha
pg_q_buffer_profile["port_alpha"] = port_alpha
pg_q_buffer_profile["pool_size"] = buffer_size
logger.info(f'pg_q_buffer_profile:{pg_q_buffer_profile}')
else:
raise Exception("Not found port dynamic th")

Expand Down Expand Up @@ -2128,8 +2138,8 @@ def egressLossyProfile(
logger.info(f"{srcport} has only lossy queue")
if is_lossy_queue_only:
is_lossy_queue_only = True
queue_table_postfix_list = ['1-3', '4', '5']
queue_to_dscp_map = {'1-3': '1', '4': '11', '5': '31'}
queue_table_postfix_list = ['0-3', '4', '5']
queue_to_dscp_map = {'0-3': '1', '4': '11', '5': '31'}
queues = random.choice(queue_table_postfix_list)
else:
queues = "0-2"
Expand All @@ -2145,7 +2155,7 @@ def egressLossyProfile(
)
if is_lossy_queue_only:
egress_lossy_profile['lossy_dscp'] = queue_to_dscp_map[queues]
egress_lossy_profile['lossy_queue'] = '1' if queues == '1-3' else queues
egress_lossy_profile['lossy_queue'] = '1' if queues == '0-3' else queues
logger.info(f"queues:{queues}, egressLossyProfile: {egress_lossy_profile}")

yield egress_lossy_profile
Expand Down
Loading