Skip to content

Add buffer configs for TH5 C224 and C256 SKUs #21155

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.

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
merged 8 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '5m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic",
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '5m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic",
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
Original file line number Diff line number Diff line change
Expand Up @@ -1848,3 +1848,12 @@ device:
DEVICE_CONFIG:
AUTOLOAD_BOARD_SETTINGS: 0
...
---
device:
0:
TM_THD_CONFIG:
SKIP_BUFFER_RESERVATION: 0
THRESHOLD_MODE: LOSSY
TM_SCHEDULER_CONFIG:
NUM_MC_Q: NUM_MC_Q_2
...

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '5m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic",
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '5m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic",
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
Original file line number Diff line number Diff line change
Expand Up @@ -1926,3 +1926,12 @@ device:
DEVICE_CONFIG:
AUTOLOAD_BOARD_SETTINGS: 0
...
---
device:
0:
TM_THD_CONFIG:
SKIP_BUFFER_RESERVATION: 0
THRESHOLD_MODE: LOSSY
TM_SCHEDULER_CONFIG:
NUM_MC_Q: NUM_MC_Q_2
...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The BCM file seems to be missing all the queue configurations, this might cause problems. even CPU queue is not here, not sure if this is expected.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

service pool is also missing, is this expected? (ideally, this can be done by buffer SAI APIs, but in the 256x200G HWSKU, it didn't really work well.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for pure lossy config using SDK defaults. Will need to check if explicit service pool configs are required.

4 changes: 2 additions & 2 deletions platform/broadcom/sai.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LIBSAIBCM_XGS_VERSION = 11.2.16.2
LIBSAIBCM_XGS_VERSION = 11.2.17.2
LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.16.2
LIBSAIBCM_XGS_BRANCH_NAME = SAI_11_2_16_2_CS00012372635
LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this be the final branch name?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is a temporary branch. Once we get the final fix from BCM, this will be moved to main branch

LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"
Expand Down
Loading