git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
devtools: recommend new logtype helpers
[dpdk.git]
/
app
/
test-crypto-perf
/
cperf_test_latency.c
diff --git
a/app/test-crypto-perf/cperf_test_latency.c
b/app/test-crypto-perf/cperf_test_latency.c
index
8565d08
..
159fe84
100644
(file)
--- a/
app/test-crypto-perf/cperf_test_latency.c
+++ b/
app/test-crypto-perf/cperf_test_latency.c
@@
-40,9
+40,6
@@
struct priv_op_data {
struct cperf_op_result *result;
};
struct cperf_op_result *result;
};
-#define max(a, b) (a > b ? (uint64_t)a : (uint64_t)b)
-#define min(a, b) (a < b ? (uint64_t)a : (uint64_t)b)
-
static void
cperf_latency_test_free(struct cperf_latency_ctx *ctx)
{
static void
cperf_latency_test_free(struct cperf_latency_ctx *ctx)
{
@@
-62,6
+59,7
@@
cperf_latency_test_free(struct cperf_latency_ctx *ctx)
void *
cperf_latency_test_constructor(struct rte_mempool *sess_mp,
void *
cperf_latency_test_constructor(struct rte_mempool *sess_mp,
+ struct rte_mempool *sess_priv_mp,
uint8_t dev_id, uint16_t qp_id,
const struct cperf_options *options,
const struct cperf_test_vector *test_vector,
uint8_t dev_id, uint16_t qp_id,
const struct cperf_options *options,
const struct cperf_test_vector *test_vector,
@@
-86,8
+84,8
@@
cperf_latency_test_constructor(struct rte_mempool *sess_mp,
sizeof(struct rte_crypto_sym_op) +
sizeof(struct cperf_op_result *);
sizeof(struct rte_crypto_sym_op) +
sizeof(struct cperf_op_result *);
- ctx->sess = op_fns->sess_create(sess_mp,
dev_id, options, test_vector
,
- iv_offset);
+ ctx->sess = op_fns->sess_create(sess_mp,
sess_priv_mp, dev_id, options
,
+
test_vector,
iv_offset);
if (ctx->sess == NULL)
goto err;
if (ctx->sess == NULL)
goto err;
@@
-126,8
+124,9
@@
cperf_latency_test_runner(void *arg)
struct cperf_latency_ctx *ctx = arg;
uint16_t test_burst_size;
uint8_t burst_size_idx = 0;
struct cperf_latency_ctx *ctx = arg;
uint16_t test_burst_size;
uint8_t burst_size_idx = 0;
+ uint32_t imix_idx = 0;
- static
int only_once
;
+ static
rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0)
;
if (ctx == NULL)
return 0;
if (ctx == NULL)
return 0;
@@
-200,7
+199,8
@@
cperf_latency_test_runner(void *arg)
(ctx->populate_ops)(ops, ctx->src_buf_offset,
ctx->dst_buf_offset,
burst_size, ctx->sess, ctx->options,
(ctx->populate_ops)(ops, ctx->src_buf_offset,
ctx->dst_buf_offset,
burst_size, ctx->sess, ctx->options,
- ctx->test_vector, iv_offset);
+ ctx->test_vector, iv_offset,
+ &imix_idx);
tsc_start = rte_rdtsc_precise();
tsc_start = rte_rdtsc_precise();
@@
-251,13
+251,13
@@
cperf_latency_test_runner(void *arg)
(void **)ops_processed, ops_deqd);
deqd_tot += ops_deqd;
(void **)ops_processed, ops_deqd);
deqd_tot += ops_deqd;
- deqd_max =
max
(ops_deqd, deqd_max);
- deqd_min =
min
(ops_deqd, deqd_min);
+ deqd_max =
RTE_MAX
(ops_deqd, deqd_max);
+ deqd_min =
RTE_MIN
(ops_deqd, deqd_min);
}
enqd_tot += ops_enqd;
}
enqd_tot += ops_enqd;
- enqd_max =
max
(ops_enqd, enqd_max);
- enqd_min =
min
(ops_enqd, enqd_min);
+ enqd_max =
RTE_MAX
(ops_enqd, enqd_max);
+ enqd_min =
RTE_MIN
(ops_enqd, enqd_min);
b_idx++;
}
b_idx++;
}
@@
-281,15
+281,15
@@
cperf_latency_test_runner(void *arg)
(void **)ops_processed, ops_deqd);
deqd_tot += ops_deqd;
(void **)ops_processed, ops_deqd);
deqd_tot += ops_deqd;
- deqd_max =
max
(ops_deqd, deqd_max);
- deqd_min =
min
(ops_deqd, deqd_min);
+ deqd_max =
RTE_MAX
(ops_deqd, deqd_max);
+ deqd_min =
RTE_MIN
(ops_deqd, deqd_min);
}
}
for (i = 0; i < tsc_idx; i++) {
tsc_val = ctx->res[i].tsc_end - ctx->res[i].tsc_start;
}
}
for (i = 0; i < tsc_idx; i++) {
tsc_val = ctx->res[i].tsc_end - ctx->res[i].tsc_start;
- tsc_max =
max
(tsc_val, tsc_max);
- tsc_min =
min
(tsc_val, tsc_min);
+ tsc_max =
RTE_MAX
(tsc_val, tsc_max);
+ tsc_min =
RTE_MIN
(tsc_val, tsc_min);
tsc_tot += tsc_val;
}
tsc_tot += tsc_val;
}
@@
-308,13
+308,13
@@
cperf_latency_test_runner(void *arg)
time_min = tunit*(double)(tsc_min) / tsc_hz;
if (ctx->options->csv) {
time_min = tunit*(double)(tsc_min) / tsc_hz;
if (ctx->options->csv) {
- if (
!only_once
)
+ if (
rte_atomic16_test_and_set(&display_once)
)
printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
- "
Packet Size,
cycles, time (us)");
+ "cycles, time (us)");
for (i = 0; i < ctx->options->total_ops; i++) {
for (i = 0; i < ctx->options->total_ops; i++) {
- printf("\n%u
;%u;%u;%"PRIu64";%"PRIu64";
%.3f",
+ printf("\n%u
,%u,%u,%"PRIu64",%"PRIu64",
%.3f",
ctx->lcore_id, ctx->options->test_buffer_size,
test_burst_size, i + 1,
ctx->res[i].tsc_end - ctx->res[i].tsc_start,
ctx->lcore_id, ctx->options->test_buffer_size,
test_burst_size, i + 1,
ctx->res[i].tsc_end - ctx->res[i].tsc_start,
@@
-323,7
+323,6
@@
cperf_latency_test_runner(void *arg)
/ tsc_hz);
}
/ tsc_hz);
}
- only_once = 1;
} else {
printf("\n# Device %d on lcore %u\n", ctx->dev_id,
ctx->lcore_id);
} else {
printf("\n# Device %d on lcore %u\n", ctx->dev_id,
ctx->lcore_id);