solve conflict in sonic-net#19570

Signed-off-by: Janetxxx <[email protected]>
Janetxxx · Sep 17, 2024 · 5e4f96a · 5e4f96a
1 parent 3127fc4
commit 5e4f96a
Show file tree

Hide file tree

Showing 5 changed files with 1,281 additions and 2 deletions.
diff --git a/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED b/device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED
diff --git a/...sta/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/buffers_defaults_t0.j2 b/...sta/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/buffers_defaults_t0.j2
@@ -0,0 +1,36 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "165660324",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "29520896"
+        },
+        "egress_lossless_pool": {
+            "size": "165660324",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool": "ingress_lossless_pool",
+            "size": "0",
+            "static_th": "167546528"
+        },
+        "egress_lossy_profile": {
+            "pool": "egress_lossless_pool",
+            "size": "1778",
+            "dynamic_th": "0"
+        },
+        "egress_lossless_profile": {
+            "pool": "egress_lossless_pool",
+            "size": "0",
+            "static_th": "167546528"
+        }
+    },
+{%- endmacro %}
diff --git a/...sta/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/buffers_defaults_t1.j2 b/...sta/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/buffers_defaults_t1.j2
@@ -0,0 +1,36 @@
+{%- set default_cable = '5m' %}
+
+{%- include 'buffer_ports.j2' %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "121964196",
+            "type": "ingress",
+            "mode": "dynamic",
+            "xoff": "29520896"
+        },
+        "egress_lossless_pool": {
+            "size": "121964196",
+            "type": "egress",
+            "mode": "static"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossy_profile": {
+            "pool": "ingress_lossless_pool",
+            "size": "0",
+            "static_th": "167546528"
+        },
+        "egress_lossy_profile": {
+            "pool": "egress_lossless_pool",
+            "size": "1778",
+            "dynamic_th": "1"
+        },
+        "egress_lossless_profile": {
+            "pool": "egress_lossless_pool",
+            "size": "0",
+            "static_th": "125995684"
+        }
+    },
+{%- endmacro %}
diff --git a/...ista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/pg_profile_lookup.ini b/...ista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/BALANCED/pg_profile_lookup.ini
@@ -0,0 +1,23 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff    threshold xon_offset
+  10000  5m   1248    2288 35776   0         2288
+  25000  5m   1248    2288 53248   0         2288
+  40000  5m   1248    2288 66560   0         2288
+  50000  5m   1248    2288 90272   0         2288
+ 100000  5m   18796   3556 300990  -2        3556
+ 200000  5m   18796   3556 300990  -2        3556
+ 400000  5m   18796   3556 300990  -2        3556
+  10000  40m  1248    2288 37024   0         2288
+  25000  40m  1248    2288 53248   0         2288
+  40000  40m  1248    2288 71552   0         2288
+  50000  40m  1248    2288 96096   0         2288
+ 100000  40m  18796   3556 300990  -2        3556
+ 200000  40m  18796   3556 300990  -2        3556
+ 400000  40m  18796   3556 300990  -2        3556
+  10000  300m 1248    2288 46176   0         2288
+  25000  300m 1248    2288 79040   0         2288
+  40000  300m 1248    2288 108160  0         2288
+  50000  300m 1248    2288 141856  0         2288
+ 100000  300m 18796   3556 300990  -2        3556
+ 200000  300m 18796   3556 300990  -2        3556
+ 400000  300m 18796   3556 300990  -2        3556