diff options
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/dtypes.c | 58 | ||||
| -rw-r--r-- | test/nop.c | 29 |
3 files changed, 0 insertions, 89 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 6b6930b..57080aa 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -140,8 +140,6 @@ libh5test_la_SOURCES=h5test.c testframe.c cache_common.c swmr_common.c external_ # Use libhd5test.la to compile all of the tests LDADD=libh5test.la $(LIBHDF5) -dtypes_SOURCES=dtypes.c nop.c - # List the source files for tests that have more than one ttsafe_SOURCES=ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c \ ttsafe_acreate.c diff --git a/test/dtypes.c b/test/dtypes.c index a58edf1..0f95830 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -7815,29 +7815,6 @@ error: return 1; } /* end test_versionbounds() */ -herr_t no_operation(H5T_t *t, int mode); -herr_t H5T__forward_args_with_func_overhead(H5T_t *t, int); -herr_t H5T__forward_args_without_func_overhead(H5T_t *t, int); - -herr_t __attribute__((noinline)) -H5T__forward_args_with_func_overhead(H5T_t *t, int mode) -{ - herr_t ret_value = FAIL; - - FUNC_ENTER_STATIC - - if ((ret_value = no_operation(t, mode)) == FAIL) - HGOTO_ERROR(17, 31, FAIL, "that didn't work"); - -done: - FUNC_LEAVE_NOAPI(ret_value) -} - -herr_t __attribute__((noinline)) -H5T__forward_args_without_func_overhead(H5T_t *t, int mode) -{ - return no_operation(t, mode); -} /*------------------------------------------------------------------------- * Function: main @@ -7860,11 +7837,6 @@ main(void) { long nerrors = 0; hid_t fapl = -1; - H5T_t *t; - int i, ntimes = 100 * 1000 * 1000; - uint64_t start, stop; - typedef herr_t (*fn_t)(H5T_t *, int); - volatile fn_t fn = no_operation; /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -7875,36 +7847,6 @@ main(void) if(ALIGNMENT) printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); - t = (H5T_t *)H5I_object(H5T_NATIVE_SHORT); - if (t == NULL) abort(); - - fn = no_operation; - start = __builtin_ia32_rdtsc(); - for (i = 0; i < ntimes; i++) { - (*fn)(t, 10); - } - stop = __builtin_ia32_rdtsc(); - printf("%d calls to %11s routine, %" PRIu64 " cycles\n", - ntimes, "no-op", stop - start); - - fn = H5T__forward_args_without_func_overhead; - start = __builtin_ia32_rdtsc(); - for (i = 0; i < ntimes; i++) { - (*fn)(t, 10); - } - stop = __builtin_ia32_rdtsc(); - printf("%d calls to %11s version, %" PRIu64 " cycles\n", - ntimes, "no-overhead", stop - start); - - fn = H5T__forward_args_with_func_overhead; - start = __builtin_ia32_rdtsc(); - for (i = 0; i < ntimes; i++) { - (*fn)(t, 10); - } - stop = __builtin_ia32_rdtsc(); - printf("%d calls to %11s version, %" PRIu64 " cycles\n", - ntimes, "overhead", stop - start); - /* Do the tests */ nerrors += test_classes(); nerrors += test_copy(); diff --git a/test/nop.c b/test/nop.c deleted file mode 100644 index 4829eb9..0000000 --- a/test/nop.c +++ /dev/null @@ -1,29 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include "testhdf5.h" -#include "H5srcdir.h" -#include "H5Iprivate.h" /* For checking that datatype id's don't leak */ - -#define H5T_FRIEND /*suppress error about including H5Tpkg */ -#include "H5Tpkg.h" - -herr_t no_operation(H5T_t *t, int mode); - -herr_t -no_operation(H5T_t *t, int mode) -{ - static int ncalls = 0; - ncalls++; - return SUCCEED; -} |