X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=test%2Fperf_test.c;h=1ea0bcb3eb11f831c9ca50991213121b0e659cf8;hp=ace96d08e3171d6d9c03e38b0de97ddf88a40c4d;hb=86fd9c8abfbacea2902b4fe42a8a4664b2a531cf;hpb=7d658a03f83e64690d0c71b4733dd3f9a2c60208 diff --git a/test/perf_test.c b/test/perf_test.c index ace96d0..1ea0bcb 100644 --- a/test/perf_test.c +++ b/test/perf_test.c @@ -16,73 +16,62 @@ //#define TEST_STRING_KEYS -static volatile int wait_; -static volatile int stop_; -static long num_threads_; +static int num_threads_; +static volatile int start_, stop_, load_; static map_t *map_; -static int get_range_; -static int put_range_; -static int num_keys_; -static map_key_t *keys_ = NULL; -static uint64_t times_[MAX_NUM_THREADS] = {}; -static int ops_[MAX_NUM_THREADS] = {}; +static int get_range_, put_range_; +static size_t num_keys_; +static double load_time_; +static int duration_; + +#define OP_SELECT_RANGE (1ULL << 20) void *worker (void *arg) { - int tid = (int)(size_t)arg; - uint64_t s = nbd_rand_seed(tid); - int get_ops = 0, put_ops = 0, del_ops = 0; + volatile uint64_t ops = 0; // Wait for all the worker threads to be ready. - (void)SYNC_ADD(&wait_, -1); - do {} while (wait_); + (void)SYNC_ADD(&load_, -1); + do {} while (load_); + + // Pre-load map + int n = num_keys_ / 2 / num_threads_; + for (int i = 0; i < n; ++i) { + map_key_t key = (nbd_rand() & (num_keys_ - 1)) + 1; + map_set(map_, key, key); + } - uint64_t t1 = rdtsc(); + // Wait for all the worker threads to be done loading. + (void)SYNC_ADD(&start_, -1); + do {} while (start_); while (!stop_) { - int r = nbd_next_rand(&s); - int x = r & ( (1 << 20) - 1 ); - int i = nbd_next_rand(&s) & (num_keys_ - 1); - map_key_t key = keys_[i]; + ++ops; + map_key_t key = (nbd_rand() & (num_keys_ - 1)) + 1; + map_key_t x = nbd_rand() & (OP_SELECT_RANGE - 1); if (x < get_range_) { - map_val_t val = map_get(map_, key); +#ifndef NDEBUG + map_val_t val = +#endif + map_get(map_, key); #ifdef TEST_STRING_KEYS ASSERT(val == DOES_NOT_EXIST || ns_cmp((nstring_t *)key, (nstring_t *)val) == 0); #else ASSERT(val == DOES_NOT_EXIST || key == val); #endif - get_ops++; } else if (x < put_range_) { map_add(map_, key, key); - put_ops++; } else { map_remove(map_, key); - del_ops++; } rcu_update(); } - times_[tid] = rdtsc() - t1; - ops_[tid] = get_ops + put_ops + del_ops; - - return NULL; + return (void *)ops; } -void run_test (void) { - wait_ = num_threads_ + 1; - - // Quicky sanity check - int n = 100; - if (num_keys_ < n) { n = num_keys_; } - for (int i = 0; i < n; ++i) { - map_set(map_, keys_[i], keys_[i]); - for(int j = 0; j < i; ++j) { -#ifdef TEST_STRING_KEYS - ASSERT(ns_cmp((nstring_t *)map_get(map_, keys_[i]), (nstring_t *)keys_[i]) == 0); -#else - ASSERT(map_get(map_, keys_[i]) == keys_[i]); -#endif - } - } +uint64_t run_test (void) { + load_ = num_threads_ + 1; + start_ = num_threads_ + 1; stop_ = 0; @@ -92,27 +81,41 @@ void run_test (void) { if (rc != 0) { perror("pthread_create"); exit(rc); } } - do { /* nothing */ } while (wait_ != 1); + do { /* nothing */ } while (load_ != 1); + load_ = 0; + + struct timeval tv1, tv2; + gettimeofday(&tv1, NULL); + + do { /* nothing */ } while (start_ != 1); + + gettimeofday(&tv2, NULL); + load_time_ = (double)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000000; - wait_ = 0; - sleep(2); + start_ = 0; + sleep(duration_); stop_ = 1; + uint64_t ops = 0; for (int i = 0; i < num_threads_; ++i) { - pthread_join(thread[i], NULL); + void *count; + pthread_join(thread[i], &count); + ops += (size_t)count; } + return ops; } int main (int argc, char **argv) { char* program_name = argv[0]; - if (argc > 2) { + if (argc > 3) { fprintf(stderr, "Usage: %s num_threads\n", program_name); return -1; } num_threads_ = 2; - if (argc == 2) + if (num_threads_ > MAX_NUM_THREADS) { num_threads_ = MAX_NUM_THREADS; } + if (argc > 1) { errno = 0; num_threads_ = strtol(argv[1], NULL, 10); @@ -124,17 +127,30 @@ int main (int argc, char **argv) { fprintf(stderr, "%s: Number of threads must be at least 1\n", program_name); return -1; } - if (num_threads_ > MAX_NUM_THREADS) { - fprintf(stderr, "%s: Number of threads cannot be more than %d\n", program_name, MAX_NUM_THREADS); + } + if (num_threads_ > MAX_NUM_THREADS) { + fprintf(stderr, "%s: Number of threads cannot be more than %d\n", program_name, MAX_NUM_THREADS); + return -1; + } + + int table_scale = 12; + if (argc > 2) { + table_scale = strtol(argv[2], NULL, 10); + if (errno) { + fprintf(stderr, "%s: Invalid argument for the scale of the collection\n", program_name); + return -1; + } + table_scale = strtol(argv[2], NULL, 10); + if (table_scale < 0 || table_scale > 36) { + fprintf(stderr, "%s: The scale of the collection must be between 0 and 36\n", program_name); return -1; } } - - int table_scale = 10; - int read_ratio = 95; - get_range_ = (read_ratio << 20) / 100; - put_range_ = (((1 << 20) - get_range_) >> 1) + get_range_; + int read_ratio = 90; + int put_ratio = 50; + get_range_ = (int)((double)OP_SELECT_RANGE / 100 * read_ratio); + put_range_ = get_range_ + (int)(((double)OP_SELECT_RANGE - get_range_) / 100 * put_ratio); static const map_impl_t *map_types[] = { &MAP_IMPL_HT }; for (int i = 0; i < sizeof(map_types)/sizeof(*map_types); ++i) { @@ -144,33 +160,14 @@ int main (int argc, char **argv) { map_ = map_alloc(map_types[i], NULL); #endif - // Do some warmup - num_keys_ = 1 << table_scale; - keys_ = nbd_malloc(sizeof(map_key_t) * num_keys_); - for (int j = 0; j < num_keys_; ++j) { -#ifdef TEST_STRING_KEYS - char tmp[64]; - snprintf(tmp, sizeof(tmp), "%dabc%d", j, j*17+123); - int n = strlen(tmp); - keys_[j] = ns_alloc(n); - memcpy(keys_[j], tmp, n); -#else - keys_[j] = j*17+123; -#endif - } - - struct timeval tv1, tv2; - gettimeofday(&tv1, NULL); + num_keys_ = 1ULL << table_scale; - int num_trials = 1; - for (int i = 0; i < num_trials; ++i) { - run_test(); - } + duration_ = 1 + table_scale/4; + double mops_per_sec = (double)run_test() / 1000000.0 / duration_; - gettimeofday(&tv2, NULL); - int ms = (int)(1000000*(tv2.tv_sec - tv1.tv_sec) + tv2.tv_usec - tv1.tv_usec) / 1000; - map_print(map_); - printf("Th:%ld Time:%dms\n\n", num_threads_, ms); + printf("Threads:%-2d Size:2^%-2d load time:%-4.2f Mops/s:%-4.2f per-thread:%-4.2f ", + num_threads_, table_scale, load_time_, mops_per_sec, mops_per_sec/num_threads_); + map_print(map_, FALSE); fflush(stdout); map_free(map_);