app/test: rework command registration

[dpdk.git] / app / test / test_cryptodev_perf.c

diff --git a/app/test/test_cryptodev_perf.c b/app/test/test_cryptodev_perf.c
index e1adc99..2398d84 100644 (file)
--- a/app/test/test_cryptodev_perf.c
+++ b/app/test/test_cryptodev_perf.c
@@ -120,15 +120,15 @@ static const char *chain_mode_name(enum chain_mode mode)
 static const char *pmd_name(enum rte_cryptodev_type pmd)
 {
        switch (pmd) {
-       case RTE_CRYPTODEV_NULL_PMD: return CRYPTODEV_NAME_NULL_PMD; break;
+       case RTE_CRYPTODEV_NULL_PMD: return RTE_STR(CRYPTODEV_NAME_NULL_PMD); break;
        case RTE_CRYPTODEV_AESNI_GCM_PMD:
-               return CRYPTODEV_NAME_AESNI_GCM_PMD;
+               return RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD);
        case RTE_CRYPTODEV_AESNI_MB_PMD:
-               return CRYPTODEV_NAME_AESNI_MB_PMD;
+               return RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD);
        case RTE_CRYPTODEV_QAT_SYM_PMD:
-               return CRYPTODEV_NAME_QAT_SYM_PMD;
+               return RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD);
        case RTE_CRYPTODEV_SNOW3G_PMD:
-               return CRYPTODEV_NAME_SNOW3G_PMD;
+               return RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD);
        default:
                return "";
        }
@@ -249,11 +249,11 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                ret = rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_AESNI_MB_PMD, NULL);
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
 
                                TEST_ASSERT(ret == 0,
                                        "Failed to create instance %u of pmd : %s",
-                                       i, CRYPTODEV_NAME_AESNI_MB_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
                        }
                }
        }
@@ -264,11 +264,11 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                ret = rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_SNOW3G_PMD, NULL);
+                                       RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL);
 
                                TEST_ASSERT(ret == 0,
                                        "Failed to create instance %u of pmd : %s",
-                                       i, CRYPTODEV_NAME_SNOW3G_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
                        }
                }
        }
@@ -343,10 +343,10 @@ testsuite_teardown(void)
 
        if (ts_params->mbuf_mp != NULL)
                RTE_LOG(DEBUG, USER1, "CRYPTO_PERF_MBUFPOOL count %u\n",
-               rte_mempool_count(ts_params->mbuf_mp));
+               rte_mempool_avail_count(ts_params->mbuf_mp));
        if (ts_params->op_mpool != NULL)
                RTE_LOG(DEBUG, USER1, "CRYPTO_PERF_OP POOL count %u\n",
-               rte_mempool_count(ts_params->op_mpool));
+               rte_mempool_avail_count(ts_params->op_mpool));
 }
 
 static int
@@ -395,7 +395,7 @@ ut_teardown(void)
 
        if (ts_params->mbuf_mp != NULL)
                RTE_LOG(DEBUG, USER1, "CRYPTO_PERF_MBUFPOOL count %u\n",
-                       rte_mempool_count(ts_params->mbuf_mp));
+                       rte_mempool_avail_count(ts_params->mbuf_mp));
 
        rte_cryptodev_stats_get(ts_params->dev_id, &stats);
 
@@ -2458,18 +2458,17 @@ test_perf_aes_sha(uint8_t dev_id, uint16_t queue_id,
 
        /* Generate a burst of crypto operations */
        for (i = 0; i < (pparams->burst_size * NUM_MBUF_SETS); i++) {
-               struct rte_mbuf *m = test_perf_create_pktmbuf(
+               mbufs[i] = test_perf_create_pktmbuf(
                                ts_params->mbuf_mp,
                                pparams->buf_size);
 
-               if (m == NULL) {
+               if (mbufs[i] == NULL) {
                        printf("\nFailed to get mbuf - freeing the rest.\n");
                        for (k = 0; k < i; k++)
                                rte_pktmbuf_free(mbufs[k]);
                        return -1;
                }
 
-               mbufs[i] = m;
        }
 
 
@@ -2587,18 +2586,17 @@ test_perf_snow3g(uint8_t dev_id, uint16_t queue_id,
 
        /* Generate a burst of crypto operations */
        for (i = 0; i < (pparams->burst_size * NUM_MBUF_SETS); i++) {
-               struct rte_mbuf *m = test_perf_create_pktmbuf(
+               mbufs[i] = test_perf_create_pktmbuf(
                                ts_params->mbuf_mp,
                                pparams->buf_size);
 
-               if (m == NULL) {
+               if (mbufs[i] == NULL) {
                        printf("\nFailed to get mbuf - freeing the rest.\n");
                        for (k = 0; k < i; k++)
                                rte_pktmbuf_free(mbufs[k]);
                        return -1;
                }
 
-               mbufs[i] = m;
        }
 
        tsc_start = rte_rdtsc_precise();
@@ -2921,27 +2919,7 @@ perftest_qat_snow3g_cryptodev(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_snow3g_testsuite);
 }
 
-static struct test_command cryptodev_aesni_mb_perf_cmd = {
-       .command = "cryptodev_aesni_mb_perftest",
-       .callback = perftest_aesni_mb_cryptodev,
-};
-
-static struct test_command cryptodev_qat_perf_cmd = {
-       .command = "cryptodev_qat_perftest",
-       .callback = perftest_qat_cryptodev,
-};
-
-static struct test_command cryptodev_sw_snow3g_perf_cmd = {
-       .command = "cryptodev_sw_snow3g_perftest",
-       .callback = perftest_sw_snow3g_cryptodev,
-};
-
-static struct test_command cryptodev_qat_snow3g_perf_cmd = {
-       .command = "cryptodev_qat_snow3g_perftest",
-       .callback = perftest_qat_snow3g_cryptodev,
-};
-
-REGISTER_TEST_COMMAND(cryptodev_aesni_mb_perf_cmd);
-REGISTER_TEST_COMMAND(cryptodev_qat_perf_cmd);
-REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_perf_cmd);
-REGISTER_TEST_COMMAND(cryptodev_qat_snow3g_perf_cmd);
+REGISTER_TEST_COMMAND(cryptodev_aesni_mb_perftest, perftest_aesni_mb_cryptodev);
+REGISTER_TEST_COMMAND(cryptodev_qat_perftest, perftest_qat_cryptodev);
+REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_perftest, perftest_sw_snow3g_cryptodev);
+REGISTER_TEST_COMMAND(cryptodev_qat_snow3g_perftest, perftest_qat_snow3g_cryptodev);