Index: uspace/app/perf/Makefile =================================================================== --- uspace/app/perf/Makefile (revision 1edd6d0c4201fd549dcce1ac7154c0ee7d6ab4c9) +++ uspace/app/perf/Makefile (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -36,5 +36,7 @@ perf.c \ ipc/ns_ping.c \ - ipc/ping_pong.c + ipc/ping_pong.c \ + malloc/malloc1.c \ + malloc/malloc2.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/perf/ipc/ns_ping.c =================================================================== --- uspace/app/perf/ipc/ns_ping.c (revision 1edd6d0c4201fd549dcce1ac7154c0ee7d6ab4c9) +++ uspace/app/perf/ipc/ns_ping.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -80,5 +80,4 @@ uint64_t dsmp[NUM_SAMPLES]; - printf("Benchmark ns server ping time\n"); printf("Warm up and determine work size...\n"); Index: uspace/app/perf/ipc/ping_pong.c =================================================================== --- uspace/app/perf/ipc/ping_pong.c (revision 1edd6d0c4201fd549dcce1ac7154c0ee7d6ab4c9) +++ uspace/app/perf/ipc/ping_pong.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -83,5 +83,4 @@ const char *msg; - printf("Benchmark IPC test server ping time\n"); rc = ipc_test_create(&test); if (rc != EOK) Index: uspace/app/perf/malloc/malloc1.c =================================================================== --- uspace/app/perf/malloc/malloc1.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) +++ uspace/app/perf/malloc/malloc1.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2018 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include "../perf.h" + +#define MIN_DURATION_SECS 10 +#define NUM_SAMPLES 10 + +static errno_t malloc1_measure(uint64_t niter, uint64_t *rduration) +{ + struct timespec start; + uint64_t count; + void *p; + + getuptime(&start); + + for (count = 0; count < niter; count++) { + p = malloc(1); + if (p == NULL) + return ENOMEM; + free(p); + } + + struct timespec now; + getuptime(&now); + + *rduration = ts_sub_diff(&now, &start) / 1000; + return EOK; +} + +static void malloc1_report(uint64_t niter, uint64_t duration) +{ + printf("Completed %" PRIu64 " allocations and deallocations in %" PRIu64 " us", + niter, duration); + + if (duration > 0) { + printf(", %" PRIu64 " cycles/s.\n", niter * 1000 * 1000 / duration); + } else { + printf(".\n"); + } +} + +const char *bench_malloc1(void) +{ + errno_t rc; + uint64_t duration; + uint64_t dsmp[NUM_SAMPLES]; + const char *msg; + + printf("Warm up and determine work size...\n"); + + struct timespec start; + getuptime(&start); + + uint64_t niter = 1; + + while (true) { + rc = malloc1_measure(niter, &duration); + if (rc != EOK) { + msg = "Failed."; + goto error; + } + + malloc1_report(niter, duration); + + if (duration >= MIN_DURATION_SECS * 1000000) + break; + + niter *= 2; + } + + printf("Measure %d samples...\n", NUM_SAMPLES); + + int i; + + for (i = 0; i < NUM_SAMPLES; i++) { + rc = malloc1_measure(niter, &dsmp[i]); + if (rc != EOK) { + msg = "Failed."; + goto error; + } + + malloc1_report(niter, dsmp[i]); + } + + double sum = 0.0; + + for (i = 0; i < NUM_SAMPLES; i++) + sum += (double)niter / ((double)dsmp[i] / 1000000.0l); + + double avg = sum / NUM_SAMPLES; + + double qd = 0.0; + double d; + for (i = 0; i < NUM_SAMPLES; i++) { + d = (double)niter / ((double)dsmp[i] / 1000000.0l) - avg; + qd += d * d; + } + + double stddev = qd / (NUM_SAMPLES - 1); // XXX sqrt + + printf("Average: %.0f cycles/s Std.dev^2: %.0f cycles/s Samples: %d\n", + avg, stddev, NUM_SAMPLES); + + return NULL; +error: + return msg; +} Index: uspace/app/perf/malloc/malloc1.def =================================================================== --- uspace/app/perf/malloc/malloc1.def (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) +++ uspace/app/perf/malloc/malloc1.def (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -0,0 +1,5 @@ +{ + "malloc1", + "User-space memory allocator benchmark, repeatedly allocate one block", + &bench_malloc1 +}, Index: uspace/app/perf/malloc/malloc2.c =================================================================== --- uspace/app/perf/malloc/malloc2.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) +++ uspace/app/perf/malloc/malloc2.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2018 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include "../perf.h" + +#define MIN_DURATION_SECS 10 +#define NUM_SAMPLES 10 + +static errno_t malloc2_measure(uint64_t niter, uint64_t *rduration) +{ + struct timespec start; + uint64_t count; + void **p; + + getuptime(&start); + + p = malloc(niter * sizeof(void *)); + if (p == NULL) + return ENOMEM; + + for (count = 0; count < niter; count++) { + p[count] = malloc(1); + if (p[count] == NULL) + return ENOMEM; + } + + for (count = 0; count < niter; count++) + free(p[count]); + + free(p); + + struct timespec now; + getuptime(&now); + + *rduration = ts_sub_diff(&now, &start) / 1000; + return EOK; +} + +static void malloc2_report(uint64_t niter, uint64_t duration) +{ + printf("Completed %" PRIu64 " allocations and deallocations in %" PRIu64 " us", + niter, duration); + + if (duration > 0) { + printf(", %" PRIu64 " cycles/s.\n", niter * 1000 * 1000 / duration); + } else { + printf(".\n"); + } +} + +const char *bench_malloc2(void) +{ + errno_t rc; + uint64_t duration; + uint64_t dsmp[NUM_SAMPLES]; + const char *msg; + + printf("Warm up and determine work size...\n"); + + struct timespec start; + getuptime(&start); + + uint64_t niter = 1; + + while (true) { + rc = malloc2_measure(niter, &duration); + if (rc != EOK) { + msg = "Failed."; + goto error; + } + + malloc2_report(niter, duration); + + if (duration >= MIN_DURATION_SECS * 1000000) + break; + + niter *= 2; + } + + printf("Measure %d samples...\n", NUM_SAMPLES); + + int i; + + for (i = 0; i < NUM_SAMPLES; i++) { + rc = malloc2_measure(niter, &dsmp[i]); + if (rc != EOK) { + msg = "Failed."; + goto error; + } + + malloc2_report(niter, dsmp[i]); + } + + double sum = 0.0; + + for (i = 0; i < NUM_SAMPLES; i++) + sum += (double)niter / ((double)dsmp[i] / 1000000.0l); + + double avg = sum / NUM_SAMPLES; + + double qd = 0.0; + double d; + for (i = 0; i < NUM_SAMPLES; i++) { + d = (double)niter / ((double)dsmp[i] / 1000000.0l) - avg; + qd += d * d; + } + + double stddev = qd / (NUM_SAMPLES - 1); // XXX sqrt + + printf("Average: %.0f cycles/s Std.dev^2: %.0f cycles/s Samples: %d\n", + avg, stddev, NUM_SAMPLES); + + return NULL; +error: + return msg; +} Index: uspace/app/perf/malloc/malloc2.def =================================================================== --- uspace/app/perf/malloc/malloc2.def (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) +++ uspace/app/perf/malloc/malloc2.def (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -0,0 +1,5 @@ +{ + "malloc2", + "User-space memory allocator benchmark, allocate many small blocks", + &bench_malloc2 +}, Index: uspace/app/perf/perf.c =================================================================== --- uspace/app/perf/perf.c (revision 1edd6d0c4201fd549dcce1ac7154c0ee7d6ab4c9) +++ uspace/app/perf/perf.c (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -41,6 +41,8 @@ benchmark_t benchmarks[] = { +#include "ipc/ns_ping.def" #include "ipc/ping_pong.def" -#include "ipc/ns_ping.def" +#include "malloc/malloc1.def" +#include "malloc/malloc2.def" { NULL, NULL, NULL } }; Index: uspace/app/perf/perf.h =================================================================== --- uspace/app/perf/perf.h (revision 1edd6d0c4201fd549dcce1ac7154c0ee7d6ab4c9) +++ uspace/app/perf/perf.h (revision e131833cdbc9561a0a17a58dba2c57bb8e4f8c3e) @@ -46,4 +46,6 @@ } benchmark_t; +extern const char *bench_malloc1(void); +extern const char *bench_malloc2(void); extern const char *bench_ns_ping(void); extern const char *bench_ping_pong(void);