test/sched: add subport config flexibility

Modify tests function to allow different subports of the same port
to have different configuration in terms of number of pipes, pipe
queue sizes, etc.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>

diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index afe0b0765ce3decb00b4523e79807312fc31308f..fc31080efcd6aff90e4257fd711759308fac6eee 100644 (file)
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -22,18 +22,6 @@
 #define TC              2
 #define QUEUE           0
 
-static struct rte_sched_subport_params subport_param[] = {
-       {
-               .tb_rate = 1250000000,
-               .tb_size = 1000000,
-
-               .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000,
-                       1250000000, 1250000000, 1250000000, 1250000000, 1250000000,
-                       1250000000, 1250000000, 1250000000, 1250000000},
-               .tc_period = 10,
-       },
-};
-
 static struct rte_sched_pipe_params pipe_profile[] = {
        { /* Profile #0 */
                .tb_rate = 305175,
@@ -48,6 +36,23 @@ static struct rte_sched_pipe_params pipe_profile[] = {
        },
 };
 
+static struct rte_sched_subport_params subport_param[] = {
+       {
+               .tb_rate = 1250000000,
+               .tb_size = 1000000,
+
+               .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000,
+                       1250000000, 1250000000, 1250000000, 1250000000, 1250000000,
+                       1250000000, 1250000000, 1250000000, 1250000000},
+               .tc_period = 10,
+               .n_pipes_per_subport_enabled = 1024,
+               .qsize = {32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32},
+               .pipe_profiles = pipe_profile,
+               .n_pipe_profiles = 1,
+               .n_max_pipe_profiles = 1,
+       },
+};
+
 static struct rte_sched_port_params port_param = {
        .socket = 0, /* computed */
        .rate = 0, /* computed */
@@ -55,10 +60,6 @@ static struct rte_sched_port_params port_param = {
        .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
        .n_subports_per_port = 1,
        .n_pipes_per_subport = 1024,
-       .qsize = {32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32},
-       .pipe_profiles = pipe_profile,
-       .n_pipe_profiles = 1,
-       .n_max_pipe_profiles = 1,
 };
 
 #define NB_MBUF          32
@@ -140,7 +141,7 @@ test_sched(void)
        err = rte_sched_subport_config(port, SUBPORT, subport_param);
        TEST_ASSERT_SUCCESS(err, "Error config sched, err=%d\n", err);
 
-       for (pipe = 0; pipe < port_param.n_pipes_per_subport; pipe ++) {
+       for (pipe = 0; pipe < subport_param[0].n_pipes_per_subport_enabled; pipe++) {
                err = rte_sched_pipe_config(port, SUBPORT, pipe, 0);
                TEST_ASSERT_SUCCESS(err, "Error config sched pipe %u, err=%d\n", pipe, err);
        }