From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id CE02338425BC; Mon, 23 May 2022 16:23:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE02338425BC Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc] elf: Add tests for the dl hash funcs (_dl_new_hash and _dl_elf_hash) X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/master X-Git-Oldrev: c4bd509d477373b79b2becb625634d3441193005 X-Git-Newrev: 6fd435485f270a8c76e47bf7377c1b872885e683 Message-Id: <20220523162320.CE02338425BC@sourceware.org> Date: Mon, 23 May 2022 16:23:20 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2022 16:23:20 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6fd435485f270a8c76e47bf7377c1b872885e683 commit 6fd435485f270a8c76e47bf7377c1b872885e683 Author: Noah Goldstein Date: Thu May 19 17:17:59 2022 -0500 elf: Add tests for the dl hash funcs (_dl_new_hash and _dl_elf_hash) If we want to further optimize the functions tests are needed. Reviewed-by: Siddhesh Poyarekar Diff: --- elf/Makefile | 1 + elf/simple-dl-hash.h | 42 +++++++++++++++++++ elf/tst-dl-hash.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/elf/Makefile b/elf/Makefile index 6f4ea78007..838fe39afb 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -312,6 +312,7 @@ tests := \ tst-array4 \ tst-array5 \ tst-auxv \ + tst-dl-hash \ tst-leaks1 \ tst-stringtable \ tst-tls9 \ diff --git a/elf/simple-dl-hash.h b/elf/simple-dl-hash.h new file mode 100644 index 0000000000..53702b3c55 --- /dev/null +++ b/elf/simple-dl-hash.h @@ -0,0 +1,42 @@ +/* __simple_dl_elf_hash for testing true elf symbol lookup. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SIMPLE_DL_ELF_HASH_H +#define _SIMPLE_DL_ELF_HASH_H 1 + +#include + +/* For testing/benchmarking purposes. Real implementation in + sysdeps/generic/dl-hash.h. */ +static uint32_t +__attribute__ ((unused)) +__simple_dl_elf_hash (const char *name_arg) +{ + unsigned long int hash = 0; + for (unsigned char c = *name_arg; c != '\0'; c = *(++name_arg)) + { + unsigned long int hi; + hash = (hash << 4) + c; + hi = hash & 0xf0000000; + hash ^= hi >> 24; + hash &= 0x0fffffff; + } + return hash; +} + +#endif /* simple-dl-hash.h */ diff --git a/elf/tst-dl-hash.c b/elf/tst-dl-hash.c new file mode 100644 index 0000000000..8697eb73a0 --- /dev/null +++ b/elf/tst-dl-hash.c @@ -0,0 +1,115 @@ +/* Test dl-hash functions. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + + +#include +#include +#include +#include +#include +#include +#include +#include + +typedef unsigned int (*hash_f) (const char *); + + + +static int +do_fill_test (size_t len, int fill, const char *name, hash_f testf, + hash_f expecf) +{ + uint32_t expec, res; + char buf[len + 1]; + memset (buf, fill, len); + buf[len] = '\0'; + + expec = expecf (buf); + res = testf (buf); + if (expec != res) + FAIL_EXIT1 ("FAIL: fill(%d) %s(%zu), %x != %x\n", fill, name, len, expec, + res); + + return 0; +} + +static int +do_fill_tests (size_t len, int fill) +{ + if (do_fill_test (len, fill, "dl_new_hash", &_dl_new_hash, + &__simple_dl_new_hash)) + return 1; + + return do_fill_test (len, fill, "dl_elf_hash", &_dl_elf_hash, + &__simple_dl_elf_hash); +} + +static int +do_rand_test (size_t len, const char *name, hash_f testf, hash_f expecf) +{ + uint32_t expec, res; + size_t i; + char buf[len + 1]; + char v; + for (i = 0; i < len; ++i) + { + v = random (); + if (v == 0) + v = 1; + + buf[i] = v; + } + buf[len] = '\0'; + + expec = expecf (buf); + res = testf (buf); + if (expec != res) + FAIL_EXIT1 ("FAIL: random %s(%zu), %x != %x\n", name, len, expec, res); + + return 0; +} + +static int +do_rand_tests (size_t len) +{ + if (do_rand_test (len, "dl_new_hash", &_dl_new_hash, &__simple_dl_new_hash)) + return 1; + + return do_rand_test (len, "dl_elf_hash", &_dl_elf_hash, &__simple_dl_elf_hash); +} + +static int +do_test (void) +{ + size_t i, j; + for (i = 0; i < 100; ++i) + { + for (j = 0; j < 8192; ++j) + { + if (do_rand_tests (i)) + return 1; + + if (do_fill_tests (i, -1) || do_fill_tests (i, 1) + || do_fill_tests (i, 0x80) || do_fill_tests (i, 0x88)) + return 1; + } + } + return 0; +} + +#include