From owner-svn-src-all@freebsd.org Wed Jan 29 22:37:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC0301F9E93; Wed, 29 Jan 2020 22:37:01 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 487JJF60JGz4J0Y; Wed, 29 Jan 2020 22:37:01 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8DF61B4E3; Wed, 29 Jan 2020 22:37:01 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00TMb1Sb038292; Wed, 29 Jan 2020 22:37:01 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00TMb1rw038291; Wed, 29 Jan 2020 22:37:01 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202001292237.00TMb1rw038291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 29 Jan 2020 22:37:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357273 - head/tests/sys/sys X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/tests/sys/sys X-SVN-Commit-Revision: 357273 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 22:37:02 -0000 Author: cem Date: Wed Jan 29 22:37:01 2020 New Revision: 357273 URL: https://svnweb.freebsd.org/changeset/base/357273 Log: Revert r357246 I have no idea what this code is trying to do, leave it be. Reported by: lwhsu Modified: head/tests/sys/sys/qmath_test.c Modified: head/tests/sys/sys/qmath_test.c ============================================================================== --- head/tests/sys/sys/qmath_test.c Wed Jan 29 21:41:45 2020 (r357272) +++ head/tests/sys/sys/qmath_test.c Wed Jan 29 22:37:01 2020 (r357273) @@ -47,7 +47,25 @@ #define QTEST_QITRUNC(q, iv) ((iv) >> Q_RPSHFT(q)) #define QTEST_FFACTOR 32.0 -#define GENRAND(a) arc4random_buf((a), sizeof(*(a))) +#define bitsperrand 31 +#define GENRAND(a, lb, ub) \ +({ \ + int _rembits; \ + do { \ + _rembits = Q_BITSPERBASEUP(ub) + Q_LTZ(lb); \ + *(a) = (__typeof(*(a)))0; \ + while (_rembits > 0) { \ + *(a) |= (((uint64_t)random()) & \ + ((1ULL << (_rembits > bitsperrand ? \ + bitsperrand : _rembits)) - 1)); \ + *(a) <<= (_rembits - (_rembits > bitsperrand ? \ + bitsperrand : _rembits)); \ + _rembits -= bitsperrand; \ + } \ + *(a) += lb; \ + } while (*(a) < (lb) || (uint64_t)*(a) > (ub)); \ + *(a); \ +}) /* * Smoke tests for basic qmath operations, such as initialization @@ -195,9 +213,11 @@ ATF_TC_BODY(qmulq_s64q, tc) #endif int error; + srandomdev(); + for (int i = 0; i < 10;) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXX: We cheat a bit, to stand any chance of multiplying @@ -258,9 +278,12 @@ ATF_TC_BODY(qdivq_s64q, tc) if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) atf_tc_skip("https://bugs.freebsd.org/240219"); + + srandomdev(); + for (int i = 0; i < 10; i++) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -301,9 +324,11 @@ ATF_TC_BODY(qaddq_s64q, tc) double a_dbl, b_dbl, r_dbl, maxe_dbl, delta_dbl; int error; + srandomdev(); + for (int i = 0; i < 10;) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -347,9 +372,11 @@ ATF_TC_BODY(qsubq_s64q, tc) double a_dbl, b_dbl, r_dbl, maxe_dbl, delta_dbl; int error; + srandomdev(); + for (int i = 0; i < 10; i++) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -391,9 +418,11 @@ ATF_TC_BODY(qfraci_s64q, tc) int64_t a_int, b_int; int error; + srandomdev(); + for (int i = 0; i < 10;) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -436,9 +465,11 @@ ATF_TC_BODY(qmuli_s64q, tc) int64_t a_int, b_int; int error; + srandomdev(); + for (int i = 0; i < 10;) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -481,9 +512,11 @@ ATF_TC_BODY(qaddi_s64q, tc) int64_t a_int, b_int; int error; + srandomdev(); + for (int i = 0; i < 10;) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision. @@ -530,9 +563,11 @@ ATF_TC_BODY(qsubi_s64q, tc) int64_t a_int, b_int; int error; + srandomdev(); + for (int i = 0; i < 10; i++) { - GENRAND(&a_s64q); - GENRAND(&b_s64q); + GENRAND(&a_s64q, INT64_MIN, UINT64_MAX); + GENRAND(&b_s64q, INT64_MIN, UINT64_MAX); /* * XXXLAS: Until Qmath handles precision normalisation, only * test with equal precision.