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
net/sfc: rename array of SW stats descriptions
[dpdk.git]
/
app
/
test
/
test_hash_multiwriter.c
diff --git
a/app/test/test_hash_multiwriter.c
b/app/test/test_hash_multiwriter.c
index
50018db
..
0c5a8ca
100644
(file)
--- a/
app/test/test_hash_multiwriter.c
+++ b/
app/test/test_hash_multiwriter.c
@@
-43,8
+43,8
@@
const uint32_t nb_entries = 5*1024*1024;
const uint32_t nb_total_tsx_insertion = 4.5*1024*1024;
uint32_t rounded_nb_total_tsx_insertion;
const uint32_t nb_total_tsx_insertion = 4.5*1024*1024;
uint32_t rounded_nb_total_tsx_insertion;
-static
rte_atomic
64_t gcycles;
-static
rte_atomic
64_t ginsertions;
+static
uint
64_t gcycles;
+static
uint
64_t ginsertions;
static int use_htm;
static int use_htm;
@@
-64,7
+64,7
@@
test_hash_multiwriter_worker(void *arg)
/*
* Calculate offset for entries based on the position of the
/*
* Calculate offset for entries based on the position of the
- * logical core, from the ma
ster
core (not counting not enabled cores)
+ * logical core, from the ma
in
core (not counting not enabled cores)
*/
offset = pos_core * tbl_multiwriter_test_params.nb_tsx_insertion;
*/
offset = pos_core * tbl_multiwriter_test_params.nb_tsx_insertion;
@@
-84,8
+84,8
@@
test_hash_multiwriter_worker(void *arg)
}
cycles = rte_rdtsc_precise() - begin;
}
cycles = rte_rdtsc_precise() - begin;
-
rte_atomic64_add(&gcycles, cycles
);
-
rte_atomic64_add(&ginsertions, i - offset
);
+
__atomic_fetch_add(&gcycles, cycles, __ATOMIC_RELAXED
);
+
__atomic_fetch_add(&ginsertions, i - offset, __ATOMIC_RELAXED
);
for (; i < offset + tbl_multiwriter_test_params.nb_tsx_insertion; i++)
tbl_multiwriter_test_params.keys[i]
for (; i < offset + tbl_multiwriter_test_params.nb_tsx_insertion; i++)
tbl_multiwriter_test_params.keys[i]
@@
-168,11
+168,8
@@
test_hash_multiwriter(void)
tbl_multiwriter_test_params.found = found;
tbl_multiwriter_test_params.found = found;
- rte_atomic64_init(&gcycles);
- rte_atomic64_clear(&gcycles);
-
- rte_atomic64_init(&ginsertions);
- rte_atomic64_clear(&ginsertions);
+ __atomic_store_n(&gcycles, 0, __ATOMIC_RELAXED);
+ __atomic_store_n(&ginsertions, 0, __ATOMIC_RELAXED);
/* Get list of enabled cores */
i = 0;
/* Get list of enabled cores */
i = 0;
@@
-194,7
+191,7
@@
test_hash_multiwriter(void)
/* Fire all threads. */
rte_eal_mp_remote_launch(test_hash_multiwriter_worker,
/* Fire all threads. */
rte_eal_mp_remote_launch(test_hash_multiwriter_worker,
- enabled_core_ids, CALL_MA
STER
);
+ enabled_core_ids, CALL_MA
IN
);
rte_eal_mp_wait_lcore();
count = rte_hash_count(handle);
rte_eal_mp_wait_lcore();
count = rte_hash_count(handle);
@@
-238,8
+235,8
@@
test_hash_multiwriter(void)
printf("No key corrupted during multiwriter insertion.\n");
unsigned long long int cycles_per_insertion =
printf("No key corrupted during multiwriter insertion.\n");
unsigned long long int cycles_per_insertion =
-
rte_atomic64_read(&gcycles
)/
-
rte_atomic64_read(&ginsertions
);
+
__atomic_load_n(&gcycles, __ATOMIC_RELAXED
)/
+
__atomic_load_n(&ginsertions, __ATOMIC_RELAXED
);
printf(" cycles per insertion: %llu\n", cycles_per_insertion);
printf(" cycles per insertion: %llu\n", cycles_per_insertion);
@@
-260,12
+257,11
@@
err1:
static int
test_hash_multiwriter_main(void)
{
static int
test_hash_multiwriter_main(void)
{
- if (rte_lcore_count()
== 1
) {
- printf("
More than one lcore is required to do multiwriter test
\n");
- return
0
;
+ if (rte_lcore_count()
< 2
) {
+ printf("
Not enough cores for distributor_autotest, expecting at least 2
\n");
+ return
TEST_SKIPPED
;
}
}
-
setlocale(LC_NUMERIC, "");
setlocale(LC_NUMERIC, "");