Skip to content

Commit 51be985

Browse files
peterbailey-aristagshemesh2
peterbailey-arista
authored and
gshemesh2
committed
Update J2CP QoS test parameters for PR23848 (sonic-net#20806)
What is the motivation for this PR? How did you do it? An increased packet size was needed for the hdrm_pool_size tests so fewer packets would be needed - the test was too slow prior to the change and prone to timing out. pkts_num_trig_pfc, pkts_num_trig_ingr_drp, pkts_num_hdrm_full were recalculated for the new headroom size How did you verify/test it? Testing was done on msft-202503 with J2C+ hardware to verify the sonic-mgmt tests pass where the previously failed with the new headroom values. Signed-off-by: Guy Shemesh <[email protected]>
1 parent 48e8dfc commit 51be985

File tree

1 file changed

+68
-60
lines changed

1 file changed

+68
-60
lines changed

‎tests/qos/files/qos_params.j2c.yaml‎

Lines changed: 68 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,22 @@ qos_params:
108108
pkts_num_trig_egr_drp: 2396745
109109
pkts_num_fill_egr_min: 0
110110
cell_size: 4096
111-
400000_50m:
111+
400000_30m:
112112
pkts_num_leak_out: 140
113113
internal_hdr_size: 48
114114
xoff_1:
115115
dscp: 3
116116
ecn: 1
117117
pg: 3
118-
pkts_num_trig_pfc: 764336
119-
pkts_num_trig_ingr_drp: 765653
118+
pkts_num_trig_pfc: 762403
119+
pkts_num_trig_ingr_drp: 775751
120120
pkts_num_margin: 100
121121
xoff_2:
122122
dscp: 4
123123
ecn: 1
124124
pg: 4
125-
pkts_num_trig_pfc: 764336
126-
pkts_num_trig_ingr_drp: 765653
125+
pkts_num_trig_pfc: 762403
126+
pkts_num_trig_ingr_drp: 775751
127127
pkts_num_margin: 100
128128
hdrm_pool_size:
129129
dscps: [3, 4]
@@ -132,30 +132,32 @@ qos_params:
132132
src_port_ids: [0, 2, 4, 6, 8, 10, 12, 14, 16]
133133
dst_port_id: 18
134134
pgs_num: 18
135-
pkts_num_trig_pfc: 764223
136-
pkts_num_hdrm_full: 1317
137-
pkts_num_hdrm_partial: 1300
138-
margin: 300
135+
packet_size: 1246
136+
cell_size: 4096
137+
pkts_num_trig_pfc: 60391
138+
pkts_num_hdrm_full: 1153
139+
pkts_num_hdrm_partial: 1143
140+
margin: 30
139141
wm_pg_headroom:
140142
dscp: 3
141143
ecn: 1
142144
pg: 3
143-
pkts_num_trig_pfc: 764336
144-
pkts_num_trig_ingr_drp: 765653
145+
pkts_num_trig_pfc: 762403
146+
pkts_num_trig_ingr_drp: 775751
145147
cell_size: 4096
146148
pkts_num_margin: 30
147149
xon_1:
148150
dscp: 3
149151
ecn: 1
150152
pg: 3
151-
pkts_num_trig_pfc: 764336
153+
pkts_num_trig_pfc: 762403
152154
pkts_num_dismiss_pfc: 12985
153155
pkts_num_margin: 150
154156
xon_2:
155157
dscp: 4
156158
ecn: 1
157159
pg: 4
158-
pkts_num_trig_pfc: 764336
160+
pkts_num_trig_pfc: 762403
159161
pkts_num_dismiss_pfc: 12985
160162
pkts_num_margin: 150
161163
lossy_queue_1:
@@ -169,7 +171,7 @@ qos_params:
169171
ecn: 1
170172
pg: 3
171173
pkts_num_fill_min: 0
172-
pkts_num_trig_pfc: 764336
174+
pkts_num_trig_pfc: 762403
173175
packet_size: 64
174176
cell_size: 4096
175177
pkts_num_margin: 40
@@ -187,7 +189,7 @@ qos_params:
187189
ecn: 1
188190
queue: 3
189191
pkts_num_fill_min: 0
190-
pkts_num_trig_ingr_drp: 765653
192+
pkts_num_trig_ingr_drp: 775751
191193
cell_size: 4096
192194
wm_buf_pool_lossless:
193195
dscp: 3
@@ -196,7 +198,7 @@ qos_params:
196198
queue: 3
197199
pkts_num_fill_ingr_min: 0
198200
pkts_num_trig_pfc: 28160
199-
pkts_num_trig_ingr_drp: 765653
201+
pkts_num_trig_ingr_drp: 775751
200202
pkts_num_fill_egr_min: 8
201203
cell_size: 4096
202204
wm_q_shared_lossy:
@@ -222,15 +224,15 @@ qos_params:
222224
dscp: 3
223225
ecn: 1
224226
pg: 3
225-
pkts_num_trig_pfc: 764336
226-
pkts_num_trig_ingr_drp: 1477730
227+
pkts_num_trig_pfc: 762403
228+
pkts_num_trig_ingr_drp: 1476277
227229
pkts_num_margin: 100
228230
xoff_2:
229231
dscp: 4
230232
ecn: 1
231233
pg: 4
232-
pkts_num_trig_pfc: 764336
233-
pkts_num_trig_ingr_drp: 1477730
234+
pkts_num_trig_pfc: 762403
235+
pkts_num_trig_ingr_drp: 1476277
234236
pkts_num_margin: 100
235237
hdrm_pool_size:
236238
dscps: [3, 4]
@@ -239,30 +241,32 @@ qos_params:
239241
src_port_ids: [0, 2, 4, 6, 8, 10, 12, 14, 16]
240242
dst_port_id: 18
241243
pgs_num: 18
242-
pkts_num_trig_pfc: 700628
243-
pkts_num_hdrm_full: 713397
244-
pkts_num_hdrm_partial: 713300
245-
margin: 100
244+
packet_size: 1246
245+
cell_size: 4096
246+
pkts_num_trig_pfc: 60391
247+
pkts_num_hdrm_full: 61692
248+
pkts_num_hdrm_partial: 61682
249+
margin: 10
246250
wm_pg_headroom:
247251
dscp: 3
248252
ecn: 1
249253
pg: 3
250-
pkts_num_trig_pfc: 764336
251-
pkts_num_trig_ingr_drp: 1477730
254+
pkts_num_trig_pfc: 762403
255+
pkts_num_trig_ingr_drp: 1476277
252256
cell_size: 4096
253257
pkts_num_margin: 30
254258
xon_1:
255259
dscp: 3
256260
ecn: 1
257261
pg: 3
258-
pkts_num_trig_pfc: 764336
262+
pkts_num_trig_pfc: 762403
259263
pkts_num_dismiss_pfc: 12985
260264
pkts_num_margin: 150
261265
xon_2:
262266
dscp: 4
263267
ecn: 1
264268
pg: 4
265-
pkts_num_trig_pfc: 764336
269+
pkts_num_trig_pfc: 762403
266270
pkts_num_dismiss_pfc: 12985
267271
pkts_num_margin: 150
268272
lossy_queue_1:
@@ -276,7 +280,7 @@ qos_params:
276280
ecn: 1
277281
pg: 3
278282
pkts_num_fill_min: 0
279-
pkts_num_trig_pfc: 764336
283+
pkts_num_trig_pfc: 762403
280284
packet_size: 64
281285
cell_size: 4096
282286
pkts_num_margin: 40
@@ -294,7 +298,7 @@ qos_params:
294298
ecn: 1
295299
queue: 3
296300
pkts_num_fill_min: 0
297-
pkts_num_trig_ingr_drp: 1477730
301+
pkts_num_trig_ingr_drp: 1476277
298302
cell_size: 4096
299303
wm_buf_pool_lossless:
300304
dscp: 3
@@ -482,22 +486,22 @@ qos_params:
482486
pkts_num_trig_egr_drp: 2179900
483487
pkts_num_fill_egr_min: 0
484488
cell_size: 4096
485-
400000_50m:
489+
400000_30m:
486490
pkts_num_leak_out: 140
487491
internal_hdr_size: 48
488492
xoff_1:
489493
dscp: 3
490494
ecn: 1
491495
pg: 3
492-
pkts_num_trig_pfc: 764223
493-
pkts_num_trig_ingr_drp: 765540
496+
pkts_num_trig_pfc: 762403
497+
pkts_num_trig_ingr_drp: 775751
494498
pkts_num_margin: 100
495499
xoff_2:
496500
dscp: 4
497501
ecn: 1
498502
pg: 4
499-
pkts_num_trig_pfc: 764223
500-
pkts_num_trig_ingr_drp: 765540
503+
pkts_num_trig_pfc: 762403
504+
pkts_num_trig_ingr_drp: 775751
501505
pkts_num_margin: 100
502506
hdrm_pool_size:
503507
dscps: [3, 4]
@@ -506,30 +510,32 @@ qos_params:
506510
src_port_ids: [0, 2, 4, 6, 8, 10, 12, 14, 16]
507511
dst_port_id: 18
508512
pgs_num: 18
509-
pkts_num_trig_pfc: 764223
510-
pkts_num_hdrm_full: 1317
511-
pkts_num_hdrm_partial: 1300
512-
margin: 300
513+
packet_size: 1246
514+
cell_size: 4096
515+
pkts_num_trig_pfc: 60391
516+
pkts_num_hdrm_full: 1153
517+
pkts_num_hdrm_partial: 1143
518+
margin: 30
513519
wm_pg_headroom:
514520
dscp: 3
515521
ecn: 1
516522
pg: 3
517-
pkts_num_trig_pfc: 764223
518-
pkts_num_trig_ingr_drp: 765540
523+
pkts_num_trig_pfc: 762403
524+
pkts_num_trig_ingr_drp: 775751
519525
cell_size: 4096
520526
pkts_num_margin: 30
521527
xon_1:
522528
dscp: 3
523529
ecn: 1
524530
pg: 3
525-
pkts_num_trig_pfc: 764223
531+
pkts_num_trig_pfc: 762403
526532
pkts_num_dismiss_pfc: 12985
527533
pkts_num_margin: 150
528534
xon_2:
529535
dscp: 4
530536
ecn: 1
531537
pg: 4
532-
pkts_num_trig_pfc: 764223
538+
pkts_num_trig_pfc: 762403
533539
pkts_num_dismiss_pfc: 12985
534540
pkts_num_margin: 150
535541
lossy_queue_1:
@@ -543,7 +549,7 @@ qos_params:
543549
ecn: 1
544550
pg: 3
545551
pkts_num_fill_min: 0
546-
pkts_num_trig_pfc: 764223
552+
pkts_num_trig_pfc: 762403
547553
packet_size: 64
548554
cell_size: 4096
549555
pkts_num_margin: 40
@@ -561,7 +567,7 @@ qos_params:
561567
ecn: 1
562568
queue: 3
563569
pkts_num_fill_min: 0
564-
pkts_num_trig_ingr_drp: 765540
570+
pkts_num_trig_ingr_drp: 775751
565571
cell_size: 4096
566572
wm_buf_pool_lossless:
567573
dscp: 3
@@ -570,7 +576,7 @@ qos_params:
570576
queue: 3
571577
pkts_num_fill_ingr_min: 0
572578
pkts_num_trig_pfc: 28160
573-
pkts_num_trig_ingr_drp: 765540
579+
pkts_num_trig_ingr_drp: 775751
574580
pkts_num_fill_egr_min: 8
575581
cell_size: 4096
576582
wm_q_shared_lossy:
@@ -596,15 +602,15 @@ qos_params:
596602
dscp: 3
597603
ecn: 1
598604
pg: 3
599-
pkts_num_trig_pfc: 764223
600-
pkts_num_trig_ingr_drp: 1477617
605+
pkts_num_trig_pfc: 762403
606+
pkts_num_trig_ingr_drp: 1476277
601607
pkts_num_margin: 100
602608
xoff_2:
603609
dscp: 4
604610
ecn: 1
605611
pg: 4
606-
pkts_num_trig_pfc: 764223
607-
pkts_num_trig_ingr_drp: 1477617
612+
pkts_num_trig_pfc: 762403
613+
pkts_num_trig_ingr_drp: 1476277
608614
pkts_num_margin: 100
609615
hdrm_pool_size:
610616
dscps: [3, 4]
@@ -613,30 +619,32 @@ qos_params:
613619
src_port_ids: [0, 2, 4, 6, 8, 10, 12, 14, 16]
614620
dst_port_id: 18
615621
pgs_num: 18
616-
pkts_num_trig_pfc: 700628
617-
pkts_num_hdrm_full: 713397
618-
pkts_num_hdrm_partial: 713300
619-
margin: 100
622+
packet_size: 1246
623+
cell_size: 4096
624+
pkts_num_trig_pfc: 60391
625+
pkts_num_hdrm_full: 61692
626+
pkts_num_hdrm_partial: 61682
627+
margin: 10
620628
wm_pg_headroom:
621629
dscp: 3
622630
ecn: 1
623631
pg: 3
624-
pkts_num_trig_pfc: 764223
625-
pkts_num_trig_ingr_drp: 1477617
632+
pkts_num_trig_pfc: 762403
633+
pkts_num_trig_ingr_drp: 1476277
626634
cell_size: 4096
627635
pkts_num_margin: 30
628636
xon_1:
629637
dscp: 3
630638
ecn: 1
631639
pg: 3
632-
pkts_num_trig_pfc: 764223
640+
pkts_num_trig_pfc: 762403
633641
pkts_num_dismiss_pfc: 12985
634642
pkts_num_margin: 150
635643
xon_2:
636644
dscp: 4
637645
ecn: 1
638646
pg: 4
639-
pkts_num_trig_pfc: 764223
647+
pkts_num_trig_pfc: 762403
640648
pkts_num_dismiss_pfc: 12985
641649
pkts_num_margin: 150
642650
lossy_queue_1:
@@ -650,7 +658,7 @@ qos_params:
650658
ecn: 1
651659
pg: 3
652660
pkts_num_fill_min: 0
653-
pkts_num_trig_pfc: 764223
661+
pkts_num_trig_pfc: 762403
654662
packet_size: 64
655663
cell_size: 4096
656664
pkts_num_margin: 40
@@ -668,7 +676,7 @@ qos_params:
668676
ecn: 1
669677
queue: 3
670678
pkts_num_fill_min: 0
671-
pkts_num_trig_ingr_drp: 1477617
679+
pkts_num_trig_ingr_drp: 1476277
672680
cell_size: 4096
673681
wm_buf_pool_lossless:
674682
dscp: 3

0 commit comments

Comments
 (0)