From nobody Sat Jun 3 17:13:34 2023 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 4QYRKW60dkz4ZBXl; Sat, 3 Jun 2023 17:13:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QYRKW1KZwz3K2y; Sat, 3 Jun 2023 17:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685812415; 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=8kgU8sqUwwIUIQulFNu+ZAuY5//QCAeYDtoQnvW9GvI=; b=XkRqyDH92LDZ+45Jl0YwzPSqj7UoygRxBdFRYhC8A6ZKcHzMkkX5C2ZrhKO/w55RM65ONd 8B8YZkqESt0mwD5L1UpMuEToX7WVszb8cFfyIwmgzPl4kfboMrp3DBMcCiwJlfuXWWckDZ IxOcc5iqiH/fOVeYEw1vI3Gcij6oVrAd594FDyLN1WC3FpibRBTAjQUmRal63VDiQnviLd Pmg0Ws31xAvGDjhhyyC7B2FwgulArfPmnWNUyj2AZwUGk4uj4+uSgUxi1q5zY/poi6CVhc ZZitrMiyJfr/f4dab6EMt4BUqYlZnxKfglUSM2FTAKXaHJ+3J1IvW6/ByXxPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685812415; 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=8kgU8sqUwwIUIQulFNu+ZAuY5//QCAeYDtoQnvW9GvI=; b=AdkuWuley+uDj8rBCXhwBVN7J42J405jO2uCZv8oq8BXhfSi/Yiu88UmwxOTmpr18CvfmG FBd/owl2Rit4lXjjS5e0QLU/dPVVfbFzKnHval18u1yEFCGeS22B87Y6WyFlptfPm2VnRs f5G7zmrOjtJXJlgj6PufVyp4KP06P2N5Wmi2y7TkOrxpfCIwcz9dK4C8xghWFde6+dwvbt z85Ju8QcfgAb81cK6zJyaHQ/6gno8edO/mScxCEYILUaFHrOy03M/x9MxB9AVLUg1IUs+F b28HzRtrruj2Zag9i547cOfEs2Zim9JrKsftk43tVSpuxgWd4vRYcxeuQTFP0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685812415; a=rsa-sha256; cv=none; b=FLk8xFkxj1imVesIZdq9xDJotMa0WQ9PEEORy79b5tu1/2998P99wGvfv7wptWve4fThwY uMyVAm6yNrkIGFhDKqZIxm+QNDiSo+nBh/rNrJKYBIUGDHHTKJqVFfhyZrJg5lCcIxzWpO OjtuaxwaJHf5/4I7jNYVAuXPNl8v5XYgybp+dWLPFHsDMiPDexjbIYkcRdaCbDY/NVjQPG S4KlJHz63Y+/FLEB9SFbdXuVS4dG2yq6Hw8JNOEM3VQdKcYzFox1rn/U5g+X1ukVEyJxl0 9IY2vXx134uM4QuzYcbYk1CLH0h5GVCDRM9dAfn1A8S2j/vp9qGYcXkHh/kzkQ== 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 4QYRKW0MGxzYg2; Sat, 3 Jun 2023 17:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 353HDYdS036201; Sat, 3 Jun 2023 17:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353HDY7D036200; Sat, 3 Jun 2023 17:13:34 GMT (envelope-from git) Date: Sat, 3 Jun 2023 17:13:34 GMT Message-Id: <202306031713.353HDY7D036200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 1b0d96f3c43a - main - xregs_sig: Finish renaming simd to xregs before adding avx 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b0d96f3c43a5f997dca120a83a4b06995df345b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0d96f3c43a5f997dca120a83a4b06995df345b commit 1b0d96f3c43a5f997dca120a83a4b06995df345b Author: Dmitry Chagin AuthorDate: 2023-06-03 17:11:44 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-03 17:11:44 +0000 xregs_sig: Finish renaming simd to xregs before adding avx Reviewed by: kib, jhb Differential Revision: https://reviews.freebsd.org/D40382 --- tools/test/xregs_sig/c2x2c_aarch64.S | 16 ++++----- tools/test/xregs_sig/c2x2c_amd64.S | 16 ++++----- tools/test/xregs_sig/xregs_sig.c | 68 ++++++++++++++++++------------------ 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tools/test/xregs_sig/c2x2c_aarch64.S b/tools/test/xregs_sig/c2x2c_aarch64.S index eebe1f334546..6f1637f5bcdf 100644 --- a/tools/test/xregs_sig/c2x2c_aarch64.S +++ b/tools/test/xregs_sig/c2x2c_aarch64.S @@ -5,9 +5,9 @@ * $FreeBSD$ */ - .global cpu_to_simd - .type cpu_to_simd, @function -cpu_to_simd: + .global cpu_to_xregs + .type cpu_to_xregs, @function +cpu_to_xregs: stp q0, q1, [x0, #( 0 * 16)] stp q2, q3, [x0, #( 2 * 16)] stp q4, q5, [x0, #( 4 * 16)] @@ -26,12 +26,12 @@ cpu_to_simd: stp q30, q31, [x0, #(30 * 16)] ret - .size cpu_to_simd, . - cpu_to_simd + .size cpu_to_xregs, . - cpu_to_xregs - .global simd_to_cpu - .type simd_to_cpu, @function -simd_to_cpu: + .global xregs_to_cpu + .type xregs_to_cpu, @function +xregs_to_cpu: ldp q0, q1, [x0, #( 0 * 16)] ldp q2, q3, [x0, #( 2 * 16)] ldp q4, q5, [x0, #( 4 * 16)] @@ -50,6 +50,6 @@ simd_to_cpu: ldp q30, q31, [x0, #(30 * 16)] ret - .size simd_to_cpu, . - simd_to_cpu + .size xregs_to_cpu, . - xregs_to_cpu .section .note.GNU-stack,"",@progbits diff --git a/tools/test/xregs_sig/c2x2c_amd64.S b/tools/test/xregs_sig/c2x2c_amd64.S index bd18ac979000..e5ae5af99e97 100644 --- a/tools/test/xregs_sig/c2x2c_amd64.S +++ b/tools/test/xregs_sig/c2x2c_amd64.S @@ -5,9 +5,9 @@ * $FreeBSD$ */ - .global cpu_to_simd - .type cpu_to_simd, @function -cpu_to_simd: + .global cpu_to_xregs + .type cpu_to_xregs, @function +cpu_to_xregs: movdqu %xmm0, (%rdi) movdqu %xmm1, 1 * 16(%rdi) movdqu %xmm2, 2 * 16(%rdi) @@ -26,12 +26,12 @@ cpu_to_simd: movdqu %xmm15, 15 * 16(%rdi) retq - .size cpu_to_simd, . - cpu_to_simd + .size cpu_to_xregs, . - cpu_to_xregs - .global simd_to_cpu - .type simd_to_cpu, @function -simd_to_cpu: + .global xregs_to_cpu + .type xregs_to_cpu, @function +xregs_to_cpu: movdqu (%rdi), %xmm0 movdqu 1 * 16(%rdi), %xmm1 movdqu 2 * 16(%rdi), %xmm2 @@ -50,6 +50,6 @@ simd_to_cpu: movdqu 15 * 16(%rdi), %xmm15 retq - .size simd_to_cpu, . - simd_to_cpu + .size xregs_to_cpu, . - xregs_to_cpu .section .note.GNU-stack,"",@progbits diff --git a/tools/test/xregs_sig/xregs_sig.c b/tools/test/xregs_sig/xregs_sig.c index 19fb85f2e803..a67379a0080e 100644 --- a/tools/test/xregs_sig/xregs_sig.c +++ b/tools/test/xregs_sig/xregs_sig.c @@ -49,23 +49,23 @@ #endif #if defined(__amd64__) -#define SIMDRNAM "xmm" +#define XREGSRNAM "xmm" #define NREGS 16 #elif defined(__aarch64__) -#define SIMDRNAM "q" +#define XREGSRNAM "q" #define NREGS 32 #endif -struct simdreg { - uint8_t simd_bytes[16]; +struct xregsreg { + uint8_t xregs_bytes[16]; }; -struct simd { - struct simdreg simdreg[NREGS]; +struct xregs { + struct xregsreg xregsreg[NREGS]; }; -void cpu_to_simd(struct simd *simd); -void simd_to_cpu(struct simd *simd); +void cpu_to_xregs(struct xregs *xregs); +void xregs_to_cpu(struct xregs *xregs); static atomic_uint sigs; @@ -87,23 +87,23 @@ sigalrm_handler(int sig __unused) alarm(TIMO); } -static struct simd zero_simd = {}; +static struct xregs zero_xregs = {}; static void -fill_simd(struct simd *simd) +fill_xregs(struct xregs *xregs) { - arc4random_buf(simd, sizeof(*simd)); + arc4random_buf(xregs, sizeof(*xregs)); } static void -dump_simd(const struct simdreg *r) +dump_xregs(const struct xregsreg *r) { unsigned k; - for (k = 0; k < nitems(r->simd_bytes); k++) { + for (k = 0; k < nitems(r->xregs_bytes); k++) { if (k != 0) printf(" "); - printf("%02x", r->simd_bytes[k]); + printf("%02x", r->xregs_bytes[k]); } printf("\n"); } @@ -111,9 +111,9 @@ dump_simd(const struct simdreg *r) static pthread_mutex_t show_lock; static void -show_diff(const struct simd *simd1, const struct simd *simd2) +show_diff(const struct xregs *xregs1, const struct xregs *xregs2) { - const struct simdreg *r1, *r2; + const struct xregsreg *r1, *r2; unsigned i, j; #if defined(__FreeBSD__) @@ -121,14 +121,14 @@ show_diff(const struct simd *simd1, const struct simd *simd2) #elif defined(__linux__) printf("thr %ld\n", syscall(SYS_gettid)); #endif - for (i = 0; i < nitems(simd1->simdreg); i++) { - r1 = &simd1->simdreg[i]; - r2 = &simd2->simdreg[i]; - for (j = 0; j < nitems(r1->simd_bytes); j++) { - if (r1->simd_bytes[j] != r2->simd_bytes[j]) { - printf("%%%s%u\n", SIMDRNAM, i); - dump_simd(r1); - dump_simd(r2); + for (i = 0; i < nitems(xregs1->xregsreg); i++) { + r1 = &xregs1->xregsreg[i]; + r2 = &xregs2->xregsreg[i]; + for (j = 0; j < nitems(r1->xregs_bytes); j++) { + if (r1->xregs_bytes[j] != r2->xregs_bytes[j]) { + printf("%%%s%u\n", XREGSRNAM, i); + dump_xregs(r1); + dump_xregs(r2); break; } } @@ -144,26 +144,26 @@ my_pause(void) static void * worker_thread(void *arg __unused) { - struct simd simd, simd_cpu; + struct xregs xregs, xregs_cpu; - fill_simd(&simd); + fill_xregs(&xregs); for (;;) { - simd_to_cpu(&simd); + xregs_to_cpu(&xregs); my_pause(); - cpu_to_simd(&simd_cpu); - if (memcmp(&simd, &simd_cpu, sizeof(struct simd)) != 0) { + cpu_to_xregs(&xregs_cpu); + if (memcmp(&xregs, &xregs_cpu, sizeof(struct xregs)) != 0) { pthread_mutex_lock(&show_lock); - show_diff(&simd, &simd_cpu); + show_diff(&xregs, &xregs_cpu); abort(); pthread_mutex_unlock(&show_lock); } - simd_to_cpu(&zero_simd); + xregs_to_cpu(&zero_xregs); my_pause(); - cpu_to_simd(&simd_cpu); - if (memcmp(&zero_simd, &simd_cpu, sizeof(struct simd)) != 0) { + cpu_to_xregs(&xregs_cpu); + if (memcmp(&zero_xregs, &xregs_cpu, sizeof(struct xregs)) != 0) { pthread_mutex_lock(&show_lock); - show_diff(&zero_simd, &simd_cpu); + show_diff(&zero_xregs, &xregs_cpu); abort(); pthread_mutex_unlock(&show_lock); }