hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/io_uring: remove IOCQE_FLAG_CACHEHIT 

This ended up not being included in the mainline version of io_uring,
so drop it from the test app as well.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2019-04-08 10:48:50 -06:00
parent 1200e07f3a
commit 704236672e
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/io_uring/io_uring-bench.c
View File

@ -32,10 +32,6 @@
#include "liburing.h" #include "liburing.h"
#include "barrier.h" #include "barrier.h"
#ifndef IOCQE_FLAG_CACHEHIT
#define IOCQE_FLAG_CACHEHIT (1U << 0)
#endif
#define min(a, b) ((a < b) ? (a) : (b)) #define min(a, b) ((a < b) ? (a) : (b))
struct io_sq_ring { struct io_sq_ring {
@ -85,7 +81,6 @@ struct submitter {
unsigned long reaps; unsigned long reaps;
unsigned long done; unsigned long done;
unsigned long calls; unsigned long calls;
unsigned long cachehit, cachemiss;
volatile int finish; volatile int finish;
__s32 *fds; __s32 *fds;
@ -270,10 +265,6 @@ static int reap_events(struct submitter *s)
return -1; return -1;
} }
} }
if (cqe->flags & IOCQE_FLAG_CACHEHIT)
s->cachehit++;
else
s->cachemiss++;
reaped++; reaped++;
head++; head++;
} while (1); } while (1);
@ -489,7 +480,7 @@ static void file_depths(char *buf)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct submitter *s = &submitters[0]; struct submitter *s = &submitters[0];
unsigned long done, calls, reap, cache_hit, cache_miss; unsigned long done, calls, reap;
int err, i, flags, fd; int err, i, flags, fd;
char *fdepths; char *fdepths;
void *ret; void *ret;
@ -569,44 +560,29 @@ int main(int argc, char *argv[])
pthread_create(&s->thread, NULL, submitter_fn, s); pthread_create(&s->thread, NULL, submitter_fn, s);
fdepths = malloc(8 * s->nr_files); fdepths = malloc(8 * s->nr_files);
cache_hit = cache_miss = reap = calls = done = 0; reap = calls = done = 0;
do { do {
unsigned long this_done = 0; unsigned long this_done = 0;
unsigned long this_reap = 0; unsigned long this_reap = 0;
unsigned long this_call = 0; unsigned long this_call = 0;
unsigned long this_cache_hit = 0;
unsigned long this_cache_miss = 0;
unsigned long rpc = 0, ipc = 0; unsigned long rpc = 0, ipc = 0;
double hit = 0.0;
sleep(1); sleep(1);
this_done += s->done; this_done += s->done;
this_call += s->calls; this_call += s->calls;
this_reap += s->reaps; this_reap += s->reaps;
this_cache_hit += s->cachehit;
this_cache_miss += s->cachemiss;
if (this_cache_hit && this_cache_miss) {
unsigned long hits, total;
hits = this_cache_hit - cache_hit;
total = hits + this_cache_miss - cache_miss;
hit = (double) hits / (double) total;
hit *= 100.0;
}
if (this_call - calls) { if (this_call - calls) {
rpc = (this_done - done) / (this_call - calls); rpc = (this_done - done) / (this_call - calls);
ipc = (this_reap - reap) / (this_call - calls); ipc = (this_reap - reap) / (this_call - calls);
} else } else
rpc = ipc = -1; rpc = ipc = -1;
file_depths(fdepths); file_depths(fdepths);
printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=%u (%s), Cachehit=%0.2f%%\n", printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=%u (%s)\n",
this_done - done, rpc, ipc, s->inflight, this_done - done, rpc, ipc, s->inflight,
fdepths, hit); fdepths);
done = this_done; done = this_done;
calls = this_call; calls = this_call;
reap = this_reap; reap = this_reap;
cache_hit = s->cachehit;
cache_miss = s->cachemiss;
} while (!finish); } while (!finish);
pthread_join(s->thread, &ret); pthread_join(s->thread, &ret);