From nobody Tue Jan 28 14:05:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yj6Vt0ZcZz5lTpN; Tue, 28 Jan 2025 14:05:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yj6Vs50Gfz3SXG; Tue, 28 Jan 2025 14:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738073109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RGqvQULUbwzaHWl7+GWypByhG7iLkg8W9AZF+hVHZJ8=; b=W46uFhERrg/BjIUlRJd415PPVypUbdbcSRYivy3Ij7NuibzBzweV2V0pv+1LtxB5W+elZY 5h5cqGvqXy3QtnlJARFPWqVGaXVlBuqZP5ISoQ/qgo/rzlOyRNhpjv167ylrjh9XoCrszO c9lIEQdTAr5IpQ9owATywg8CmZXw/Cu21hoXawpcfMnLQOVHP5xuxxWcyrrwfUJe5IGUtp I1m4mlGWUUOn3mT9OyT/0szVrMtoYSyw8YeWnTOBmq9j0+xU+48BJ8m1U81CXKC0mjGXB6 iPEfFfD8NJjQ3nju9gzrloNSI3LLUlMBqw/ElwqplEyEYM+TIR6E2ZnegmJcfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738073109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RGqvQULUbwzaHWl7+GWypByhG7iLkg8W9AZF+hVHZJ8=; b=OGwLHaNSAWj5ae9h+s+JJ3AErlgJuhJB7z0jcIf6WC2ke0G7w/qvJBnQ9mzDhOmxI+Wahz fzyAu8C07CWEP+HsoaTlrXariwOFhFfZlC8GBo+7A53On/XYCHHJJtf241lJgK0hC38AH8 d5JgBQnzU5CTlSQ8SOfZsLhqyoNkiS2SNMp9oZJHk3tWXYgwBDtqVUNbmdFM3R97JAHDgB ckJ6szFGPrHQl/xQgFME4AHUuI32SY+S8EbY+HBFKxqG5sXHj1bimq12ryk7Zyf+aN01x3 9SY5qdpEx3zQYdfRBuuNqzeR+O2/6Jb3ZqWOyY2sL/7Ud60KLpB2x4A80vpv5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738073109; a=rsa-sha256; cv=none; b=QqB+h4CabwrIiJDCqFIhThidj1cOHbvNKWBYG2ISo5OaaM9NEW08TX3c5KFhTH9xb48ocq BDr6s57kVkrhPUF5B4VSz572pibPyOYY3b+Hz5S6/FavQPR2YQ/cG2d561fMV3gXNubLhW iHGSPvImvO8xIoIZgB5U4wGlRulCSnVnMdJLKd5ubKlJ/k4V1oFwa9h22Q+8TGk2Y70tXF Gk5vaeR/VxmN6xaBLj37KoPpX31TMtV+wKfC9mrXIuFxbAzkPxAg7gepb8txT1jUljZTIn vTJpUMAR63yG7qzVjmr0Ilp5l684/xth09zA+tZrBlHpI5KvCeqORdDx+gkuPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yj6Vs4C27z2Zh; Tue, 28 Jan 2025 14:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SE59WE020886; Tue, 28 Jan 2025 14:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SE594x020883; Tue, 28 Jan 2025 14:05:09 GMT (envelope-from git) Date: Tue, 28 Jan 2025 14:05:09 GMT Message-Id: <202501281405.50SE594x020883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e92226873681 - stable/14 - sound tests: Fix 32bit calculation detection in pcm_read_write List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e922268736817e6fe8146f46093a0153af949041 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e922268736817e6fe8146f46093a0153af949041 commit e922268736817e6fe8146f46093a0153af949041 Author: Florian Walpen AuthorDate: 2025-01-23 12:38:00 +0000 Commit: Christos Margiolis CommitDate: 2025-01-28 14:04:52 +0000 sound tests: Fix 32bit calculation detection in pcm_read_write Fix a mistake in the pcm_read_write test that would result in not properly detecting 32bit calculation on 32bit architectures like i386. As a consequence, the wrong values would be checked, thus failing the test. Reported by: CI Fixes: 27ef5d48c729 ("sound: Unit test the pcm sample read and write macros") MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D48617 (cherry picked from commit e02b579b537998495b06d02be6aa07f03db3a42a) --- tests/sys/sound/pcm_read_write.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/sys/sound/pcm_read_write.c b/tests/sys/sound/pcm_read_write.c index e40ce52b67cc..7ef310a35c25 100644 --- a/tests/sys/sound/pcm_read_write.c +++ b/tests/sys/sound/pcm_read_write.c @@ -95,8 +95,14 @@ local_normalize(intpcm_t value, int val_bits, int norm_bits) static intpcm_t local_calc_limit(intpcm_t value, int val_bits) { - /* Avoid implementation defined behavior. */ - if (sizeof(intpcm32_t) == 32 && val_bits == 32) + /* + * When intpcm32_t is defined to be 32bit, calculations for mixing and + * volume changes use 32bit integers instead of 64bit. To get some + * headroom for calculations, 32bit sample values are restricted to + * 24bit magnitude in that case. Also avoid implementation defined + * behavior here. + */ + if (sizeof(intpcm32_t) == (32 / 8) && val_bits == 32) /* Divide instead of right shift (value may be negative). */ return (value / (1 << 8)); return value; @@ -456,7 +462,7 @@ ATF_TC_BODY(pcm_write, tc) } local_pcm_write_calc(dst, value, test->format); ATF_CHECK_MSG(memcmp(dst, expected, sizeof(dst)) == 0, - "pcm_write[\"%s\"].value: " + "pcm_write[\"%s\"].calc: " "expected={0x%02x, 0x%02x, 0x%02x, 0x%02x}, " "result={0x%02x, 0x%02x, 0x%02x, 0x%02x}, ", test->label, expected[0], expected[1], expected[2], expected[3],