Skip to content

Commit

Permalink
baseband/acc: refactor queue status update
Browse files Browse the repository at this point in the history 
Introducing common function for queue stats update
within the acc PMDs.

Signed-off-by: Nicolas Chautru <nicolas.chautru@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
  • Loading branch information
@nicolas-chautru @mcoquelin
nicolas-chautru authored and mcoquelin committed Sep 13, 2024
1 parent 09f3c66 commit f0d3ab5
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 74 deletions.
18 changes: 18 additions & 0 deletions drivers/baseband/acc/acc_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1557,6 +1557,24 @@ acc_aq_avail(struct rte_bbdev_queue_data *q_data, uint16_t num_ops)
return aq_avail;
}

/* Update queue stats during enqueue. */
static inline void
acc_update_qstat_enqueue(struct rte_bbdev_queue_data *q_data,
uint16_t enq_count, uint16_t enq_err_count)
{
q_data->queue_stats.enqueued_count += enq_count;
q_data->queue_stats.enqueue_err_count += enq_err_count;
q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0);
}

/* Update queue stats during dequeue. */
static inline void
acc_update_qstat_dequeue(struct rte_bbdev_queue_data *q_data, uint16_t deq_count)
{
q_data->queue_stats.dequeued_count += deq_count;
q_data->queue_stats.enqueue_depth_avail = acc_aq_avail(q_data, 0);
}

/* Calculates number of CBs in processed encoder TB based on 'r' and input
* length.
*/
Expand Down
45 changes: 13 additions & 32 deletions drivers/baseband/acc/rte_acc100_pmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,7 @@ acc100_queue_stop(struct rte_bbdev *dev, uint16_t queue_id)
dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0;

return 0;
}
Expand Down Expand Up @@ -3196,9 +3197,7 @@ acc100_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3245,9 +3244,7 @@ acc100_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, desc_idx, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3284,9 +3281,7 @@ acc100_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3322,9 +3317,7 @@ acc100_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3388,9 +3381,7 @@ acc100_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3426,9 +3417,7 @@ acc100_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3468,9 +3457,7 @@ acc100_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3505,9 +3492,7 @@ acc100_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3897,8 +3882,7 @@ acc100_dequeue_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;

/* Update enqueue stats */
q_data->queue_stats.dequeued_count += dequeued_ops;
acc_update_qstat_dequeue(q_data, dequeued_ops);

return dequeued_ops;
}
Expand Down Expand Up @@ -3940,8 +3924,7 @@ acc100_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;

/* Update enqueue stats */
q_data->queue_stats.dequeued_count += dequeued_ops;
acc_update_qstat_dequeue(q_data, dequeued_ops);

return dequeued_ops;
}
Expand Down Expand Up @@ -3986,8 +3969,7 @@ acc100_dequeue_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;

/* Update enqueue stats */
q_data->queue_stats.dequeued_count += i;
acc_update_qstat_dequeue(q_data, i);

return i;
}
Expand Down Expand Up @@ -4033,8 +4015,7 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;

/* Update enqueue stats */
q_data->queue_stats.dequeued_count += i;
acc_update_qstat_dequeue(q_data, i);

return i;
}
Expand Down
61 changes: 19 additions & 42 deletions drivers/baseband/acc/rte_vrb_pmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,7 @@ vrb_queue_stop(struct rte_bbdev *dev, uint16_t queue_id)
dev->data->queues[queue_id].queue_stats.dequeue_err_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.dequeue_warn_count = 0;
dev->data->queues[queue_id].queue_stats.enqueue_depth_avail = 0;
return 0;
}

Expand Down Expand Up @@ -2738,9 +2739,7 @@ vrb_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -2778,9 +2777,7 @@ vrb_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, desc_idx, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -2817,9 +2814,7 @@ vrb_enqueue_enc_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -2864,9 +2859,7 @@ vrb_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -2926,9 +2919,7 @@ vrb_enqueue_dec_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -2961,9 +2952,7 @@ vrb_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3004,9 +2993,7 @@ vrb_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3041,9 +3028,7 @@ vrb_enqueue_dec_tb(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);

return i;
}
Expand Down Expand Up @@ -3453,8 +3438,7 @@ vrb_dequeue_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;

/* Update enqueue stats. */
q_data->queue_stats.dequeued_count += dequeued_ops;
acc_update_qstat_dequeue(q_data, dequeued_ops);

return dequeued_ops;
}
Expand Down Expand Up @@ -3496,8 +3480,7 @@ vrb_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_descs;

/* Update enqueue stats. */
q_data->queue_stats.dequeued_count += dequeued_ops;
acc_update_qstat_dequeue(q_data, dequeued_ops);

return dequeued_ops;
}
Expand Down Expand Up @@ -3535,8 +3518,7 @@ vrb_dequeue_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;

/* Update enqueue stats */
q_data->queue_stats.dequeued_count += i;
acc_update_qstat_dequeue(q_data, i);

return i;
}
Expand Down Expand Up @@ -3575,8 +3557,7 @@ vrb_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data,
q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;

/* Update enqueue stats. */
q_data->queue_stats.dequeued_count += i;
acc_update_qstat_dequeue(q_data, i);

return i;
}
Expand Down Expand Up @@ -3782,9 +3763,7 @@ vrb_enqueue_fft(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, i, &q_data->queue_stats);

/* Update stats */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -3851,8 +3830,7 @@ vrb_dequeue_fft(struct rte_bbdev_queue_data *q_data,

q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
/* Update enqueue stats. */
q_data->queue_stats.dequeued_count += i;
acc_update_qstat_dequeue(q_data, i);
return i;
}

Expand Down Expand Up @@ -4106,9 +4084,7 @@ vrb2_enqueue_mldts(struct rte_bbdev_queue_data *q_data,

acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats);

/* Update stats. */
q_data->queue_stats.enqueued_count += i;
q_data->queue_stats.enqueue_err_count += num - i;
acc_update_qstat_enqueue(q_data, i, num - i);
return i;
}

Expand Down Expand Up @@ -4207,8 +4183,9 @@ vrb2_dequeue_mldts(struct rte_bbdev_queue_data *q_data,

q->aq_dequeued += aq_dequeued;
q->sw_ring_tail += dequeued_cbs;
/* Update enqueue stats. */
q_data->queue_stats.dequeued_count += i;

acc_update_qstat_dequeue(q_data, i);

return i;
}

Expand Down

0 comments on commit f0d3ab5

Please sign in to comment.